Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-04-11 10:58:45 +0200
committerMartin Hořeňovský2022-04-11 10:58:45 +0200
commit195a6ac94110fbda140ae4318a2338c9e2512804 (patch)
treebcb582b2a7a83873280d983fac42972da180b4a4 /src
parentbe948f1fd06aa8ec290af36bc50bbbc6935bb9dd (diff)
downloadcatch3-195a6ac94110fbda140ae4318a2338c9e2512804.tar.gz
Use StringRefs for operation name in StringMatcherBase
Diffstat (limited to 'src')
-rw-r--r--src/catch2/matchers/catch_matchers_string.cpp10
-rw-r--r--src/catch2/matchers/catch_matchers_string.hpp4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/catch2/matchers/catch_matchers_string.cpp b/src/catch2/matchers/catch_matchers_string.cpp
index c9a725f0..2fc3a556 100644
--- a/src/catch2/matchers/catch_matchers_string.cpp
+++ b/src/catch2/matchers/catch_matchers_string.cpp
@@ -31,7 +31,7 @@ namespace Matchers {
}
- StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
+ StringMatcherBase::StringMatcherBase( StringRef operation, CasedString const& comparator )
: m_comparator( comparator ),
m_operation( operation ) {
}
@@ -48,28 +48,28 @@ namespace Matchers {
return description;
}
- StringEqualsMatcher::StringEqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
+ StringEqualsMatcher::StringEqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals"_sr, comparator ) {}
bool StringEqualsMatcher::match( std::string const& source ) const {
return m_comparator.adjustString( source ) == m_comparator.m_str;
}
- StringContainsMatcher::StringContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
+ StringContainsMatcher::StringContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains"_sr, comparator ) {}
bool StringContainsMatcher::match( std::string const& source ) const {
return contains( m_comparator.adjustString( source ), m_comparator.m_str );
}
- StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
+ StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with"_sr, comparator ) {}
bool StartsWithMatcher::match( std::string const& source ) const {
return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
}
- EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
+ EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with"_sr, comparator ) {}
bool EndsWithMatcher::match( std::string const& source ) const {
return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
diff --git a/src/catch2/matchers/catch_matchers_string.hpp b/src/catch2/matchers/catch_matchers_string.hpp
index 0f2d8b87..549e2d85 100644
--- a/src/catch2/matchers/catch_matchers_string.hpp
+++ b/src/catch2/matchers/catch_matchers_string.hpp
@@ -27,11 +27,11 @@ namespace Matchers {
};
struct StringMatcherBase : MatcherBase<std::string> {
- StringMatcherBase( std::string const& operation, CasedString const& comparator );
+ StringMatcherBase( StringRef operation, CasedString const& comparator );
std::string describe() const override;
CasedString m_comparator;
- std::string m_operation;
+ StringRef m_operation;
};
struct StringEqualsMatcher final : StringMatcherBase {