From 1b1f90fdea5b264847fe43fe653db014d4e69501 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sat, 17 Jan 2015 12:00:22 +0000 Subject: [PATCH] Remove dependency on ice.hpp for operator traits. --- .../detail/has_binary_operator.hpp | 10 +-- .../detail/has_postfix_operator.hpp | 10 +-- .../detail/has_prefix_operator.hpp | 10 +-- include/boost/type_traits/has_bit_and.hpp | 38 ++++++------ .../boost/type_traits/has_bit_and_assign.hpp | 46 +++++++------- include/boost/type_traits/has_bit_or.hpp | 38 ++++++------ .../boost/type_traits/has_bit_or_assign.hpp | 46 +++++++------- include/boost/type_traits/has_bit_xor.hpp | 38 ++++++------ .../boost/type_traits/has_bit_xor_assign.hpp | 46 +++++++------- include/boost/type_traits/has_complement.hpp | 14 ++--- include/boost/type_traits/has_dereference.hpp | 10 +-- include/boost/type_traits/has_divides.hpp | 28 ++++----- .../boost/type_traits/has_divides_assign.hpp | 36 +++++------ include/boost/type_traits/has_equal_to.hpp | 40 ++++++------ include/boost/type_traits/has_greater.hpp | 40 ++++++------ .../boost/type_traits/has_greater_equal.hpp | 40 ++++++------ include/boost/type_traits/has_left_shift.hpp | 38 ++++++------ .../type_traits/has_left_shift_assign.hpp | 46 +++++++------- include/boost/type_traits/has_less.hpp | 40 ++++++------ include/boost/type_traits/has_less_equal.hpp | 40 ++++++------ include/boost/type_traits/has_logical_and.hpp | 32 +++++----- include/boost/type_traits/has_logical_or.hpp | 32 +++++----- include/boost/type_traits/has_minus.hpp | 58 ++++++++--------- .../boost/type_traits/has_minus_assign.hpp | 58 ++++++++--------- include/boost/type_traits/has_modulus.hpp | 38 ++++++------ .../boost/type_traits/has_modulus_assign.hpp | 46 +++++++------- include/boost/type_traits/has_multiplies.hpp | 28 ++++----- .../type_traits/has_multiplies_assign.hpp | 36 +++++------ .../boost/type_traits/has_not_equal_to.hpp | 40 ++++++------ include/boost/type_traits/has_plus.hpp | 46 +++++++------- include/boost/type_traits/has_plus_assign.hpp | 62 +++++++++---------- .../boost/type_traits/has_post_decrement.hpp | 22 +++---- .../boost/type_traits/has_post_increment.hpp | 22 +++---- .../boost/type_traits/has_pre_decrement.hpp | 22 +++---- .../boost/type_traits/has_pre_increment.hpp | 22 +++---- include/boost/type_traits/has_right_shift.hpp | 38 ++++++------ .../type_traits/has_right_shift_assign.hpp | 46 +++++++------- 37 files changed, 642 insertions(+), 660 deletions(-) diff --git a/include/boost/type_traits/detail/has_binary_operator.hpp b/include/boost/type_traits/detail/has_binary_operator.hpp index b34ff6a..8d44ddd 100644 --- a/include/boost/type_traits/detail/has_binary_operator.hpp +++ b/include/boost/type_traits/detail/has_binary_operator.hpp @@ -7,7 +7,7 @@ // See http://www.boost.org/libs/type_traits for most recent version including documentation. #include -#include +#include #include #include #include @@ -174,13 +174,7 @@ struct trait_impl1 < Lhs, Rhs, Ret, true > { template < typename Lhs, typename Rhs, typename Ret > struct trait_impl1 < Lhs, Rhs, Ret, false > { BOOST_STATIC_CONSTANT(bool, - value = ( - ::boost::type_traits::ice_and< - operator_exists < Lhs, Rhs >::value, - operator_returns_Ret < Lhs, Rhs, Ret, operator_returns_void < Lhs, Rhs >::value >::value - >::value - ) - ); + value = (operator_exists < Lhs, Rhs >::value && operator_returns_Ret < Lhs, Rhs, Ret, operator_returns_void < Lhs, Rhs >::value >::value)); }; // some specializations needs to be declared for the special void case diff --git a/include/boost/type_traits/detail/has_postfix_operator.hpp b/include/boost/type_traits/detail/has_postfix_operator.hpp index 00d6aa3..a305b3b 100644 --- a/include/boost/type_traits/detail/has_postfix_operator.hpp +++ b/include/boost/type_traits/detail/has_postfix_operator.hpp @@ -7,7 +7,7 @@ // See http://www.boost.org/libs/type_traits for most recent version including documentation. #include -#include +#include #include #include #include @@ -160,13 +160,7 @@ struct trait_impl1 < Lhs, Ret, true > { template < typename Lhs, typename Ret > struct trait_impl1 < Lhs, Ret, false > { BOOST_STATIC_CONSTANT(bool, - value = ( - ::boost::type_traits::ice_and< - operator_exists < Lhs >::value, - operator_returns_Ret < Lhs, Ret, operator_returns_void < Lhs >::value >::value - >::value - ) - ); + value = (operator_exists < Lhs >::value && operator_returns_Ret < Lhs, Ret, operator_returns_void < Lhs >::value >::value)); }; // specialization needs to be declared for the special void case diff --git a/include/boost/type_traits/detail/has_prefix_operator.hpp b/include/boost/type_traits/detail/has_prefix_operator.hpp index 6520e9c..bbfc93d 100644 --- a/include/boost/type_traits/detail/has_prefix_operator.hpp +++ b/include/boost/type_traits/detail/has_prefix_operator.hpp @@ -7,7 +7,7 @@ // See http://www.boost.org/libs/type_traits for most recent version including documentation. #include -#include +#include #include #include #include @@ -168,13 +168,7 @@ struct trait_impl1 < Rhs, Ret, true > { template < typename Rhs, typename Ret > struct trait_impl1 < Rhs, Ret, false > { BOOST_STATIC_CONSTANT(bool, - value = ( - ::boost::type_traits::ice_and< - operator_exists < Rhs >::value, - operator_returns_Ret < Rhs, Ret, operator_returns_void < Rhs >::value >::value - >::value - ) - ); + value = (operator_exists < Rhs >::value && operator_returns_Ret < Rhs, Ret, operator_returns_void < Rhs >::value >::value)); }; // specialization needs to be declared for the special void case diff --git a/include/boost/type_traits/has_bit_and.hpp b/include/boost/type_traits/has_bit_and.hpp index ee3307f..a16c71a 100644 --- a/include/boost/type_traits/has_bit_and.hpp +++ b/include/boost/type_traits/has_bit_and.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_bit_and #define BOOST_TT_TRAIT_OP & #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + ( \ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_bit_and_assign.hpp b/include/boost/type_traits/has_bit_and_assign.hpp index 5b3112a..01e25e3 100644 --- a/include/boost/type_traits/has_bit_and_assign.hpp +++ b/include/boost/type_traits/has_bit_and_assign.hpp @@ -12,38 +12,38 @@ #define BOOST_TT_TRAIT_NAME has_bit_and_assign #define BOOST_TT_TRAIT_OP &= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + (\ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Lhs==fundamental and Rhs==fundamental and Lhs==const */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_const< Lhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_bit_or.hpp b/include/boost/type_traits/has_bit_or.hpp index 922b4ce..6e76929 100644 --- a/include/boost/type_traits/has_bit_or.hpp +++ b/include/boost/type_traits/has_bit_or.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_bit_or #define BOOST_TT_TRAIT_OP | #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + ( \ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_bit_or_assign.hpp b/include/boost/type_traits/has_bit_or_assign.hpp index 5481b92..891c39c 100644 --- a/include/boost/type_traits/has_bit_or_assign.hpp +++ b/include/boost/type_traits/has_bit_or_assign.hpp @@ -12,38 +12,38 @@ #define BOOST_TT_TRAIT_NAME has_bit_or_assign #define BOOST_TT_TRAIT_OP |= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + ( \ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Lhs==fundamental and Rhs==fundamental and Lhs==const */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_const< Lhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_bit_xor.hpp b/include/boost/type_traits/has_bit_xor.hpp index 883dcf6..05173ac 100644 --- a/include/boost/type_traits/has_bit_xor.hpp +++ b/include/boost/type_traits/has_bit_xor.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_bit_xor #define BOOST_TT_TRAIT_OP ^ #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + ( \ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_bit_xor_assign.hpp b/include/boost/type_traits/has_bit_xor_assign.hpp index e2767cc..3866b7a 100644 --- a/include/boost/type_traits/has_bit_xor_assign.hpp +++ b/include/boost/type_traits/has_bit_xor_assign.hpp @@ -12,38 +12,38 @@ #define BOOST_TT_TRAIT_NAME has_bit_xor_assign #define BOOST_TT_TRAIT_OP ^= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + ( \ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Lhs==fundamental and Rhs==fundamental and Lhs==const */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_const< Lhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_complement.hpp b/include/boost/type_traits/has_complement.hpp index dafd9f5..d323e12 100644 --- a/include/boost/type_traits/has_complement.hpp +++ b/include/boost/type_traits/has_complement.hpp @@ -12,15 +12,15 @@ #define BOOST_TT_TRAIT_NAME has_complement #define BOOST_TT_TRAIT_OP ~ #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* pointer */\ - ::boost::is_pointer< Rhs_noref >::value,\ + ::boost::is_pointer< Rhs_noref >::value || \ /* fundamental non integral */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_noref >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value + (\ + ::boost::is_fundamental< Rhs_noref >::value && \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_dereference.hpp b/include/boost/type_traits/has_dereference.hpp index fe48e11..1e514cd 100644 --- a/include/boost/type_traits/has_dereference.hpp +++ b/include/boost/type_traits/has_dereference.hpp @@ -13,13 +13,13 @@ #define BOOST_TT_TRAIT_OP * #define BOOST_TT_FORBIDDEN_IF\ /* void* or fundamental */\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ + (\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ ::boost::is_void< Rhs_noptr >::value\ - >::value,\ + ) || \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value + ) #include diff --git a/include/boost/type_traits/has_divides.hpp b/include/boost/type_traits/has_divides.hpp index 277c2da..869e907 100644 --- a/include/boost/type_traits/has_divides.hpp +++ b/include/boost/type_traits/has_divides.hpp @@ -13,22 +13,22 @@ #define BOOST_TT_TRAIT_OP / #define BOOST_TT_FORBIDDEN_IF\ /* pointer with pointer or fundamental */\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ( \ + ::boost::is_fundamental< Rhs_nocv >::value || \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value,\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + )\ + )||\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + ( \ + ::boost::is_fundamental< Lhs_nocv >::value || \ ::boost::is_pointer< Lhs_noref >::value\ - >::value\ - >::value\ - >::value + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_divides_assign.hpp b/include/boost/type_traits/has_divides_assign.hpp index b21a05a..1a8e3c1 100644 --- a/include/boost/type_traits/has_divides_assign.hpp +++ b/include/boost/type_traits/has_divides_assign.hpp @@ -12,30 +12,30 @@ #define BOOST_TT_TRAIT_NAME has_divides_assign #define BOOST_TT_TRAIT_OP /= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Lhs==const and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_const< Lhs_noref >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_const< Lhs_noref >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs==pointer and (Rhs==fundamental or Rhs==pointer) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ( \ + ::boost::is_fundamental< Rhs_nocv >::value || \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value,\ + )\ + )||\ /* Rhs==pointer and (Lhs==fundamental or Lhs==pointer) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + ( \ + ::boost::is_fundamental< Lhs_nocv >::value || \ ::boost::is_pointer< Lhs_noref >::value\ - >::value\ - >::value\ - >::value + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_equal_to.hpp b/include/boost/type_traits/has_equal_to.hpp index c2245c2..d80a55d 100644 --- a/include/boost/type_traits/has_equal_to.hpp +++ b/include/boost/type_traits/has_equal_to.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_equal_to #define BOOST_TT_TRAIT_OP == #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==pointer and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Rhs==pointer and Lhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ ::boost::is_fundamental< Lhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs==pointer and Rhs==pointer and Lhs!=base(Rhs) and Rhs!=base(Lhs) and Lhs!=void* and Rhs!=void* */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_not<\ - ::boost::type_traits::ice_or<\ - ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value,\ - ::boost::is_same< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_void< Lhs_noptr >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_pointer< Rhs_noref >::value && \ + (! \ + (\ + ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value || \ + ::boost::is_same< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_void< Lhs_noptr >::value || \ ::boost::is_void< Rhs_noptr >::value\ - >::value\ - >::value\ - >::value\ - >::value + )\ + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_greater.hpp b/include/boost/type_traits/has_greater.hpp index ce32658..32e0a12 100644 --- a/include/boost/type_traits/has_greater.hpp +++ b/include/boost/type_traits/has_greater.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_greater #define BOOST_TT_TRAIT_OP > #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==pointer and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Rhs==pointer and Lhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ ::boost::is_fundamental< Lhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs==pointer and Rhs==pointer and Lhs!=base(Rhs) and Rhs!=base(Lhs) and Lhs!=void* and Rhs!=void* */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_not<\ - ::boost::type_traits::ice_or<\ - ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value,\ - ::boost::is_same< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_void< Lhs_noptr >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_pointer< Rhs_noref >::value && \ + (! \ + ( \ + ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value || \ + ::boost::is_same< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_void< Lhs_noptr >::value || \ ::boost::is_void< Rhs_noptr >::value\ - >::value\ - >::value\ - >::value\ - >::value + )\ + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_greater_equal.hpp b/include/boost/type_traits/has_greater_equal.hpp index 681685a..a933a6b 100644 --- a/include/boost/type_traits/has_greater_equal.hpp +++ b/include/boost/type_traits/has_greater_equal.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_greater_equal #define BOOST_TT_TRAIT_OP >= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==pointer and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Rhs==pointer and Lhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ ::boost::is_fundamental< Lhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs==pointer and Rhs==pointer and Lhs!=base(Rhs) and Rhs!=base(Lhs) and Lhs!=void* and Rhs!=void* */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_not<\ - ::boost::type_traits::ice_or<\ - ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value,\ - ::boost::is_same< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_void< Lhs_noptr >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_pointer< Rhs_noref >::value && \ + (! \ + ( \ + ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value || \ + ::boost::is_same< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_void< Lhs_noptr >::value || \ ::boost::is_void< Rhs_noptr >::value\ - >::value\ - >::value\ - >::value\ - >::value + )\ + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_left_shift.hpp b/include/boost/type_traits/has_left_shift.hpp index 88205d9..e95c12a 100644 --- a/include/boost/type_traits/has_left_shift.hpp +++ b/include/boost/type_traits/has_left_shift.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_left_shift #define BOOST_TT_TRAIT_OP << #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + ( \ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_left_shift_assign.hpp b/include/boost/type_traits/has_left_shift_assign.hpp index 0b3b9b1..74e0df9 100644 --- a/include/boost/type_traits/has_left_shift_assign.hpp +++ b/include/boost/type_traits/has_left_shift_assign.hpp @@ -12,38 +12,38 @@ #define BOOST_TT_TRAIT_NAME has_left_shift_assign #define BOOST_TT_TRAIT_OP <<= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + ( \ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Lhs==fundamental and Rhs==fundamental and Lhs==const */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_const< Lhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_less.hpp b/include/boost/type_traits/has_less.hpp index e1a045e..0eefcd2 100644 --- a/include/boost/type_traits/has_less.hpp +++ b/include/boost/type_traits/has_less.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_less #define BOOST_TT_TRAIT_OP < #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==pointer and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Rhs==pointer and Lhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ ::boost::is_fundamental< Lhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs==pointer and Rhs==pointer and Lhs!=base(Rhs) and Rhs!=base(Lhs) and Lhs!=void* and Rhs!=void* */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_not<\ - ::boost::type_traits::ice_or<\ - ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value,\ - ::boost::is_same< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_void< Lhs_noptr >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_pointer< Rhs_noref >::value && \ + (! \ + ( \ + ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value || \ + ::boost::is_same< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_void< Lhs_noptr >::value || \ ::boost::is_void< Rhs_noptr >::value\ - >::value\ - >::value\ - >::value\ - >::value + )\ + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_less_equal.hpp b/include/boost/type_traits/has_less_equal.hpp index c633b8b..4725bbd 100644 --- a/include/boost/type_traits/has_less_equal.hpp +++ b/include/boost/type_traits/has_less_equal.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_less_equal #define BOOST_TT_TRAIT_OP <= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==pointer and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Rhs==pointer and Lhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ ::boost::is_fundamental< Lhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs==pointer and Rhs==pointer and Lhs!=base(Rhs) and Rhs!=base(Lhs) and Lhs!=void* and Rhs!=void* */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_not<\ - ::boost::type_traits::ice_or<\ - ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value,\ - ::boost::is_same< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_void< Lhs_noptr >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_pointer< Rhs_noref >::value && \ + (! \ + ( \ + ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value || \ + ::boost::is_same< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_void< Lhs_noptr >::value || \ ::boost::is_void< Rhs_noptr >::value\ - >::value\ - >::value\ - >::value\ - >::value + )\ + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_logical_and.hpp b/include/boost/type_traits/has_logical_and.hpp index 5bfa1c3..3bb1733 100644 --- a/include/boost/type_traits/has_logical_and.hpp +++ b/include/boost/type_traits/has_logical_and.hpp @@ -13,22 +13,22 @@ #define BOOST_TT_TRAIT_OP && #define BOOST_TT_FORBIDDEN_IF\ /* pointer with fundamental non convertible to bool */\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_not< ::boost::is_convertible< Rhs_nocv, bool >::value >::value\ - >::value\ - >::value,\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::type_traits::ice_not< ::boost::is_convertible< Lhs_nocv, bool >::value >::value\ - >::value\ - >::value\ - >::value + (\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ( \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + (! ::boost::is_convertible< Rhs_nocv, bool >::value )\ + )\ + )||\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + ( \ + ::boost::is_fundamental< Lhs_nocv >::value && \ + (! ::boost::is_convertible< Lhs_nocv, bool >::value )\ + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_logical_or.hpp b/include/boost/type_traits/has_logical_or.hpp index a4ae6c5..a188726 100644 --- a/include/boost/type_traits/has_logical_or.hpp +++ b/include/boost/type_traits/has_logical_or.hpp @@ -13,22 +13,22 @@ #define BOOST_TT_TRAIT_OP || #define BOOST_TT_FORBIDDEN_IF\ /* pointer with fundamental non convertible to bool */\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_not< ::boost::is_convertible< Rhs_nocv, bool >::value >::value\ - >::value\ - >::value,\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::type_traits::ice_not< ::boost::is_convertible< Lhs_nocv, bool >::value >::value\ - >::value\ - >::value\ - >::value + (\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ + (! ::boost::is_convertible< Rhs_nocv, bool >::value )\ + )\ + )||\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + (! ::boost::is_convertible< Lhs_nocv, bool >::value )\ + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_minus.hpp b/include/boost/type_traits/has_minus.hpp index cc1d06b..5e13c16 100644 --- a/include/boost/type_traits/has_minus.hpp +++ b/include/boost/type_traits/has_minus.hpp @@ -12,43 +12,43 @@ #define BOOST_TT_TRAIT_NAME has_minus #define BOOST_TT_TRAIT_OP - #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==pointer and Rhs==fundamental and Rhs!=integral */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + (! ::boost::is_integral< Rhs_noref >::value )\ + ) || \ /* Lhs==void* and (Rhs==fundamental or Rhs==pointer) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_void< Lhs_noptr >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_void< Lhs_noptr >::value && \ + ( \ + ::boost::is_fundamental< Rhs_nocv >::value || \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value,\ + )\ + ) || \ /* Rhs==void* and (Lhs==fundamental or Lhs==pointer) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::is_void< Rhs_noptr >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + ::boost::is_void< Rhs_noptr >::value && \ + (\ + ::boost::is_fundamental< Lhs_nocv >::value || \ ::boost::is_pointer< Lhs_noref >::value\ - >::value\ - >::value,\ + )\ + ) ||\ /* Lhs=fundamental and Rhs=pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + ) ||\ /* two different pointers */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_not< ::boost::is_same< Lhs_nocv, Rhs_nocv >::value >::value\ - >::value\ - >::value + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_pointer< Rhs_noref >::value && \ + (! ::boost::is_same< Lhs_nocv, Rhs_nocv >::value )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_minus_assign.hpp b/include/boost/type_traits/has_minus_assign.hpp index 84ba359..b53474e 100644 --- a/include/boost/type_traits/has_minus_assign.hpp +++ b/include/boost/type_traits/has_minus_assign.hpp @@ -12,48 +12,48 @@ #define BOOST_TT_TRAIT_NAME has_minus_assign #define BOOST_TT_TRAIT_OP -= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==pointer and Rhs==fundamental and Rhs!=integral */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + (! ::boost::is_integral< Rhs_noref >::value )\ + ) || \ /* Lhs==void* and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_void< Lhs_noptr >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_void< Lhs_noptr >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Rhs==void* and Lhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::is_void< Rhs_noptr >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + ::boost::is_void< Rhs_noptr >::value && \ ::boost::is_fundamental< Lhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs=fundamental and Rhs=pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + ) || \ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + ) || \ /* (Lhs==fundamental or Lhs==pointer) and (Rhs==fundamental or Rhs==pointer) and (Lhs==const) */\ - ::boost::type_traits::ice_and<\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value || \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + ) && \ + (\ + ::boost::is_fundamental< Rhs_nocv >::value || \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + ) && \ ::boost::is_const< Lhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_modulus.hpp b/include/boost/type_traits/has_modulus.hpp index 6948728..24a815f 100644 --- a/include/boost/type_traits/has_modulus.hpp +++ b/include/boost/type_traits/has_modulus.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_modulus #define BOOST_TT_TRAIT_OP % #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + (\ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_modulus_assign.hpp b/include/boost/type_traits/has_modulus_assign.hpp index f0531f0..5e3e83f 100644 --- a/include/boost/type_traits/has_modulus_assign.hpp +++ b/include/boost/type_traits/has_modulus_assign.hpp @@ -12,38 +12,38 @@ #define BOOST_TT_TRAIT_NAME has_modulus_assign #define BOOST_TT_TRAIT_OP %= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + ( \ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Lhs==fundamental and Rhs==fundamental and Lhs==const */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_const< Lhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_multiplies.hpp b/include/boost/type_traits/has_multiplies.hpp index 4b578c5..591a0ce 100644 --- a/include/boost/type_traits/has_multiplies.hpp +++ b/include/boost/type_traits/has_multiplies.hpp @@ -13,22 +13,22 @@ #define BOOST_TT_TRAIT_OP * #define BOOST_TT_FORBIDDEN_IF\ /* pointer with pointer or fundamental */\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + (\ + ::boost::is_fundamental< Rhs_nocv >::value || \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value,\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + )\ + )||\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + (\ + ::boost::is_fundamental< Lhs_nocv >::value || \ ::boost::is_pointer< Lhs_noref >::value\ - >::value\ - >::value\ - >::value + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_multiplies_assign.hpp b/include/boost/type_traits/has_multiplies_assign.hpp index 1678b7b..b24f879 100644 --- a/include/boost/type_traits/has_multiplies_assign.hpp +++ b/include/boost/type_traits/has_multiplies_assign.hpp @@ -12,30 +12,30 @@ #define BOOST_TT_TRAIT_NAME has_multiplies_assign #define BOOST_TT_TRAIT_OP *= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Lhs==const and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_const< Lhs_noref >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_const< Lhs_noref >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs==pointer and (Rhs==fundamental or Rhs==pointer) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ( \ + ::boost::is_fundamental< Rhs_nocv >::value || \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value,\ + )\ + )||\ /* Rhs==pointer and (Lhs==fundamental or Lhs==pointer) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + ( \ + ::boost::is_fundamental< Lhs_nocv >::value || \ ::boost::is_pointer< Lhs_noref >::value\ - >::value\ - >::value\ - >::value + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_not_equal_to.hpp b/include/boost/type_traits/has_not_equal_to.hpp index e7e3700..c2b6705 100644 --- a/include/boost/type_traits/has_not_equal_to.hpp +++ b/include/boost/type_traits/has_not_equal_to.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_not_equal_to #define BOOST_TT_TRAIT_OP != #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==pointer and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Rhs==pointer and Lhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ ::boost::is_fundamental< Lhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs==pointer and Rhs==pointer and Lhs!=base(Rhs) and Rhs!=base(Lhs) and Lhs!=void* and Rhs!=void* */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::type_traits::ice_not<\ - ::boost::type_traits::ice_or<\ - ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value,\ - ::boost::is_same< Lhs_noptr, Rhs_noptr >::value,\ - ::boost::is_void< Lhs_noptr >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_pointer< Rhs_noref >::value && \ + (! \ + (\ + ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value || \ + ::boost::is_same< Lhs_noptr, Rhs_noptr >::value || \ + ::boost::is_void< Lhs_noptr >::value || \ ::boost::is_void< Rhs_noptr >::value\ - >::value\ - >::value\ - >::value\ - >::value + )\ + )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_plus.hpp b/include/boost/type_traits/has_plus.hpp index 70c1200..2d79328 100644 --- a/include/boost/type_traits/has_plus.hpp +++ b/include/boost/type_traits/has_plus.hpp @@ -12,37 +12,37 @@ #define BOOST_TT_TRAIT_NAME has_plus #define BOOST_TT_TRAIT_OP + #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + ) || \ /* Lhs==void* and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_void< Lhs_noptr >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_void< Lhs_noptr >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Rhs==void* and Lhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::is_void< Rhs_noptr >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + ::boost::is_void< Rhs_noptr >::value && \ ::boost::is_fundamental< Lhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs==pointer and Rhs==fundamental and Rhs!=integral */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + (! ::boost::is_integral< Rhs_noref >::value )\ + ) || \ /* Rhs==pointer and Lhs==fundamental and Lhs!=integral */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value\ - >::value\ - >::value + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + ::boost::is_fundamental< Lhs_nocv >::value && \ + (! ::boost::is_integral< Lhs_noref >::value )\ + )\ + ) #include diff --git a/include/boost/type_traits/has_plus_assign.hpp b/include/boost/type_traits/has_plus_assign.hpp index 6d65204..5ef6f23 100644 --- a/include/boost/type_traits/has_plus_assign.hpp +++ b/include/boost/type_traits/has_plus_assign.hpp @@ -12,49 +12,49 @@ #define BOOST_TT_TRAIT_NAME has_plus_assign #define BOOST_TT_TRAIT_OP += #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + ) || \ /* Lhs==void* and Rhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_void< Lhs_noptr >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_void< Lhs_noptr >::value && \ ::boost::is_fundamental< Rhs_nocv >::value\ - >::value,\ + ) || \ /* Rhs==void* and Lhs==fundamental */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::is_void< Rhs_noptr >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + ::boost::is_void< Rhs_noptr >::value && \ ::boost::is_fundamental< Lhs_nocv >::value\ - >::value,\ + ) || \ /* Lhs==pointer and Rhs==fundamental and Rhs!=integral */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + (! ::boost::is_integral< Rhs_noref >::value )\ + ) || \ /* Rhs==pointer and Lhs==fundamental and Lhs!=bool */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::type_traits::ice_not< ::boost::is_same< Lhs_nocv, bool >::value >::value\ - >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ + ::boost::is_fundamental< Lhs_nocv >::value && \ + (! ::boost::is_same< Lhs_nocv, bool >::value )\ + ) || \ /* (Lhs==fundamental or Lhs==pointer) and (Rhs==fundamental or Rhs==pointer) and (Lhs==const) */\ - ::boost::type_traits::ice_and<\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value || \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + ) && \ + ( \ + ::boost::is_fundamental< Rhs_nocv >::value || \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + ) && \ ::boost::is_const< Lhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_post_decrement.hpp b/include/boost/type_traits/has_post_decrement.hpp index 024acb0..e3f98ff 100644 --- a/include/boost/type_traits/has_post_decrement.hpp +++ b/include/boost/type_traits/has_post_decrement.hpp @@ -14,25 +14,25 @@ #define BOOST_TT_TRAIT_NAME has_post_decrement #define BOOST_TT_TRAIT_OP -- #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* bool */\ - ::boost::is_same< bool, Lhs_nocv >::value,\ + ::boost::is_same< bool, Lhs_nocv >::value || \ /* void* */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_void< Lhs_noptr >::value\ - >::value,\ + ) || \ /* (fundamental or pointer) and const */\ - ::boost::type_traits::ice_and<\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ( \ + ::boost::is_fundamental< Lhs_nocv >::value || \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + ) && \ ::boost::is_const< Lhs_noref >::value\ - >::value,\ + )||\ /* Arrays */ \ ::boost::is_array::value\ - >::value + ) #include diff --git a/include/boost/type_traits/has_post_increment.hpp b/include/boost/type_traits/has_post_increment.hpp index b055607..3861a2b 100644 --- a/include/boost/type_traits/has_post_increment.hpp +++ b/include/boost/type_traits/has_post_increment.hpp @@ -14,25 +14,25 @@ #define BOOST_TT_TRAIT_NAME has_post_increment #define BOOST_TT_TRAIT_OP ++ #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* bool */\ - ::boost::is_same< bool, Lhs_nocv >::value,\ + ::boost::is_same< bool, Lhs_nocv >::value || \ /* void* */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_void< Lhs_noptr >::value\ - >::value,\ + ) || \ /* (fundamental or pointer) and const */\ - ::boost::type_traits::ice_and<\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ( \ + ::boost::is_fundamental< Lhs_nocv >::value || \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + ) && \ ::boost::is_const< Lhs_noref >::value\ - >::value,\ + )||\ /* Arrays */ \ ::boost::is_array::value\ - >::value + ) #include diff --git a/include/boost/type_traits/has_pre_decrement.hpp b/include/boost/type_traits/has_pre_decrement.hpp index feb3d9d..7ef0783 100644 --- a/include/boost/type_traits/has_pre_decrement.hpp +++ b/include/boost/type_traits/has_pre_decrement.hpp @@ -14,25 +14,25 @@ #define BOOST_TT_TRAIT_NAME has_pre_decrement #define BOOST_TT_TRAIT_OP -- #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* bool */\ - ::boost::is_same< bool, Rhs_nocv >::value,\ + ::boost::is_same< bool, Rhs_nocv >::value || \ /* void* */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ ::boost::is_void< Rhs_noptr >::value\ - >::value,\ + ) || \ /* (fundamental or pointer) and const */\ - ::boost::type_traits::ice_and<\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ( \ + ::boost::is_fundamental< Rhs_nocv >::value || \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + ) && \ ::boost::is_const< Rhs_noref >::value\ - >::value,\ + )||\ /* Arrays */ \ ::boost::is_array::value\ - >::value + ) #include diff --git a/include/boost/type_traits/has_pre_increment.hpp b/include/boost/type_traits/has_pre_increment.hpp index 6a2411d..c4c9734 100644 --- a/include/boost/type_traits/has_pre_increment.hpp +++ b/include/boost/type_traits/has_pre_increment.hpp @@ -14,25 +14,25 @@ #define BOOST_TT_TRAIT_NAME has_pre_increment #define BOOST_TT_TRAIT_OP ++ #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* bool */\ - ::boost::is_same< bool, Rhs_nocv >::value,\ + ::boost::is_same< bool, Rhs_nocv >::value || \ /* void* */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Rhs_noref >::value,\ + (\ + ::boost::is_pointer< Rhs_noref >::value && \ ::boost::is_void< Rhs_noptr >::value\ - >::value,\ + ) || \ /* (fundamental or pointer) and const */\ - ::boost::type_traits::ice_and<\ - ::boost::type_traits::ice_or<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ( \ + ::boost::is_fundamental< Rhs_nocv >::value || \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + ) && \ ::boost::is_const< Rhs_noref >::value\ - >::value,\ + )||\ /* Arrays */ \ ::boost::is_array::value\ - >::value + ) #include diff --git a/include/boost/type_traits/has_right_shift.hpp b/include/boost/type_traits/has_right_shift.hpp index 5735870..5562911 100644 --- a/include/boost/type_traits/has_right_shift.hpp +++ b/include/boost/type_traits/has_right_shift.hpp @@ -12,32 +12,32 @@ #define BOOST_TT_TRAIT_NAME has_right_shift #define BOOST_TT_TRAIT_OP >> #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + ( \ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value\ - >::value + )\ + ) #include diff --git a/include/boost/type_traits/has_right_shift_assign.hpp b/include/boost/type_traits/has_right_shift_assign.hpp index 0536e71..0e2c263 100644 --- a/include/boost/type_traits/has_right_shift_assign.hpp +++ b/include/boost/type_traits/has_right_shift_assign.hpp @@ -12,38 +12,38 @@ #define BOOST_TT_TRAIT_NAME has_right_shift_assign #define BOOST_TT_TRAIT_OP >>= #define BOOST_TT_FORBIDDEN_IF\ - ::boost::type_traits::ice_or<\ + (\ /* Lhs==fundamental and Rhs==fundamental and (Lhs!=integral or Rhs!=integral) */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ - ::boost::type_traits::ice_or<\ - ::boost::type_traits::ice_not< ::boost::is_integral< Lhs_noref >::value >::value,\ - ::boost::type_traits::ice_not< ::boost::is_integral< Rhs_noref >::value >::value\ - >::value\ - >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ + ( \ + (! ::boost::is_integral< Lhs_noref >::value ) || \ + (! ::boost::is_integral< Rhs_noref >::value )\ + )\ + )||\ /* Lhs==fundamental and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Rhs==fundamental and Lhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_pointer< Lhs_noref >::value\ - >::value,\ + )||\ /* Lhs==pointer and Rhs==pointer */\ - ::boost::type_traits::ice_and<\ - ::boost::is_pointer< Lhs_noref >::value,\ + (\ + ::boost::is_pointer< Lhs_noref >::value && \ ::boost::is_pointer< Rhs_noref >::value\ - >::value,\ + )||\ /* Lhs==fundamental and Rhs==fundamental and Lhs==const */\ - ::boost::type_traits::ice_and<\ - ::boost::is_fundamental< Lhs_nocv >::value,\ - ::boost::is_fundamental< Rhs_nocv >::value,\ + (\ + ::boost::is_fundamental< Lhs_nocv >::value && \ + ::boost::is_fundamental< Rhs_nocv >::value && \ ::boost::is_const< Lhs_noref >::value\ - >::value\ - >::value + )\ + ) #include