3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-18 10:55:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rework of REQUIRE* changes in CATCH_CONFIG_FAST_COMPILE

Browse Source 
`ResultBuilder`s destructor now checks for exceptions, preventing false
negatives. The speedup should remain the same give or take a tiny bit.
This commit is contained in:
Martin Hořeňovský
2017-03-29 21:12:06 +02:00
parent c3a41e26a7
commit 4fe2432e05
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/internal/catch_result_builder.hpp
View File

@@ -30,9 +30,18 @@ namespace Catch {
char const* secondArg )
: m_assertionInfo( macroName, lineInfo, capturedExpressionWithSecondArgument( capturedExpression, secondArg ), resultDisposition ),
m_shouldDebugBreak( false ),
m_shouldThrow( false )
m_shouldThrow( false ),
m_guardException( false )
{}
ResultBuilder::~ResultBuilder() {
#if defined(CATCH_CONFIG_FAST_COMPILE)
if ( m_guardException ) {
useActiveException( m_assertionInfo.resultDisposition );
}
#endif
}
ResultBuilder& ResultBuilder::setResultType( ResultWas::OfType result ) {
m_data.resultType = result;
return *this;
@@ -146,6 +155,13 @@ namespace Catch {
dest = m_assertionInfo.capturedExpression;
}
void ResultBuilder::setExceptionGuard() {
m_guardException = true;
}
void ResultBuilder::unsetExceptionGuard() {
m_guardException = false;
}
} // end namespace Catch
#endif // TWOBLUECUBES_CATCH_RESULT_BUILDER_HPP_INCLUDED