From 7977b71a5e30350d8240157e7c28fcffc3b8f3e2 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Mon, 6 May 2002 10:34:36 +0000 Subject: [PATCH] Fixed integral constant expression bug. [SVN r13683] --- include/boost/type_traits/composite_traits.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/boost/type_traits/composite_traits.hpp b/include/boost/type_traits/composite_traits.hpp index 0df7747..4a4980e 100644 --- a/include/boost/type_traits/composite_traits.hpp +++ b/include/boost/type_traits/composite_traits.hpp @@ -938,9 +938,11 @@ namespace detail static T& make_t(); BOOST_STATIC_CONSTANT( - bool, value = ( - 1 == sizeof(detail::is_member_function_pointer_helper(make_t()))) - || (1 == sizeof(detail::is_member_pointer_helper(make_t()))) ); + bool, value = + (::boost::type_traits::ice_or< + (1 == sizeof(detail::is_member_function_pointer_helper(make_t()))), + (1 == sizeof(detail::is_member_pointer_helper(make_t()))) + >::value) ); }; }; }