Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include/internal/catch_assertionresult.cpp
diff options
context:
space:
mode:
authorPhil Nash2017-08-14 08:54:57 +0100
committerPhil Nash2017-08-14 08:54:57 +0100
commitece64c3b3aee6256be32f1f860b5d638173e7520 (patch)
tree029d331c378db95936b634b3e353788ee9907e6c /include/internal/catch_assertionresult.cpp
parentfa3535e95e79ffc9776cc0b43248a108b173b323 (diff)
downloadcatch3-ece64c3b3aee6256be32f1f860b5d638173e7520.tar.gz
Removed redundant .c_str()s from StringRef usages
Diffstat (limited to 'include/internal/catch_assertionresult.cpp')
-rw-r--r--include/internal/catch_assertionresult.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/include/internal/catch_assertionresult.cpp b/include/internal/catch_assertionresult.cpp
index 04402000..776fdc72 100644
--- a/include/internal/catch_assertionresult.cpp
+++ b/include/internal/catch_assertionresult.cpp
@@ -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