From 2e480b6e560ad8412337b49b6327c7ac303bfb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Tue, 18 Aug 2020 14:03:37 +0200 Subject: [PATCH] Use StringRef for CasedString::caseSensitivitySuffix return type --- src/catch2/matchers/catch_matchers_string.cpp | 8 ++++---- src/catch2/matchers/catch_matchers_string.hpp | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/catch2/matchers/catch_matchers_string.cpp b/src/catch2/matchers/catch_matchers_string.cpp index 25afa967..90815c67 100644 --- a/src/catch2/matchers/catch_matchers_string.cpp +++ b/src/catch2/matchers/catch_matchers_string.cpp @@ -21,10 +21,10 @@ namespace Matchers { ? toLower( str ) : str; } - std::string CasedString::caseSensitivitySuffix() const { - return m_caseSensitivity == CaseSensitive::No - ? " (case insensitive)" - : std::string(); + StringRef CasedString::caseSensitivitySuffix() const { + return m_caseSensitivity == CaseSensitive::Yes + ? StringRef() + : " (case insensitive)"_sr; } diff --git a/src/catch2/matchers/catch_matchers_string.hpp b/src/catch2/matchers/catch_matchers_string.hpp index abbf57b7..fc074842 100644 --- a/src/catch2/matchers/catch_matchers_string.hpp +++ b/src/catch2/matchers/catch_matchers_string.hpp @@ -10,6 +10,7 @@ #include #include +#include #include @@ -19,7 +20,7 @@ namespace Matchers { struct CasedString { CasedString( std::string const& str, CaseSensitive caseSensitivity ); std::string adjustString( std::string const& str ) const; - std::string caseSensitivitySuffix() const; + StringRef caseSensitivitySuffix() const; CaseSensitive m_caseSensitivity; std::string m_str;