mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-26 23:36:11 +01:00
enhanced support for nullptr
these fixes enhance the support for C++11 nullptr/std::nullptr_t; now you can write something like this: std::exception_ptr ex; CATCH_REQUIRE(ex == nullptr); and std::unique_ptr<int> ptr; CATCH_REQUIRE(ptr.get() == nullptr); The issue with the const_cast<T&> is that you cannot cast a std::nullptr_t to a non-const-ref.
This commit is contained in:
parent
51da1ec366
commit
d8a3ffedba
@ -33,40 +33,52 @@ namespace Internal {
|
|||||||
template<typename T1, typename T2, Operator Op>
|
template<typename T1, typename T2, Operator Op>
|
||||||
class Evaluator{};
|
class Evaluator{};
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
inline T& catch_const_cast(const T& t) { return const_cast<T&>(t); }
|
||||||
|
|
||||||
|
#ifdef CATCH_CONFIG_CPP11_NULLPTR
|
||||||
|
inline std::nullptr_t catch_const_cast(const 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
|
||||||
|
// enum, which is used to specialise an Evaluator for doing the comparison.
|
||||||
|
template<typename T1, typename T2, Operator Op>
|
||||||
|
class Evaluator{};
|
||||||
|
|
||||||
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 const_cast<T1&>( lhs ) == const_cast<T2&>( rhs );
|
return catch_const_cast<T1>( lhs ) == catch_const_cast<T2>( 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 const_cast<T1&>( lhs ) != const_cast<T2&>( rhs );
|
return catch_const_cast<T1>( lhs ) != catch_const_cast<T2>( 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 const_cast<T1&>( lhs ) < const_cast<T2&>( rhs );
|
return catch_const_cast<T1>( lhs ) < catch_const_cast<T2>( 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 const_cast<T1&>( lhs ) > const_cast<T2&>( rhs );
|
return catch_const_cast<T1>( lhs ) > catch_const_cast<T2>( 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 const_cast<T1&>( lhs ) >= const_cast<T2&>( rhs );
|
return catch_const_cast<T1>( lhs ) >= catch_const_cast<T2>( 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 const_cast<T1&>( lhs ) <= const_cast<T2&>( rhs );
|
return catch_const_cast<T1>( lhs ) <= catch_const_cast<T2>( rhs );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -144,6 +156,16 @@ namespace Internal {
|
|||||||
return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
|
return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CATCH_CONFIG_CPP11_NULLPTR
|
||||||
|
// nullptr_t to T-pointer (when comparing against nullptr)
|
||||||
|
template<Operator Op, typename T> bool compare( std::nullptr_t lhs, T* rhs ) {
|
||||||
|
return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
|
||||||
|
}
|
||||||
|
template<Operator Op, typename T> bool compare( T* lhs, std::nullptr_t rhs ) {
|
||||||
|
return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
|
||||||
|
}
|
||||||
|
#endif // CATCH_CONFIG_CPP11_NULLPTR
|
||||||
|
|
||||||
} // end of namespace Internal
|
} // end of namespace Internal
|
||||||
} // end of namespace Catch
|
} // end of namespace Catch
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user