feedc0de/Catch2
1
0
Fork 0
forked from catchorg/Catch2
Code Pull Requests Activity

Use StringRef on fatal error path

Browse Source 
So far the fatal error path only uses string literals, so this removes
an allocation from that context
This commit is contained in:
Martin Hořeňovský
2017-09-14 20:05:25 +02:00
parent 4e85267203
commit 40209d1ae0
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_interfaces_capture.h
View File

@@ -10,6 +10,8 @@
#include <string> #include <string>
#include "catch_stringref.h"
namespace Catch { namespace Catch {
class AssertionResult; class AssertionResult;
@@ -43,7 +45,7 @@ namespace Catch {
virtual void exceptionEarlyReported() = 0; virtual void exceptionEarlyReported() = 0;
virtual void handleFatalErrorCondition( std::string const& message ) = 0; virtual void handleFatalErrorCondition( StringRef message ) = 0;
virtual bool lastAssertionPassed() = 0; virtual bool lastAssertionPassed() = 0;
virtual void assertionPassed() = 0; virtual void assertionPassed() = 0;

2
include/internal/catch_run_context.cpp
View File

@@ -208,7 +208,7 @@ namespace Catch {
m_shouldReportUnexpected = false; m_shouldReportUnexpected = false;
} }
void RunContext::handleFatalErrorCondition(std::string const & message) { void RunContext::handleFatalErrorCondition( StringRef message ) {
// First notify reporter that bad things happened // First notify reporter that bad things happened
m_reporter->fatalErrorEncountered(message); m_reporter->fatalErrorEncountered(message);

2
include/internal/catch_run_context.h
View File

@@ -100,7 +100,7 @@ namespace Catch {
void exceptionEarlyReported() override; void exceptionEarlyReported() override;
void handleFatalErrorCondition(std::string const& message) override; void handleFatalErrorCondition( StringRef message ) override;
bool lastAssertionPassed() override; bool lastAssertionPassed() override;