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

Removed complex expression state (as it shouldn't compile now anyway)

Browse Source
This commit is contained in:
Phil Nash 2011-03-11 19:45:36 +00:00
parent 13bfe477c7
commit f35e0cbc6a
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/catch_result_type.h
View File

@ -27,7 +27,6 @@ struct ResultWas{ enum OfType
ExpressionFailed = FailureBit | 1, ExpressionFailed = FailureBit | 1,
ExplicitFailure = FailureBit | 2, ExplicitFailure = FailureBit | 2,
ExpressionTooComplex = FailureBit | 3,
Exception = 0x110, Exception = 0x110,

7
internal/catch_resultinfo.hpp
View File

@ -98,12 +98,7 @@ namespace Catch
() ()
const const
{ {
if( !hasExpression() ) return hasExpression() ? getExpandedExpressionInternal() : "";
return "";
return m_result == ResultWas::ExpressionTooComplex
? getExpandedExpressionInternal() + " {couldn't fully decompose the expression to evaluate it - please rewrite as a binary comparison}"
: getExpandedExpressionInternal();
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////