unittest-cpp
diff --git a/‎UnitTest++/ExceptionMacros.h
Lines changed: 1 addition & 1 deletion b/‎UnitTest++/ExceptionMacros.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎UnitTest++/RequireMacros.h
Lines changed: 1 addition & 7 deletions b/‎UnitTest++/RequireMacros.h
Lines changed: 1 addition & 7 deletions
diff --git a/‎UnitTest++/ThrowingTestReporter.cpp
Lines changed: 11 additions & 1 deletion b/‎UnitTest++/ThrowingTestReporter.cpp
Lines changed: 11 additions & 1 deletion
@@ -12,7 +12,7 @@
 #else
    #define UT_TRY(x) x
    #define UT_THROW(x)
-   #define UT_RETHROW()
+   #define UT_RETHROW(ExceptionType)
    #define UT_CATCH(ExceptionType, ExceptionName, CatchBody)
    #define UT_CATCH_ALL(CatchBody)
 #endif
 
@@ -7,12 +7,6 @@
     #error UnitTest++ redefines REQUIRE
 #endif
 
-#ifndef UNITTEST_NO_EXCEPTIONS
-   #define REQUIRE for(UnitTest::RequiredCheckTestReporter decoratedReporter(*UnitTest::CurrentTest::Results()); decoratedReporter.Next(); )
-#endif
+#define REQUIRE for(UnitTest::RequiredCheckTestReporter decoratedReporter(*UnitTest::CurrentTest::Results()); decoratedReporter.Next(); )
 
-#ifdef UNITTEST_NO_EXCEPTIONS
-   #define REQUIRE
 #endif
-
-#endif
@@ -1,6 +1,10 @@
 #include "ThrowingTestReporter.h"
 #include "RequiredCheckException.h"
 
+#ifdef UNITTEST_NO_EXCEPTIONS
+#include "ReportAssertImpl.h"
+#endif 
+
 namespace UnitTest {
 
    ThrowingTestReporter::ThrowingTestReporter(TestReporter* decoratedReporter)
@@ -27,7 +31,13 @@ namespace UnitTest {
       {
          m_decoratedReporter->ReportFailure(test, failure);
       }
-      throw RequiredCheckException();
+      
+      #ifndef UNITTEST_NO_EXCEPTIONS
+         throw RequiredCheckException();
+      #else
+         static const int stopTest = 1;
+         UNITTEST_LONGJMP(*UnitTest::Detail::GetAssertJmpBuf(), stopTest);
+      #endif
    }
 
    //virtual