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
1468d153
Commit
1468d153
authored
Aug 24, 2012
by
Davis King
Browse files
Fully qualified the references to dlib::set so they compile now that
std::set is #included by the serialize header file.
parent
a2ca2621
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
dlib/test/bayes_nets.cpp
dlib/test/bayes_nets.cpp
+1
-1
dlib/test/directed_graph.cpp
dlib/test/directed_graph.cpp
+3
-3
dlib/test/graph.cpp
dlib/test/graph.cpp
+3
-3
dlib/test/set.cpp
dlib/test/set.cpp
+4
-4
No files found.
dlib/test/bayes_nets.cpp
View file @
1468d153
...
...
@@ -232,7 +232,7 @@ namespace
using
namespace
bayes_node_utils
;
graph
<
set
<
unsigned
long
>::
compare_1b_c
,
set
<
unsigned
long
>::
compare_1b_c
>::
kernel_1a_c
join_tree
;
graph
<
dlib
::
set
<
unsigned
long
>::
compare_1b_c
,
dlib
::
set
<
unsigned
long
>::
compare_1b_c
>::
kernel_1a_c
join_tree
;
create_moral_graph
(
bn
,
join_tree
);
create_join_tree
(
join_tree
,
join_tree
);
...
...
dlib/test/directed_graph.cpp
View file @
1468d153
...
...
@@ -44,7 +44,7 @@ namespace
COMPILE_TIME_ASSERT
(
is_directed_graph
<
directed_graph
>::
value
==
true
);
directed_graph
a
,
b
;
set
<
unsigned
long
>::
compare_1b_c
s
;
dlib
::
set
<
unsigned
long
>::
compare_1b_c
s
;
DLIB_TEST
(
graph_contains_directed_cycle
(
a
)
==
false
);
DLIB_TEST
(
graph_contains_undirected_cycle
(
a
)
==
false
);
...
...
@@ -383,8 +383,8 @@ namespace
graph
<
int
>::
kernel_1a_c
g
;
create_moral_graph
(
a
,
g
);
graph
<
set
<
unsigned
long
>::
compare_1b_c
,
set
<
unsigned
long
>::
compare_1a_c
>::
kernel_1a_c
join_tree
;
set
<
set
<
unsigned
long
>::
compare_1b_c
>::
kernel_1b_c
sos
;
graph
<
dlib
::
set
<
unsigned
long
>::
compare_1b_c
,
dlib
::
set
<
unsigned
long
>::
compare_1a_c
>::
kernel_1a_c
join_tree
;
dlib
::
set
<
dlib
::
set
<
unsigned
long
>::
compare_1b_c
>::
kernel_1b_c
sos
;
create_join_tree
(
g
,
join_tree
);
DLIB_TEST
(
is_join_tree
(
g
,
join_tree
));
...
...
dlib/test/graph.cpp
View file @
1468d153
...
...
@@ -45,7 +45,7 @@ namespace
COMPILE_TIME_ASSERT
(
is_graph
<
graph
>::
value
);
graph
a
,
b
;
set
<
unsigned
long
>::
compare_1b_c
s
;
dlib
::
set
<
unsigned
long
>::
compare_1b_c
s
;
DLIB_TEST
(
graph_contains_length_one_cycle
(
a
)
==
false
);
DLIB_TEST
(
graph_contains_undirected_cycle
(
a
)
==
false
);
...
...
@@ -273,9 +273,9 @@ namespace
DLIB_TEST
(
graph_is_connected
(
a
));
set
<
set
<
unsigned
long
>::
compare_1b_c
>::
kernel_1b_c
sos
;
dlib
::
set
<
dlib
::
set
<
unsigned
long
>::
compare_1b_c
>::
kernel_1b_c
sos
;
dlib
::
graph
<
set
<
unsigned
long
>::
compare_1b_c
,
set
<
unsigned
long
>::
compare_1b_c
>::
kernel_1a_c
join_tree
;
dlib
::
graph
<
dlib
::
set
<
unsigned
long
>::
compare_1b_c
,
dlib
::
set
<
unsigned
long
>::
compare_1b_c
>::
kernel_1a_c
join_tree
;
unsigned
long
temp
;
triangulate_graph_and_find_cliques
(
a
,
sos
);
DLIB_TEST
(
a
.
number_of_nodes
()
==
8
);
...
...
dlib/test/set.cpp
View file @
1468d153
...
...
@@ -450,13 +450,13 @@ namespace
)
{
dlog
<<
LINFO
<<
"testing compare_1a"
;
set_compare_test
<
set
<
int
>::
compare_1a
>
();
set_compare_test
<
dlib
::
set
<
int
>::
compare_1a
>
();
dlog
<<
LINFO
<<
"testing compare_1a_c"
;
set_compare_test
<
set
<
int
>::
compare_1a_c
>
();
set_compare_test
<
dlib
::
set
<
int
>::
compare_1a_c
>
();
dlog
<<
LINFO
<<
"testing compare_1b"
;
set_compare_test
<
set
<
int
>::
compare_1b
>
();
set_compare_test
<
dlib
::
set
<
int
>::
compare_1b
>
();
dlog
<<
LINFO
<<
"testing compare_1b_c"
;
set_compare_test
<
set
<
int
>::
compare_1b_c
>
();
set_compare_test
<
dlib
::
set
<
int
>::
compare_1b_c
>
();
}
}
a
;
...
...
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