diff --git a/include/boost/type_traits/composite_traits.hpp b/include/boost/type_traits/composite_traits.hpp index fd7b62d..3f831ac 100644 --- a/include/boost/type_traits/composite_traits.hpp +++ b/include/boost/type_traits/composite_traits.hpp @@ -131,7 +131,7 @@ template struct is_pointer_helper { BOOST_DECL_MC(bool, value, true); }; } // namespace detail template struct is_pointer -{ BOOST_DECL_MC(bool, value, (::boost::type_traits::ice_and< ::boost::detail::is_pointer_helper::value, !::boost::is_member_pointer::value>::value)); }; +{ BOOST_DECL_MC(bool, value, (::boost::type_traits::ice_and< ::boost::detail::is_pointer_helper::value, ::boost::type_traits::ice_not< ::boost::is_member_pointer::value >::value >::value)); }; #else template struct is_pointer @@ -254,8 +254,8 @@ template struct is_enum { BOOST_DECL_MC(bool, value, (::boost::type_traits::ice_and< - !::boost::is_arithmetic::value, - !::boost::is_reference::value, + ::boost::type_traits::ice_not< ::boost::is_arithmetic::value>::value, + ::boost::type_traits::ice_not< ::boost::is_reference::value>::value, ::boost::is_convertible::value >::value)); };