3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-05 22:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restored exceptionGuard functionality under CATCH_CONFIG_FAST_COMPILE

Browse Source
This commit is contained in:
Phil Nash
2017-08-08 21:07:30 +01:00
parent 5f91724368
commit 2832e23aa9
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/internal/catch_assertionhandler.cpp
View File

@@ -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