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
52fdd266
"git@developer.sourcefind.cn:change/sglang.git" did not exist on "afb752bcbeb192c71effaf8bd84b0314e69a6584"
Commit
52fdd266
authored
Jun 24, 2014
by
Davis King
Browse files
Renamed assert link check variable to be a little more informative.
parent
35de9101
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
dlib/threads/threads_kernel_shared.cpp
dlib/threads/threads_kernel_shared.cpp
+2
-2
dlib/threads/threads_kernel_shared.h
dlib/threads/threads_kernel_shared.h
+4
-4
No files found.
dlib/threads/threads_kernel_shared.cpp
View file @
52fdd266
...
...
@@ -14,9 +14,9 @@
extern
"C"
{
#ifdef ENABLE_ASSERTS
int
USER_ERROR__
violation_of_one_definition_rule_detected
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives
;
int
USER_ERROR__
missing_dlib_all_source_cpp_file__OR
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives
;
#else
int
USER_ERROR__
violation_of_one_definition_rule_detected
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives_
;
int
USER_ERROR__
missing_dlib_all_source_cpp_file__OR
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives_
;
#endif
}
...
...
dlib/threads/threads_kernel_shared.h
View file @
52fdd266
...
...
@@ -37,11 +37,11 @@ extern "C"
// you have simply forgotten to compile dlib/all/source.cpp into your application.
// =========================>>> WHY YOU ARE GETTING AN ERROR HERE <<<=========================
#ifdef ENABLE_ASSERTS
extern
int
USER_ERROR__
violation_of_one_definition_rule_detected
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives
;
inline
int
dlib_check_consistent_assert_usage
()
{
USER_ERROR__
violation_of_one_definition_rule_detected
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives
=
0
;
return
0
;
}
extern
int
USER_ERROR__
missing_dlib_all_source_cpp_file__OR
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives
;
inline
int
dlib_check_consistent_assert_usage
()
{
USER_ERROR__
missing_dlib_all_source_cpp_file__OR
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives
=
0
;
return
0
;
}
#else
extern
int
USER_ERROR__
violation_of_one_definition_rule_detected
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives_
;
inline
int
dlib_check_consistent_assert_usage
()
{
USER_ERROR__
violation_of_one_definition_rule_detected
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives_
=
0
;
return
0
;
}
extern
int
USER_ERROR__
missing_dlib_all_source_cpp_file__OR
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives_
;
inline
int
dlib_check_consistent_assert_usage
()
{
USER_ERROR__
missing_dlib_all_source_cpp_file__OR
__inconsistent_use_of_DEBUG_or_ENABLE_ASSERTS_preprocessor_directives_
=
0
;
return
0
;
}
#endif
const
int
dlib_check_assert_helper_variable
=
dlib_check_consistent_assert_usage
();
}
...
...
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