diff --git a/include/internal/catch_evaluate.hpp b/include/internal/catch_evaluate.hpp index ca301079..1e0da2f1 100644 --- a/include/internal/catch_evaluate.hpp +++ b/include/internal/catch_evaluate.hpp @@ -37,7 +37,7 @@ namespace Internal { inline T& catch_const_cast(const T& t) { return const_cast(t); } #ifdef CATCH_CONFIG_CPP11_NULLPTR - inline std::nullptr_t catch_const_cast(const std::nullptr_t&) { return nullptr; } + inline std::nullptr_t catch_const_cast(std::nullptr_t) { return nullptr; } #endif // CATCH_CONFIG_CPP11_NULLPTR // So the compare overloads can be operator agnostic we convey the operator as a template @@ -48,37 +48,37 @@ namespace Internal { template struct Evaluator { static bool evaluate( const T1& lhs, const T2& rhs) { - return catch_const_cast( lhs ) == catch_const_cast( rhs ); + return catch_const_cast( lhs ) == catch_const_cast( rhs ); } }; template struct Evaluator { static bool evaluate( const T1& lhs, const T2& rhs ) { - return catch_const_cast( lhs ) != catch_const_cast( rhs ); + return catch_const_cast( lhs ) != catch_const_cast( rhs ); } }; template struct Evaluator { static bool evaluate( const T1& lhs, const T2& rhs ) { - return catch_const_cast( lhs ) < catch_const_cast( rhs ); + return catch_const_cast( lhs ) < catch_const_cast( rhs ); } }; template struct Evaluator { static bool evaluate( const T1& lhs, const T2& rhs ) { - return catch_const_cast( lhs ) > catch_const_cast( rhs ); + return catch_const_cast( lhs ) > catch_const_cast( rhs ); } }; template struct Evaluator { static bool evaluate( const T1& lhs, const T2& rhs ) { - return catch_const_cast( lhs ) >= catch_const_cast( rhs ); + return catch_const_cast( lhs ) >= catch_const_cast( rhs ); } }; template struct Evaluator { static bool evaluate( const T1& lhs, const T2& rhs ) { - return catch_const_cast( lhs ) <= catch_const_cast( rhs ); + return catch_const_cast( lhs ) <= catch_const_cast( rhs ); } };