merged

dlib/assert.h

@@ -56,7 +56,9 @@ namespace dlib
 
 #if !defined(DLIB_DISABLE_ASSERTS) && ( defined DEBUG || defined _DEBUG)
     // make sure ENABLE_ASSERTS is defined if we are indeed using them.
-    #define ENABLE_ASSERTS
+    #ifndef ENABLE_ASSERTS
+        #define ENABLE_ASSERTS
+    #endif
 #endif
 
 // -----------------------------

dlib/test/svm_c_linear_dcd.cpp

@@ -314,7 +314,7 @@ namespace
                 rs.add(labels[k]*df(samples[k]));
             }
         }
-        DLIB_TEST_MSG(std::abs(rs.min()-1) < 1e-7, std::abs(rs.min()-1));
+        DLIB_TEST_MSG(std::abs(rs.min()-1) < 1e-6, std::abs(rs.min()-1));
     }
 
 // ----------------------------------------------------------------------------------------