Skip to content

GitLab

Commit ac2f9550 authored by Davis King's avatar Davis King
Browse files

removed more double __

parent ca498ac2
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 83 deletions
dlib/array2d/array2d_kernel.h
View file @ ac2f9550
...@@ -113,7 +113,7 @@ namespace dlib ...@@ -113,7 +113,7 @@ namespace dlib
private: private:
row(T* data_, long nc__) : data(data_), nc_(nc__) {} row(T* data_, long cols) : data(data_), nc_(cols) {}
T* data; T* data;
long nc_; long nc_;
...@@ -138,8 +138,8 @@ namespace dlib ...@@ -138,8 +138,8 @@ namespace dlib
} }
array2d( array2d(
long nr__, long rows,
long nc__ long cols
) : ) :
data(0), data(0),
nc_(0), nc_(0),
...@@ -149,15 +149,15 @@ namespace dlib ...@@ -149,15 +149,15 @@ namespace dlib
at_start_(true) at_start_(true)
{ {
// make sure requires clause is not broken // make sure requires clause is not broken
DLIB_ASSERT((nc__ >= 0 && nr__ >= 0), DLIB_ASSERT((cols >= 0 && rows >= 0),
"\t array2d::array2d(long nr__, long nc__)" "\t array2d::array2d(long rows, long cols)"
<< "\n\t The array2d can't have negative rows or columns." << "\n\t The array2d can't have negative rows or columns."
<< "\n\t this: " << this << "\n\t this: " << this
<< "\n\t nc__: " << nc__ << "\n\t cols: " << cols
<< "\n\t nr__: " << nr__ << "\n\t rows: " << rows
); );
set_size(nr__,nc__); set_size(rows,cols);
} }
virtual ~array2d ( virtual ~array2d (
...@@ -230,8 +230,8 @@ namespace dlib ...@@ -230,8 +230,8 @@ namespace dlib
} }
void set_size ( void set_size (
long nr__, long rows,
long nc__ long cols
); );
bool at_start ( bool at_start (
...@@ -413,17 +413,17 @@ namespace dlib ...@@ -413,17 +413,17 @@ namespace dlib
> >
void array2d<T,mem_manager>:: void array2d<T,mem_manager>::
set_size ( set_size (
long nr__, long rows,
long nc__ long cols
) )
{ {
// make sure requires clause is not broken // make sure requires clause is not broken
DLIB_ASSERT((nc__ >= 0 && nr__ >= 0) , DLIB_ASSERT((cols >= 0 && rows >= 0) ,
"\tvoid array2d::set_size(long nr__, long nc__)" "\tvoid array2d::set_size(long rows, long cols)"
<< "\n\tThe array2d can't have negative rows or columns." << "\n\tThe array2d can't have negative rows or columns."
<< "\n\tthis: " << this << "\n\tthis: " << this
<< "\n\tnc__: " << nc__ << "\n\tcols: " << cols
<< "\n\tnr__: " << nr__ << "\n\trows: " << rows
); );
// set the enumerator back at the start // set the enumerator back at the start
...@@ -431,13 +431,13 @@ namespace dlib ...@@ -431,13 +431,13 @@ namespace dlib
cur = 0; cur = 0;
// don't do anything if we are already the right size. // don't do anything if we are already the right size.
if (nc_ == nc__ && nr_ == nr__) if (nc_ == cols && nr_ == rows)
{ {
return; return;
} }
nc_ = nc__; nc_ = cols;
nr_ = nr__; nr_ = rows;
// free any existing memory // free any existing memory
if (data != 0) if (data != 0)
......
dlib/assert.h
View file @ ac2f9550
...@@ -92,13 +92,13 @@ namespace dlib ...@@ -92,13 +92,13 @@ namespace dlib
{if ( !(_exp) ) \ {if ( !(_exp) ) \
{ \ { \
dlib_assert_breakpoint(); \ dlib_assert_breakpoint(); \
std::ostringstream dlib__out; \ std::ostringstream dlib_o_out; \
dlib__out << "\n\nError detected at line " << __LINE__ << ".\n"; \ dlib_o_out << "\n\nError detected at line " << __LINE__ << ".\n"; \
dlib__out << "Error detected in file " << __FILE__ << ".\n"; \ dlib_o_out << "Error detected in file " << __FILE__ << ".\n"; \
dlib__out << "Error detected in function " << DLIB_FUNCTION_NAME << ".\n\n"; \ dlib_o_out << "Error detected in function " << DLIB_FUNCTION_NAME << ".\n\n"; \
dlib__out << "Failing expression was " << #_exp << ".\n"; \ dlib_o_out << "Failing expression was " << #_exp << ".\n"; \
dlib__out << std::boolalpha << _message << "\n"; \ dlib_o_out << std::boolalpha << _message << "\n"; \
throw dlib::fatal_error(dlib::EBROKEN_ASSERT,dlib__out.str()); \ throw dlib::fatal_error(dlib::EBROKEN_ASSERT,dlib_o_out.str()); \
}} }}
......
dlib/gui_core/gui_core_kernel_1.h
View file @ ac2f9550
...@@ -96,18 +96,18 @@ namespace dlib ...@@ -96,18 +96,18 @@ namespace dlib
friend LRESULT CALLBACK gui_core_kernel_1_globals::WndProc (HWND, UINT, WPARAM, LPARAM); friend LRESULT CALLBACK gui_core_kernel_1_globals::WndProc (HWND, UINT, WPARAM, LPARAM);
canvas ( canvas (
unsigned char* bits__, unsigned char* bits_,
unsigned long padding__, unsigned long padding_,
unsigned long left__, unsigned long left_,
unsigned long top__, unsigned long top_,
unsigned long right__, unsigned long right_,
unsigned long bottom__ unsigned long bottom_
) : ) :
rectangle(left__,top__,right__,bottom__), rectangle(left_,top_,right_,bottom_),
bits(bits__), bits(bits_),
width_(width()), width_(width()),
height_(height()), height_(height()),
row_width(width_*3+padding__) row_width(width_*3+padding_)
{} {}
// restricted functions // restricted functions
......
dlib/gui_core/gui_core_kernel_2.h
View file @ ac2f9550
...@@ -113,14 +113,14 @@ namespace dlib ...@@ -113,14 +113,14 @@ namespace dlib
canvas ( canvas (
unsigned char* bits__, unsigned char* bits_,
unsigned long left__, unsigned long left_,
unsigned long top__, unsigned long top_,
unsigned long right__, unsigned long right_,
unsigned long bottom__ unsigned long bottom_
) : ) :
rectangle(left__,top__,right__,bottom__), rectangle(left_,top_,right_,bottom_),
bits(bits__), bits(bits_),
width_(width()), width_(width()),
height_(height()), height_(height()),
row_width(width_*4) row_width(width_*4)
......
dlib/matrix/lapack/ormqr.h
View file @ ac2f9550
...@@ -16,35 +16,35 @@ namespace dlib ...@@ -16,35 +16,35 @@ namespace dlib
{ {
void DLIB_FORTRAN_ID(dormqr) (char *side, char *trans, integer *m, integer *n, void DLIB_FORTRAN_ID(dormqr) (char *side, char *trans, integer *m, integer *n,
integer *k, const double *a, integer *lda, const double *tau, integer *k, const double *a, integer *lda, const double *tau,
double * c__, integer *ldc, double *work, integer *lwork, double * c_, integer *ldc, double *work, integer *lwork,
integer *info); integer *info);
void DLIB_FORTRAN_ID(sormqr) (char *side, char *trans, integer *m, integer *n, void DLIB_FORTRAN_ID(sormqr) (char *side, char *trans, integer *m, integer *n,
integer *k, const float *a, integer *lda, const float *tau, integer *k, const float *a, integer *lda, const float *tau,
float * c__, integer *ldc, float *work, integer *lwork, float * c_, integer *ldc, float *work, integer *lwork,
integer *info); integer *info);
} }
inline int ormqr (char side, char trans, integer m, integer n, inline int ormqr (char side, char trans, integer m, integer n,
integer k, const double *a, integer lda, const double *tau, integer k, const double *a, integer lda, const double *tau,
double *c__, integer ldc, double *work, integer lwork) double *c_, integer ldc, double *work, integer lwork)
{ {
integer info = 0; integer info = 0;
DLIB_FORTRAN_ID(dormqr)(&side, &trans, &m, &n, DLIB_FORTRAN_ID(dormqr)(&side, &trans, &m, &n,
&k, a, &lda, tau, &k, a, &lda, tau,
c__, &ldc, work, &lwork, &info); c_, &ldc, work, &lwork, &info);
return info; return info;
} }
inline int ormqr (char side, char trans, integer m, integer n, inline int ormqr (char side, char trans, integer m, integer n,
integer k, const float *a, integer lda, const float *tau, integer k, const float *a, integer lda, const float *tau,
float *c__, integer ldc, float *work, integer lwork) float *c_, integer ldc, float *work, integer lwork)
{ {
integer info = 0; integer info = 0;
DLIB_FORTRAN_ID(sormqr)(&side, &trans, &m, &n, DLIB_FORTRAN_ID(sormqr)(&side, &trans, &m, &n,
&k, a, &lda, tau, &k, a, &lda, tau,
c__, &ldc, work, &lwork, &info); c_, &ldc, work, &lwork, &info);
return info; return info;
} }
......
dlib/matrix/lapack/syevr.h
View file @ ac2f9550
...@@ -17,13 +17,13 @@ namespace dlib ...@@ -17,13 +17,13 @@ namespace dlib
void DLIB_FORTRAN_ID(dsyevr) (char *jobz, char *range, char *uplo, integer *n, void DLIB_FORTRAN_ID(dsyevr) (char *jobz, char *range, char *uplo, integer *n,
double *a, integer *lda, double *vl, double *vu, integer * il, double *a, integer *lda, double *vl, double *vu, integer * il,
integer *iu, double *abstol, integer *m, double *w, integer *iu, double *abstol, integer *m, double *w,
double *z__, integer *ldz, integer *isuppz, double *work, double *z_, integer *ldz, integer *isuppz, double *work,
integer *lwork, integer *iwork, integer *liwork, integer *info); integer *lwork, integer *iwork, integer *liwork, integer *info);
void DLIB_FORTRAN_ID(ssyevr) (char *jobz, char *range, char *uplo, integer *n, void DLIB_FORTRAN_ID(ssyevr) (char *jobz, char *range, char *uplo, integer *n,
float *a, integer *lda, float *vl, float *vu, integer * il, float *a, integer *lda, float *vl, float *vu, integer * il,
integer *iu, float *abstol, integer *m, float *w, integer *iu, float *abstol, integer *m, float *w,
float *z__, integer *ldz, integer *isuppz, float *work, float *z_, integer *ldz, integer *isuppz, float *work,
integer *lwork, integer *iwork, integer *liwork, integer *info); integer *lwork, integer *iwork, integer *liwork, integer *info);
} }
......
dlib/matrix/matrix_eigenvalue.h
View file @ ac2f9550
...@@ -141,13 +141,13 @@ namespace dlib ...@@ -141,13 +141,13 @@ namespace dlib
template <typename EXP> template <typename EXP>
eigenvalue_decomposition<matrix_exp_type>:: eigenvalue_decomposition<matrix_exp_type>::
eigenvalue_decomposition( eigenvalue_decomposition(
const matrix_exp<EXP>& A__ const matrix_exp<EXP>& A_
) )
{ {
COMPILE_TIME_ASSERT((is_same_type<type, typename EXP::type>::value)); COMPILE_TIME_ASSERT((is_same_type<type, typename EXP::type>::value));
const_temp_matrix<EXP> A(A__); const_temp_matrix<EXP> A(A_);
// make sure requires clause is not broken // make sure requires clause is not broken
DLIB_ASSERT(A.nr() == A.nc() && A.size() > 0, DLIB_ASSERT(A.nr() == A.nc() && A.size() > 0,
......
dlib/matrix/matrix_subexp.h
View file @ ac2f9550
...@@ -64,12 +64,12 @@ namespace dlib ...@@ -64,12 +64,12 @@ namespace dlib
struct op_subm struct op_subm
{ {
op_subm ( op_subm (
const M& m_, const M& m_x,
const long& r__, const long& r_x,
const long& c__, const long& c_x,
const long& nr__, const long& nr_x,
const long& nc__ const long& nc_x
) : m(m_), r_(r__), c_(c__), nr_(nr__), nc_(nc__) { } ) : m(m_x), r_(r_x), c_(c_x), nr_(nr_x), nc_(nc_x) { }
const M& m; const M& m;
const long r_; const long r_;
......
dlib/stack_trace.h
View file @ ac2f9550
...@@ -69,15 +69,15 @@ namespace dlib ...@@ -69,15 +69,15 @@ namespace dlib
#define DLIB_CASSERT(_exp,_message) \ #define DLIB_CASSERT(_exp,_message) \
{if ( !(_exp) ) \ {if ( !(_exp) ) \
{ \ { \
std::ostringstream dlib__out; \ std::ostringstream dlib_o_out; \
dlib__out << "\n\nError occurred at line " << __LINE__ << ".\n"; \ dlib_o_out << "\n\nError occurred at line " << __LINE__ << ".\n"; \
dlib__out << "Error occurred in file " << __FILE__ << ".\n"; \ dlib_o_out << "Error occurred in file " << __FILE__ << ".\n"; \
dlib__out << "Error occurred in function " << DLIB_FUNCTION_NAME << ".\n\n"; \ dlib_o_out << "Error occurred in function " << DLIB_FUNCTION_NAME << ".\n\n"; \
dlib__out << "Failing expression was " << #_exp << ".\n"; \ dlib_o_out << "Failing expression was " << #_exp << ".\n"; \
dlib__out << _message << "\n\n"; \ dlib_o_out << _message << "\n\n"; \
dlib__out << "Stack Trace: \n" << dlib::get_stack_trace() << "\n"; \ dlib_o_out << "Stack Trace: \n" << dlib::get_stack_trace() << "\n"; \
dlib_assert_breakpoint(); \ dlib_assert_breakpoint(); \
throw dlib::fatal_error(dlib::EBROKEN_ASSERT,dlib__out.str()); \ throw dlib::fatal_error(dlib::EBROKEN_ASSERT,dlib_o_out.str()); \
}} }}
......
dlib/test/tester.cpp
View file @ ac2f9550
...@@ -49,11 +49,11 @@ namespace test ...@@ -49,11 +49,11 @@ namespace test
test_count_mutex.unlock(); test_count_mutex.unlock();
if ( !(_exp) ) if ( !(_exp) )
{ {
std::ostringstream dlib__out; std::ostringstream dlib_o_out;
dlib__out << "\n\nError occurred at line " << line << ".\n"; dlib_o_out << "\n\nError occurred at line " << line << ".\n";
dlib__out << "Error occurred in file " << file << ".\n"; dlib_o_out << "Error occurred in file " << file << ".\n";
dlib__out << "Failing expression was " << _exp_str << ".\n"; dlib_o_out << "Failing expression was " << _exp_str << ".\n";
throw dlib::error(dlib__out.str()); throw dlib::error(dlib_o_out.str());
} }
} }
...@@ -70,13 +70,13 @@ namespace test ...@@ -70,13 +70,13 @@ namespace test
tester:: tester::
tester ( tester (
const std::string& switch_name_, const std::string& switch_name_x,
const std::string& description__, const std::string& description_x,
unsigned long num_of_args__ unsigned long num_of_args_x
) : ) :
switch_name(switch_name_), switch_name(switch_name_x),
description_(description__), description_(description_x),
num_of_args_(num_of_args__) num_of_args_(num_of_args_x)
{ {
using namespace std; using namespace std;
if (testers().is_in_domain(switch_name)) if (testers().is_in_domain(switch_name))
......
dlib/test/tester.h
View file @ ac2f9550
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
#define DLIB_TEST_MSG(_exp,_message) \ #define DLIB_TEST_MSG(_exp,_message) \
{increment_test_count(); if ( !(_exp) ) \ {increment_test_count(); if ( !(_exp) ) \
{ \ { \
std::ostringstream dlib__out; \ std::ostringstream dlib_o_out; \
dlib__out << "\n\nError occurred at line " << __LINE__ << ".\n"; \ dlib_o_out << "\n\nError occurred at line " << __LINE__ << ".\n"; \
dlib__out << "Error occurred in file " << __FILE__ << ".\n"; \ dlib_o_out << "Error occurred in file " << __FILE__ << ".\n"; \
dlib__out << "Failing expression was " << #_exp << ".\n"; \ dlib_o_out << "Failing expression was " << #_exp << ".\n"; \
dlib__out << _message << "\n"; \ dlib_o_out << _message << "\n"; \
throw dlib::error(dlib__out.str()); \ throw dlib::error(dlib_o_out.str()); \
}} }}
namespace test namespace test
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment