diff options
| author | Leitwolf | 2026-11-18 05:46:44 +0300 |
|---|---|---|
| committer | GitHub | 2026-11-18 05:46:44 +0300 |
| commit | 10731efd02e461d090325632b9ceb9c373f616da (patch) | |
| tree | d5e3c3a5624dff4a325d5918cd7edcfa09be7f3d | |
| parent | 952e49f3a41058177e729f16f4de44c608e9d842 (diff) | |
| parent | 150a8323eae20a5753939c50d7a171f5e5830bae (diff) | |
| download | catch3-10731efd02e461d090325632b9ceb9c373f616da.tar.gz | |
Merge branch 'devel' into docs/site-links
| -rw-r--r-- | extras/catch_amalgamated.hpp | 2 | ||||
| -rw-r--r-- | src/Progmasoft/Catch3/Internal/StringManip.hpp | 2 |
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 ); |