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
3d9496d7
Commit
3d9496d7
authored
Aug 15, 2014
by
Davis King
Browse files
Renamed a variable to avoid a name conflict on windows which was pointed out by
Ahti Leppänen.
parent
55a0ee9c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
dlib/numerical_integration/integrate_function_adapt_simpson.h
.../numerical_integration/integrate_function_adapt_simpson.h
+2
-2
No files found.
dlib/numerical_integration/integrate_function_adapt_simpson.h
View file @
3d9496d7
...
@@ -13,7 +13,7 @@ namespace dlib
...
@@ -13,7 +13,7 @@ namespace dlib
template
<
typename
T
,
typename
funct
>
template
<
typename
T
,
typename
funct
>
T
impl_adapt_simp_stop
(
const
funct
&
f
,
T
a
,
T
b
,
T
fa
,
T
fm
,
T
fb
,
T
is
,
int
cnt
)
T
impl_adapt_simp_stop
(
const
funct
&
f
,
T
a
,
T
b
,
T
fa
,
T
fm
,
T
fb
,
T
is
,
int
cnt
)
{
{
const
int
MAXINT
=
500
;
const
int
maxint
=
500
;
T
m
=
(
a
+
b
)
/
2.0
;
T
m
=
(
a
+
b
)
/
2.0
;
T
h
=
(
b
-
a
)
/
4.0
;
T
h
=
(
b
-
a
)
/
4.0
;
...
@@ -30,7 +30,7 @@ namespace dlib
...
@@ -30,7 +30,7 @@ namespace dlib
}
}
else
else
{
{
if
(
cnt
<
MAXINT
)
if
(
cnt
<
maxint
)
{
{
cnt
=
cnt
+
1
;
cnt
=
cnt
+
1
;
...
...
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