Progmasoft Git

Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-11-22 15:23:03 +0100
committerMartin Hořeňovský2022-11-22 15:23:03 +0100
commita20200be7e29e4be4929167b3bc56bb03d30ca4a (patch)
treef662070ac56334a3d4206ca772d93a17674231aa /src
parent291c502f6676b8d304b608f936ec26e3b347054a (diff)
downloadcatch3-a20200be7e29e4be4929167b3bc56bb03d30ca4a.tar.gz
Revert "Fix old GCC + types with ambiguous constructor from 0"
This reverts commit 291c502f6676b8d304b608f936ec26e3b347054a. The issue is that it breaks under C++20 for some reason.
Diffstat (limited to 'src')
-rw-r--r--src/catch2/internal/catch_decomposer.hpp103
1 files changed, 51 insertions, 52 deletions
diff --git a/src/catch2/internal/catch_decomposer.hpp b/src/catch2/internal/catch_decomposer.hpp
index aec5f1e2..3448803f 100644
--- a/src/catch2/internal/catch_decomposer.hpp
+++ b/src/catch2/internal/catch_decomposer.hpp
@@ -13,7 +13,6 @@
#include <catch2/internal/catch_meta.hpp>
#include <catch2/internal/catch_compare_traits.hpp>
#include <catch2/internal/catch_test_failure_exception.hpp>
-#include <catch2/internal/catch_logical_traits.hpp>
#include <type_traits>
#include <iosfwd>
@@ -169,20 +168,19 @@ namespace Catch {
template < \
typename RhsT, \
std::enable_if_t< \
- Detail::conjunction<Detail::is_##id##_comparable<LhsT, RhsT>, \
- Detail::negation<std::is_arithmetic< \
- std::remove_reference_t<RhsT>>>>::value, \
+ Detail::is_##id##_comparable<LhsT, RhsT>::value && \
+ !std::is_arithmetic<std::remove_reference_t<RhsT>>::value, \
int> = 0> \
friend auto operator op( ExprLhs&& lhs, RhsT&& rhs ) \
->BinaryExpr<LhsT, RhsT const&> { \
return { \
static_cast<bool>( lhs.m_lhs op rhs ), lhs.m_lhs, #op##_sr, rhs }; \
} \
- template <typename RhsT, \
- std::enable_if_t<Detail::conjunction< \
- Detail::is_##id##_comparable<LhsT, RhsT>, \
- std::is_arithmetic<RhsT>>::value, \
- int> = 0> \
+ template < \
+ typename RhsT, \
+ std::enable_if_t<Detail::is_##id##_comparable<LhsT, RhsT>::value && \
+ std::is_arithmetic<RhsT>::value, \
+ int> = 0> \
friend auto operator op( ExprLhs&& lhs, RhsT rhs ) \
->BinaryExpr<LhsT, RhsT> { \
return { \
@@ -190,58 +188,59 @@ namespace Catch {
} \
template < \
typename RhsT, \
- std::enable_if_t< \
- Detail::conjunction< \
- Detail::negation<Detail::is_##id##_comparable<LhsT, RhsT>>, \
- Detail::is_eq_0_comparable<LhsT>, \
- Detail::disjunction<std::is_same<RhsT, int>, \
- /* On some platforms `NULL` is a long */ \
- std::is_same<RhsT, long>>>::value, \
- int> = 0> \
+ std::enable_if_t<!Detail::is_##id##_comparable<LhsT, RhsT>::value && \
+ Detail::is_eq_0_comparable<LhsT>:: \
+ value && /* We allow long because we want \
+ `ptr op NULL to be accepted */ \
+ ( std::is_same<RhsT, int>::value || \
+ std::is_same<RhsT, long>::value ), \
+ int> = 0> \
friend auto operator op( ExprLhs&& lhs, RhsT rhs ) \
->BinaryExpr<LhsT, RhsT> { \
- if ( rhs != 0 ) { throw_test_failure_exception(); } \
+ if ( rhs != 0 ) { \
+ throw_test_failure_exception(); \
+ } \
return { \
static_cast<bool>( lhs.m_lhs op 0 ), lhs.m_lhs, #op##_sr, rhs }; \
} \
template < \
typename RhsT, \
- std::enable_if_t< \
- Detail::conjunction< \
- Detail::negation<Detail::is_##id##_comparable<LhsT, RhsT>>, \
- Detail::is_eq_0_comparable<RhsT>, \
- Detail::disjunction<std::is_same<LhsT, int>, \
- /* On some platforms `NULL` is a long */ \
- std::is_same<LhsT, long>>>::value, \
- int> = 0> \
+ std::enable_if_t<!Detail::is_##id##_comparable<LhsT, RhsT>::value && \
+ Detail::is_eq_0_comparable<RhsT>:: \
+ value && /* We allow long because we want \
+ `ptr op NULL` to be accepted */ \
+ ( std::is_same<LhsT, int>::value || \
+ std::is_same<LhsT, long>::value ), \
+ int> = 0> \
friend auto operator op( ExprLhs&& lhs, RhsT rhs ) \
->BinaryExpr<LhsT, RhsT> { \
- if ( lhs.m_lhs != 0 ) { throw_test_failure_exception(); } \
+ if ( lhs.m_lhs != 0 ) { \
+ throw_test_failure_exception(); \
+ } \
return { static_cast<bool>( 0 op rhs ), lhs.m_lhs, #op##_sr, rhs }; \
}
CATCH_INTERNAL_DEFINE_EXPRESSION_EQUALITY_OPERATOR( eq, == )
CATCH_INTERNAL_DEFINE_EXPRESSION_EQUALITY_OPERATOR( ne, != )
-#undef CATCH_INTERNAL_DEFINE_EXPRESSION_EQUALITY_OPERATOR
+ #undef CATCH_INTERNAL_DEFINE_EXPRESSION_EQUALITY_OPERATOR
-#define CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR( id, op ) \
+ #define CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR( id, op ) \
template < \
typename RhsT, \
std::enable_if_t< \
- Detail::conjunction<Detail::is_##id##_comparable<LhsT, RhsT>, \
- Detail::negation<std::is_arithmetic< \
- std::remove_reference_t<RhsT>>>>::value, \
+ Detail::is_##id##_comparable<LhsT, RhsT>::value && \
+ !std::is_arithmetic<std::remove_reference_t<RhsT>>::value, \
int> = 0> \
friend auto operator op( ExprLhs&& lhs, RhsT&& rhs ) \
->BinaryExpr<LhsT, RhsT const&> { \
return { \
static_cast<bool>( lhs.m_lhs op rhs ), lhs.m_lhs, #op##_sr, rhs }; \
} \
- template <typename RhsT, \
- std::enable_if_t<Detail::conjunction< \
- Detail::is_##id##_comparable<LhsT, RhsT>, \
- std::is_arithmetic<RhsT>>::value, \
- int> = 0> \
+ template < \
+ typename RhsT, \
+ std::enable_if_t<Detail::is_##id##_comparable<LhsT, RhsT>::value && \
+ std::is_arithmetic<RhsT>::value, \
+ int> = 0> \
friend auto operator op( ExprLhs&& lhs, RhsT rhs ) \
->BinaryExpr<LhsT, RhsT> { \
return { \
@@ -249,29 +248,29 @@ namespace Catch {
} \
template < \
typename RhsT, \
- std::enable_if_t< \
- Detail::conjunction< \
- Detail::negation<Detail::is_##id##_comparable<LhsT, RhsT>>, \
- Detail::is_##id##_0_comparable<LhsT>, \
- std::is_same<RhsT, int>>::value, \
- int> = 0> \
+ std::enable_if_t<!Detail::is_##id##_comparable<LhsT, RhsT>::value && \
+ Detail::is_##id##_0_comparable<LhsT>::value && \
+ std::is_same<RhsT, int>::value, \
+ int> = 0> \
friend auto operator op( ExprLhs&& lhs, RhsT rhs ) \
->BinaryExpr<LhsT, RhsT> { \
- if ( rhs != 0 ) { throw_test_failure_exception(); } \
+ if ( rhs != 0 ) { \
+ throw_test_failure_exception(); \
+ } \
return { \
static_cast<bool>( lhs.m_lhs op 0 ), lhs.m_lhs, #op##_sr, rhs }; \
} \
template < \
typename RhsT, \
- std::enable_if_t< \
- Detail::conjunction< \
- Detail::negation<Detail::is_##id##_comparable<LhsT, RhsT>>, \
- Detail::is_##id##_0_comparable<RhsT>, \
- std::is_same<LhsT, int>>::value, \
- int> = 0> \
+ std::enable_if_t<!Detail::is_##id##_comparable<LhsT, RhsT>::value && \
+ Detail::is_##id##_0_comparable<RhsT>::value && \
+ std::is_same<LhsT, int>::value, \
+ int> = 0> \
friend auto operator op( ExprLhs&& lhs, RhsT rhs ) \
->BinaryExpr<LhsT, RhsT> { \
- if ( lhs.m_lhs != 0 ) { throw_test_failure_exception(); } \
+ if ( lhs.m_lhs != 0 ) { \
+ throw_test_failure_exception(); \
+ } \
return { static_cast<bool>( 0 op rhs ), lhs.m_lhs, #op##_sr, rhs }; \
}
@@ -280,7 +279,7 @@ namespace Catch {
CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR( gt, > )
CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR( ge, >= )
-#undef CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR
+ #undef CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR
#define CATCH_INTERNAL_DEFINE_EXPRESSION_OPERATOR(op) \