Moved files around.

dlib/CMakeLists.txt

@@ -213,7 +213,7 @@ if (NOT TARGET dlib)
          data_io/image_dataset_metadata.cpp
          data_io/mnist.cpp
          global_optimization/global_function_search.cpp
-         all/test_for_odr_violations.cpp
+         test_for_odr_violations.cpp
    )
 
 

dlib/all/source.cpp

@@ -19,7 +19,7 @@
 #include "../md5/md5_kernel_1.cpp"
 #include "../tokenizer/tokenizer_kernel_1.cpp"
 #include "../unicode/unicode.cpp"
-#include "test_for_odr_violations.cpp"
+#include "../test_for_odr_violations.cpp"
 
 
 

dlib/config.h

@@ -25,7 +25,7 @@
 // #define DLIB_USE_CUDA
 
 
-// Define this so the code in dlib/all/test_for_odr_violations.h can detect ODR violations
+// Define this so the code in dlib/test_for_odr_violations.h can detect ODR violations
 // related to users doing bad things with config.h
 #define DLIB_NOT_CONFIGURED
 

dlib/dnn/tensor_tools.h

@@ -13,7 +13,7 @@
 #include "../rand.h"
 #include <memory>
 #include "../geometry/rectangle.h"
-#include "../all/test_for_odr_violations.h"
+#include "../test_for_odr_violations.h"
 
 namespace dlib
 {

dlib/global_optimization/global_function_search.h

@@ -9,7 +9,7 @@
 #include <mutex>
 #include "../rand.h"
 #include "upper_bound_function.h"
-#include "../all/test_for_odr_violations.h"
+#include "../test_for_odr_violations.h"
 
 namespace dlib
 {

dlib/image_loader/jpeg_loader.h

@@ -9,7 +9,7 @@
 #include "image_loader.h"
 #include "../pixel.h"
 #include "../dir_nav.h"
-#include "../all/test_for_odr_violations.h"
+#include "../test_for_odr_violations.h"
 
 namespace dlib
 {

dlib/image_loader/png_loader.h

@@ -9,7 +9,7 @@
 #include "image_loader.h"
 #include "../pixel.h"
 #include "../dir_nav.h"
-#include "../all/test_for_odr_violations.h"
+#include "../test_for_odr_violations.h"
 
 namespace dlib
 {

dlib/all/test_for_odr_violations.h → dlib/test_for_odr_violations.h

@@ -3,8 +3,8 @@
 #ifndef DLIB_TEST_FOR_ODR_VIOLATIONS_H_
 #define DLIB_TEST_FOR_ODR_VIOLATIONS_H_
 
-#include "../assert.h"
-#include "../config.h"
+#include "assert.h"
+#include "config.h"
 
 extern "C"
 {

dlib/threads/threads_kernel_shared.h

@@ -12,7 +12,7 @@
 #include "../memory_manager.h"
 #include "../queue.h"
 #include "../set.h"
-#include "../all/test_for_odr_violations.h"
+#include "../test_for_odr_violations.h"