3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 07:16:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

additional fix for nullptr support

Browse Source
This commit is contained in:
Konstantin Baumann 2013-01-31 11:27:15 +01:00
parent d8a3ffedba
commit 88921a1bf3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/internal/catch_evaluate.hpp
View File

@ -37,7 +37,7 @@ namespace Internal {
inline T& catch_const_cast(const T& t) { return const_cast<T&>(t); } inline T& catch_const_cast(const T& t) { return const_cast<T&>(t); }
#ifdef CATCH_CONFIG_CPP11_NULLPTR #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 #endif // CATCH_CONFIG_CPP11_NULLPTR
// So the compare overloads can be operator agnostic we convey the operator as a template // So the compare overloads can be operator agnostic we convey the operator as a template
@ -48,37 +48,37 @@ namespace Internal {
template<typename T1, typename T2> template<typename T1, typename T2>
struct Evaluator<T1, T2, IsEqualTo> { struct Evaluator<T1, T2, IsEqualTo> {
static bool evaluate( const T1& lhs, const T2& rhs) { static bool evaluate( const T1& lhs, const T2& rhs) {
return catch_const_cast<T1>( lhs ) == catch_const_cast<T2>( rhs ); return catch_const_cast( lhs ) == catch_const_cast( rhs );
} }
}; };
template<typename T1, typename T2> template<typename T1, typename T2>
struct Evaluator<T1, T2, IsNotEqualTo> { struct Evaluator<T1, T2, IsNotEqualTo> {
static bool evaluate( const T1& lhs, const T2& rhs ) { static bool evaluate( const T1& lhs, const T2& rhs ) {
return catch_const_cast<T1>( lhs ) != catch_const_cast<T2>( rhs ); return catch_const_cast( lhs ) != catch_const_cast( rhs );
} }
}; };
template<typename T1, typename T2> template<typename T1, typename T2>
struct Evaluator<T1, T2, IsLessThan> { struct Evaluator<T1, T2, IsLessThan> {
static bool evaluate( const T1& lhs, const T2& rhs ) { static bool evaluate( const T1& lhs, const T2& rhs ) {
return catch_const_cast<T1>( lhs ) < catch_const_cast<T2>( rhs ); return catch_const_cast( lhs ) < catch_const_cast( rhs );
} }
}; };
template<typename T1, typename T2> template<typename T1, typename T2>
struct Evaluator<T1, T2, IsGreaterThan> { struct Evaluator<T1, T2, IsGreaterThan> {
static bool evaluate( const T1& lhs, const T2& rhs ) { static bool evaluate( const T1& lhs, const T2& rhs ) {
return catch_const_cast<T1>( lhs ) > catch_const_cast<T2>( rhs ); return catch_const_cast( lhs ) > catch_const_cast( rhs );
} }
}; };
template<typename T1, typename T2> template<typename T1, typename T2>
struct Evaluator<T1, T2, IsGreaterThanOrEqualTo> { struct Evaluator<T1, T2, IsGreaterThanOrEqualTo> {
static bool evaluate( const T1& lhs, const T2& rhs ) { static bool evaluate( const T1& lhs, const T2& rhs ) {
return catch_const_cast<T1>( lhs ) >= catch_const_cast<T2>( rhs ); return catch_const_cast( lhs ) >= catch_const_cast( rhs );
} }
}; };
template<typename T1, typename T2> template<typename T1, typename T2>
struct Evaluator<T1, T2, IsLessThanOrEqualTo> { struct Evaluator<T1, T2, IsLessThanOrEqualTo> {
static bool evaluate( const T1& lhs, const T2& rhs ) { static bool evaluate( const T1& lhs, const T2& rhs ) {
return catch_const_cast<T1>( lhs ) <= catch_const_cast<T2>( rhs ); return catch_const_cast( lhs ) <= catch_const_cast( rhs );
} }
}; };