Improved macros

6e9b9d03 · Davis King · 707a6b4c · 6e9b9d03
Commit 6e9b9d03 authored May 04, 2016 by Davis King
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

tester.h dlib/test/tester.h +3 -3

No files found.
--- a/dlib/test/tester.h
+++ b/dlib/test/tester.h
@@ -17,10 +17,10 @@
 #endif


-#define DLIB_TEST(_exp) check_test(_exp, __LINE__, __FILE__, #_exp);
+#define DLIB_TEST(_exp) check_test(_exp, __LINE__, __FILE__, #_exp)

 #define DLIB_TEST_MSG(_exp,_message)                                        \
-    {increment_test_count(); if ( !(_exp) )                                 \
+    do{increment_test_count(); if ( !(_exp) )                                 \
    {                                                                       \
        std::ostringstream dlib_o_out;                                       \
        dlib_o_out << "\n\nError occurred at line " << __LINE__ << ".\n";    \
@@ -28,7 +28,7 @@
        dlib_o_out << "Failing expression was " << #_exp << ".\n";           \
        dlib_o_out << _message << "\n";                                      \
        throw dlib::error(dlib_o_out.str());                                 \
-    }}
+    }}while(0)

 namespace test
 {