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

Made macroName and capturedExpression StringRefs

Browse Source
This commit is contained in:
Phil Nash
2017-08-08 01:22:21 +01:00
parent 59f9bcf1ed
commit f8148ebae1
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/internal/catch_assertionresult.cpp
View File

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