From 332de39cd4ba410e9dd9de670ea87a7c0dc7a8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Thu, 28 Apr 2022 14:06:01 +0200 Subject: [PATCH] Remove some useless casts --- src/catch2/catch_test_case_info.cpp | 2 +- src/catch2/internal/catch_stringref.cpp | 2 +- .../catch_matchers_floating_point.cpp | 20 +++++++++++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/catch2/catch_test_case_info.cpp b/src/catch2/catch_test_case_info.cpp index 6d89dc72..c1a0a431 100644 --- a/src/catch2/catch_test_case_info.cpp +++ b/src/catch2/catch_test_case_info.cpp @@ -58,7 +58,7 @@ namespace Catch { else if( tag == "!nonportable"_sr ) return TestCaseProperties::NonPortable; else if( tag == "!benchmark"_sr ) - return static_cast(TestCaseProperties::Benchmark | TestCaseProperties::IsHidden ); + return TestCaseProperties::Benchmark | TestCaseProperties::IsHidden; else return TestCaseProperties::None; } diff --git a/src/catch2/internal/catch_stringref.cpp b/src/catch2/internal/catch_stringref.cpp index 82eef686..46bbfafd 100644 --- a/src/catch2/internal/catch_stringref.cpp +++ b/src/catch2/internal/catch_stringref.cpp @@ -14,7 +14,7 @@ namespace Catch { StringRef::StringRef( char const* rawChars ) noexcept - : StringRef( rawChars, static_cast(std::strlen(rawChars) ) ) + : StringRef( rawChars, std::strlen(rawChars) ) {} auto StringRef::operator == ( StringRef other ) const noexcept -> bool { diff --git a/src/catch2/matchers/catch_matchers_floating_point.cpp b/src/catch2/matchers/catch_matchers_floating_point.cpp index ad0fd378..4d40140f 100644 --- a/src/catch2/matchers/catch_matchers_floating_point.cpp +++ b/src/catch2/matchers/catch_matchers_floating_point.cpp @@ -150,14 +150,26 @@ namespace Detail { ret << " (["; if (m_type == Detail::FloatingPointKind::Double) { - write(ret, step(m_target, static_cast(-INFINITY), m_ulps)); + write( ret, + step( m_target, + -std::numeric_limits::infinity(), + m_ulps ) ); ret << ", "; - write(ret, step(m_target, static_cast( INFINITY), m_ulps)); + write( ret, + step( m_target, + std::numeric_limits::infinity(), + m_ulps ) ); } else { // We have to cast INFINITY to float because of MinGW, see #1782 - write(ret, step(static_cast(m_target), static_cast(-INFINITY), m_ulps)); + write( ret, + step( static_cast( m_target ), + -std::numeric_limits::infinity(), + m_ulps ) ); ret << ", "; - write(ret, step(static_cast(m_target), static_cast( INFINITY), m_ulps)); + write( ret, + step( static_cast( m_target ), + std::numeric_limits::infinity(), + m_ulps ) ); } ret << "])";