diff options
| author | Phil Nash | 2017-08-08 01:22:21 +0100 |
|---|---|---|
| committer | Phil Nash | 2017-08-08 01:22:21 +0100 |
| commit | f8148ebae1e07c5609ed0af5993694e2972d0dfd (patch) | |
| tree | 64c0b48e598b375eed83e1e67f7c1d2b077dbf62 /include/internal/catch_assertionresult.cpp | |
| parent | 59f9bcf1ed38afc363dbb899e38821a44132589c (diff) | |
| download | catch3-f8148ebae1e07c5609ed0af5993694e2972d0dfd.tar.gz | |
Made macroName and capturedExpression StringRefs
Diffstat (limited to 'include/internal/catch_assertionresult.cpp')
| -rw-r--r-- | include/internal/catch_assertionresult.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/internal/catch_assertionresult.cpp b/include/internal/catch_assertionresult.cpp index f6bb2cfb..6819cd63 100644 --- a/include/internal/catch_assertionresult.cpp +++ b/include/internal/catch_assertionresult.cpp @@ -14,7 +14,7 @@ namespace Catch { bool DecomposedExpression::isBinaryExpression() const { return false; } - + void AssertionResultData::negate( bool parenthesize ) { negated = !negated; parenthesized = parenthesize; @@ -68,16 +68,16 @@ namespace Catch { std::string AssertionResult::getExpression() const { if (isFalseTest(m_info.resultDisposition)) - return '!' + std::string(m_info.capturedExpression); + return '!' + std::string(m_info.capturedExpression.c_str()); else - return std::string(m_info.capturedExpression); + return std::string(m_info.capturedExpression.c_str()); } std::string AssertionResult::getExpressionInMacro() const { if( m_info.macroName[0] == 0 ) - return std::string(m_info.capturedExpression); + return std::string(m_info.capturedExpression.c_str()); else - return std::string(m_info.macroName) + "( " + m_info.capturedExpression + " )"; + return std::string(m_info.macroName.c_str()) + "( " + m_info.capturedExpression.c_str() + " )"; } bool AssertionResult::hasExpandedExpression() const { @@ -96,7 +96,7 @@ namespace Catch { } std::string AssertionResult::getTestMacroName() const { - return m_info.macroName; + return m_info.macroName.c_str(); } void AssertionResult::discardDecomposedExpression() const { |