Skip to content

D
dlib
Commit 04be5427 authored by Davis King's avatar Davis King
Browse files
Options

A bit of code cleanup

parent 0df6cc2d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
dlib/all/test_for_odr_violations.cpp
View file @ 04be5427
...@@ -28,7 +28,7 @@ extern "C" ...@@ -28,7 +28,7 @@ extern "C"
// MIXING THEM WITH THE SOURCE FROM GITHUB. USE CMAKE'S INSTALL SCRIPTS TO INSTALL DLIB. // MIXING THEM WITH THE SOURCE FROM GITHUB. USE CMAKE'S INSTALL SCRIPTS TO INSTALL DLIB.
// Or even better, don't install dlib at all and instead build your program as shown in // Or even better, don't install dlib at all and instead build your program as shown in
// examples/CMakeLists.txt // examples/CMakeLists.txt
#ifdef DLIB_NOT_CONFIGURED #if defined(DLIB_NOT_CONFIGURED) && !defined(DLIB__CMAKE_GENERATED_A_CONFIG_H_FILE)
int USER_ERROR__inconsistent_build_configuration__see_dlib_faq_2; int USER_ERROR__inconsistent_build_configuration__see_dlib_faq_2;
#endif #endif
} }
......
dlib/all/test_for_odr_violations.h
View file @ 04be5427
...@@ -38,7 +38,7 @@ extern "C" ...@@ -38,7 +38,7 @@ extern "C"
// MIXING THEM WITH THE SOURCE FROM GITHUB. USE CMAKE'S INSTALL SCRIPTS TO INSTALL DLIB. // MIXING THEM WITH THE SOURCE FROM GITHUB. USE CMAKE'S INSTALL SCRIPTS TO INSTALL DLIB.
// Or even better, don't install dlib at all and instead build your program as shown in // Or even better, don't install dlib at all and instead build your program as shown in
// examples/CMakeLists.txt // examples/CMakeLists.txt
#ifdef DLIB_NOT_CONFIGURED #if defined(DLIB_NOT_CONFIGURED) && !defined(DLIB__CMAKE_GENERATED_A_CONFIG_H_FILE)
extern int USER_ERROR__inconsistent_build_configuration__see_dlib_faq_2; extern int USER_ERROR__inconsistent_build_configuration__see_dlib_faq_2;
inline int dlib_check_consistent_config_h_usage() { USER_ERROR__inconsistent_build_configuration__see_dlib_faq_2 = 0; return 0; } inline int dlib_check_consistent_config_h_usage() { USER_ERROR__inconsistent_build_configuration__see_dlib_faq_2 = 0; return 0; }
#else #else
......
dlib/config.h
View file @ 04be5427
...@@ -27,7 +27,5 @@ ...@@ -27,7 +27,5 @@
// Define this so the code in dlib/all/test_for_odr_violations.h can detect ODR violations // Define this so the code in dlib/all/test_for_odr_violations.h can detect ODR violations
// related to users doing bad things with config.h // related to users doing bad things with config.h
#ifndef DLIB__CMAKE_GENERATED_A_CONFIG_H_FILE
#define DLIB_NOT_CONFIGURED #define DLIB_NOT_CONFIGURED
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment