Restored exceptionGuard functionality under CATCH_CONFIG_FAST_COMPILE

1 files changed, 17 insertions, 1 deletions

diff --git a/include/internal/catch_assertionhandler.cpp b/include/internal/catch_assertionhandler.cpp
index d53b09fa..8d99e3d0 100644
--- a/include/internal/catch_assertionhandler.cpp
+++ b/include/internal/catch_assertionhandler.cpp
@@ -14,7 +14,7 @@
 #include "catch_debugger.h"
 #include "catch_interfaces_registry_hub.h"
 
-#include <iostream> // !TBD
+#include <cassert>
 
 namespace Catch {
 
@@ -58,6 +58,12 @@ namespace Catch {
     {
         getCurrentContext().getResultCapture()->assertionStarting( m_assertionInfo );
     }
+    AssertionHandler::~AssertionHandler() {
+        if ( m_inExceptionGuard ) {
+            handle( ResultWas::ThrewException, "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE" );
+            getCurrentContext().getResultCapture()->exceptionEarlyReported();
+        }
+    }
 
     void AssertionHandler::handle( ITransientExpression const& expr ) {
 
@@ -125,4 +131,14 @@ namespace Catch {
         handle( ResultWas::ThrewException, Catch::translateActiveException().c_str() );
     }
 
+    void AssertionHandler::setExceptionGuard() {
+        assert( m_inExceptionGuard == false );
+        m_inExceptionGuard = true;
+    }
+    void AssertionHandler::unsetExceptionGuard() {
+        assert( m_inExceptionGuard == true );
+        m_inExceptionGuard = false;
+    }
+
+
 } // namespace Catch