From f80f28e09aa5ea1d0a981c300d21bfe35c037f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Mon, 13 Nov 2017 12:49:13 +0100 Subject: [PATCH] Fix pointless type mismatch between StringRef and std::string --- include/internal/catch_assertionresult.cpp | 2 +- include/internal/catch_assertionresult.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/internal/catch_assertionresult.cpp b/include/internal/catch_assertionresult.cpp index e58a441f..44151043 100644 --- a/include/internal/catch_assertionresult.cpp +++ b/include/internal/catch_assertionresult.cpp @@ -91,7 +91,7 @@ namespace Catch { return m_info.lineInfo; } - std::string AssertionResult::getTestMacroName() const { + StringRef AssertionResult::getTestMacroName() const { return m_info.macroName; } diff --git a/include/internal/catch_assertionresult.h b/include/internal/catch_assertionresult.h index fa8e09f2..3c91ea58 100644 --- a/include/internal/catch_assertionresult.h +++ b/include/internal/catch_assertionresult.h @@ -47,7 +47,7 @@ namespace Catch { std::string getExpandedExpression() const; std::string getMessage() const; SourceLineInfo getSourceInfo() const; - std::string getTestMacroName() const; + StringRef getTestMacroName() const; //protected: AssertionInfo m_info;