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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-11-08 23:58:09 +0100
committerMartin Hořeňovský2021-11-09 11:44:54 +0100
commit7800fe970864199aa6c064aa49baa5fb3463a817 (patch)
treef5f505249cd753ff9b9d782b9e280ac67a64a9ee /src/catch2/internal
parent141e384c6002499ea277040cf59199e8edb1f060 (diff)
downloadcatch3-7800fe970864199aa6c064aa49baa5fb3463a817.tar.gz
Lift toLower(char) to header
Diffstat (limited to 'src/catch2/internal')
-rw-r--r--src/catch2/internal/catch_string_manip.cpp14
-rw-r--r--src/catch2/internal/catch_string_manip.hpp1
2 files changed, 8 insertions, 7 deletions
diff --git a/src/catch2/internal/catch_string_manip.cpp b/src/catch2/internal/catch_string_manip.cpp
index b9d312e4..e61bfd43 100644
--- a/src/catch2/internal/catch_string_manip.cpp
+++ b/src/catch2/internal/catch_string_manip.cpp
@@ -16,12 +16,6 @@
namespace Catch {
- namespace {
- char toLowerCh(char c) {
- return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
- }
- }
-
bool startsWith( std::string const& s, std::string const& prefix ) {
return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
}
@@ -38,13 +32,19 @@ namespace Catch {
return s.find( infix ) != std::string::npos;
}
void toLowerInPlace( std::string& s ) {
- std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
+ std::transform( s.begin(), s.end(), s.begin(), []( char c ) {
+ return toLower( c );
+ } );
}
std::string toLower( std::string const& s ) {
std::string lc = s;
toLowerInPlace( lc );
return lc;
}
+ char toLower(char c) {
+ return static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
+ }
+
std::string trim( std::string const& str ) {
static char const* whitespaceChars = "\n\r\t ";
std::string::size_type start = str.find_first_not_of( whitespaceChars );
diff --git a/src/catch2/internal/catch_string_manip.hpp b/src/catch2/internal/catch_string_manip.hpp
index 605d898c..bdc7c266 100644
--- a/src/catch2/internal/catch_string_manip.hpp
+++ b/src/catch2/internal/catch_string_manip.hpp
@@ -23,6 +23,7 @@ namespace Catch {
bool contains( std::string const& s, std::string const& infix );
void toLowerInPlace( std::string& s );
std::string toLower( std::string const& s );
+ char toLower( char c );
//! Returns a new string without whitespace at the start/end
std::string trim( std::string const& str );
//! Returns a substring of the original ref without whitespace. Beware lifetimes!