1 --- a/boost/mpl/has_xxx.hpp.orig 2011-11-18 13:45:00.000000000 +0100
2 +++ b/boost/mpl/has_xxx.hpp 2011-11-18 13:47:19.000000000 +0100
7 -# if !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
8 +# if !defined(BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION) || !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
9 # define BOOST_MPL_HAS_MEMBER_REJECT(args, member_macro) \
10 template< typename V > \
11 static boost::mpl::aux::no_tag \
16 -# if !BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES
17 +# if !defined(BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES) || !BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES
18 # define BOOST_MPL_HAS_MEMBER_MULTI_ACCEPT(z, n, args) \
19 template< typename V > \
20 static boost::mpl::aux::yes_tag \
25 -# if !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
26 +# if !defined(BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION) || !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
27 # define BOOST_MPL_HAS_MEMBER_TEST(args) \
28 sizeof(BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)< U >(0)) \
29 == sizeof(boost::mpl::aux::yes_tag) \
34 -# if BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE
35 +# if defined(BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE) && BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE
37 # if !defined(BOOST_MPL_HAS_XXX_NEEDS_NAMESPACE_LEVEL_SUBSTITUTE)
38 # if BOOST_WORKAROUND(BOOST_MSVC, <= 1400)