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

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLeitwolf2026-11-18 05:46:41 +0300
committerGitHub2026-11-18 05:46:41 +0300
commitbbc8368001a9b2818fd31efa95bd8ed8985d82d7 (patch)
tree5dd402047f546a2aadf9a953c55fe5135bbaf645
parent89c8ed6229cb537b9c3511275bb75116b8126aa0 (diff)
parent150a8323eae20a5753939c50d7a171f5e5830bae (diff)
downloadcatch3-bbc8368001a9b2818fd31efa95bd8ed8985d82d7.tar.gz
Merge branch 'devel' into ci/fuzzing
-rw-r--r--extras/catch_amalgamated.hpp2
-rw-r--r--src/Progmasoft/Catch3/Internal/StringManip.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/extras/catch_amalgamated.hpp b/extras/catch_amalgamated.hpp
index a5368d8b..6889c53e 100644
--- a/extras/catch_amalgamated.hpp
+++ b/extras/catch_amalgamated.hpp
@@ -8618,7 +8618,7 @@ namespace Catch {
constexpr char toLower( char c ) {
const uint32_t as_number = static_cast<unsigned char>( c );
const bool isUpper = ( as_number - static_cast<uint32_t>( 'A' ) ) < 26u;
- return static_cast<char>( as_number | ( isUpper << 5 ) );
+ return static_cast<char>( as_number | ( static_cast<uint32_t>( isUpper ) << 5u ) );
}
//! Returns a new string without whitespace at the start/end
std::string trim( std::string const& str );
diff --git a/src/Progmasoft/Catch3/Internal/StringManip.hpp b/src/Progmasoft/Catch3/Internal/StringManip.hpp
index 474d6e55..7b43d045 100644
--- a/src/Progmasoft/Catch3/Internal/StringManip.hpp
+++ b/src/Progmasoft/Catch3/Internal/StringManip.hpp
@@ -28,7 +28,7 @@ namespace Catch {
constexpr char toLower( char c ) {
const uint32_t as_number = static_cast<unsigned char>( c );
const bool isUpper = ( as_number - static_cast<uint32_t>( 'A' ) ) < 26u;
- return static_cast<char>( as_number | ( isUpper << 5 ) );
+ return static_cast<char>( as_number | ( static_cast<uint32_t>( isUpper ) << 5u ) );
}
//! Returns a new string without whitespace at the start/end
std::string trim( std::string const& str );