Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
3c5251bb
Commit
3c5251bb
authored
Dec 27, 2012
by
Davis King
Browse files
Renamed a variable to avoid a name conflict in visual studio 2005
parent
7af1734d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
dlib/matrix/matrix_expressions.h
dlib/matrix/matrix_expressions.h
+3
-3
No files found.
dlib/matrix/matrix_expressions.h
View file @
3c5251bb
...
...
@@ -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
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment