Changes in src/Helpers/Assert.hpp [13d5a9:506d2f]

File:

• src/Helpers/Assert.hpp (modified) (6 diffs)

src/Helpers/Assert.hpp

@@ -11 +11 @@
 #include<sstream>
 #include<string>
-#include<iostream>
+#include<iosfwd>
 #include<vector>
 #include<map>
@@ -234 +234 @@
       static bool ignore = false;\
       if(!ignore){\
-        if(Assert::_my_assert::check((condition),STRINGIFY(condition),(message),\
-                                     __FILE__,__LINE__,ignore)){\
+        if(!(condition) && Assert::_my_assert::check(STRINGIFY(condition),(message),\
+                                                     __FILE__,__LINE__,ignore)){\
           Assert::_my_assert::doHooks();\
           DEBUG_BREAK;\
@@ -247 +247 @@
                   static bool ignore = false; \
                   if(!ignore){\
-                          if(Assert::_my_assert::check(false,"Exception caught",(message),__FILE__,__LINE__,ignore)){\
+                          if(Assert::_my_assert::check("Exception caught",(message),__FILE__,__LINE__,ignore)){\
                             Assert::_my_assert::doHooks();\
-          DEBUG_BREAK;\
+                            DEBUG_BREAK;\
                           }\
                   }\
@@ -299 +299 @@
     class _my_assert{
     public:
-      static bool check(const bool res,
-                        const char* condition,
+      static bool check(const char* condition,
                         const char* message,
                         const char* filename,
                         const int line,
                         bool& ignore);
+#ifdef __GNUC__
+      static void backtrace(const char *file, int line);
+#endif /* __GNUC__ */
       static void addHook(Assert::hook_t hook);
       static void removeHook(Assert::hook_t hook);
@@ -332 +334 @@
 
       if(!ignore){
-        if(_my_assert::check(dynamic_cast<target>(src)==static_cast<target>(src),"type-safe typecast",
-                                       message_ptr,file,line,ignore)){
+        bool res = dynamic_cast<target>(src)==static_cast<target>(src);
+        if(!res && _my_assert::check("type-safe typecast",message_ptr,file,line,ignore)){
           _my_assert::doHooks();
           DEBUG_BREAK;
@@ -354 +356 @@
       catch(...){
         if(!ignore){
-          if(_my_assert::check(0,"type-safe typecast",message_ref,file,line,ignore)){
+          if(_my_assert::check("type-safe typecast",message_ref,file,line,ignore)){
             _my_assert::doHooks();
             DEBUG_BREAK;