NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed a variable to avoid a name conflict in visual studio 2005

Browse Source
This commit is contained in:
Davis King 2012-12-27 15:58:43 -05:00
parent 7af1734d59
commit 3c5251bb7b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlib/matrix/matrix_expressions.h
View File

@ -227,8 +227,8 @@ namespace dlib
typedef row_major_layout layout_type;
};
template <long start, long inc_, long end>
class matrix_range_static_exp : public matrix_exp<matrix_range_static_exp<start,inc_,end> >
template <long start, long inc_, long end_>
class matrix_range_static_exp : public matrix_exp<matrix_range_static_exp<start,inc_,end_> >
{
public:
typedef typename matrix_traits<matrix_range_static_exp>::type type;
@ -239,7 +239,7 @@ namespace dlib
const static long cost = matrix_traits<matrix_range_static_exp>::cost;
typedef typename matrix_traits<matrix_range_static_exp>::layout_type layout_type;
const static long inc = (start <= end)?inc_:-inc_;
const static long inc = (start <= end_)?inc_:-inc_;
matrix_range_static_exp (