diff options
| author | Martin Hořeňovský | 2019-09-08 14:49:40 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-09-08 15:58:10 +0200 |
| commit | 7b865daccc7bba2dcc25a4f0b9ea7348b1b4d61f (patch) | |
| tree | d6964f2f65b8fbcd70e8041e16677339f675f261 /include/internal/catch_run_context.cpp | |
| parent | 14362533bb50596049f1b46bcc6d333208576a87 (diff) | |
| download | catch3-7b865daccc7bba2dcc25a4f0b9ea7348b1b4d61f.tar.gz | |
Make StringRef's operator std::string explicit
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.
Diffstat (limited to 'include/internal/catch_run_context.cpp')
| -rw-r--r-- | include/internal/catch_run_context.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/internal/catch_run_context.cpp b/include/internal/catch_run_context.cpp index d2acc652..79f906d6 100644 --- a/include/internal/catch_run_context.cpp +++ b/include/internal/catch_run_context.cpp @@ -230,7 +230,7 @@ namespace Catch { m_unfinishedSections.push_back(endInfo); } - + #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING) void RunContext::benchmarkPreparing(std::string const& name) { m_reporter->benchmarkPreparing(name); @@ -279,7 +279,7 @@ namespace Catch { // Don't rebuild the result -- the stringification itself can cause more fatal errors // Instead, fake a result data. AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } ); - tempResult.message = message; + tempResult.message = static_cast<std::string>(message); AssertionResult result(m_lastAssertionInfo, tempResult); assertionEnded(result); @@ -442,7 +442,7 @@ namespace Catch { m_lastAssertionInfo = info; AssertionResultData data( resultType, LazyExpression( false ) ); - data.message = message; + data.message = static_cast<std::string>(message); AssertionResult assertionResult{ m_lastAssertionInfo, data }; assertionEnded( assertionResult ); if( !assertionResult.isOk() ) |