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

Removed redundant .c_str()s from StringRef usages

Browse Source
This commit is contained in:
Phil Nash
2017-08-14 08:54:57 +01:00
parent fa3535e95e
commit ece64c3b3a
9 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/internal/catch_assertionresult.cpp
View File

@@ -52,16 +52,23 @@ namespace Catch {
std::string AssertionResult::getExpression() const {
if (isFalseTest(m_info.resultDisposition))
return '!' + std::string(m_info.capturedExpression.c_str());
return '!' + std::string(m_info.capturedExpression);
else
return std::string(m_info.capturedExpression.c_str());
return m_info.capturedExpression;
}
std::string AssertionResult::getExpressionInMacro() const {
std::string expr;
if( m_info.macroName[0] == 0 )
return std::string(m_info.capturedExpression.c_str());
else
return std::string(m_info.macroName.c_str()) + "( " + m_info.capturedExpression.c_str() + " )";
expr = m_info.capturedExpression;
else {
expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
expr += m_info.macroName;
expr += "( ";
expr += m_info.capturedExpression;
expr += " )";
}
return expr;
}
bool AssertionResult::hasExpandedExpression() const {
@@ -83,7 +90,7 @@ namespace Catch {
}
std::string AssertionResult::getTestMacroName() const {
return m_info.macroName.c_str();
return m_info.macroName;
}
} // end namespace Catch