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

Make StringRef's operator std::string explicit

Browse Source 
This way it is explicit when there is a `StringRef` -> `std::string`
conversion and makes it easier to look for allocations that could
be avoided.

Doing this has already removed one allocation per registered test
case, as there was a completely pointless `StringRef` -> `std::string`
conversion when parsing tags of a test case.
This commit is contained in:
Martin Hořeňovský
2019-09-08 14:49:40 +02:00
parent 14362533bb
commit 7b865daccc
13 changed files with 23 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_assertionresult.cpp
View File

@@ -56,13 +56,13 @@ namespace Catch {
if( isFalseTest( m_info.resultDisposition ) )
return "!(" + m_info.capturedExpression + ")";
else
return m_info.capturedExpression;
return static_cast<std::string>(m_info.capturedExpression);
}
std::string AssertionResult::getExpressionInMacro() const {
std::string expr;
if( m_info.macroName[0] == 0 )
expr = m_info.capturedExpression;
expr = static_cast<std::string>(m_info.capturedExpression);
else {
expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
expr += m_info.macroName;