Subject: [Boost-commit] svn:boost r85886 - trunk/boost/mpl
From: steveire_at_[hidden]
Date: 2013-09-25 04:26:31
Author: skelly
Date: 2013-09-25 04:26:31 EDT (Wed, 25 Sep 2013)
New Revision: 85886
URL: http://svn.boost.org/trac/boost/changeset/85886
Log:
MPL: Remove use of obsolete BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
Text files modified:
trunk/boost/mpl/has_xxx.hpp | 49 +++++++--------------------------------
1 files changed, 9 insertions(+), 40 deletions(-)
Modified: trunk/boost/mpl/has_xxx.hpp
==============================================================================
--- trunk/boost/mpl/has_xxx.hpp Wed Sep 25 04:26:10 2013 (r85885)
+++ trunk/boost/mpl/has_xxx.hpp 2013-09-25 04:26:31 EDT (Wed, 25 Sep 2013) (r85886)
@@ -295,10 +295,6 @@
# endif
# endif
-# if !defined(BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION)
-# define BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION 0
-# endif
-
# if !defined(BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE)
# if BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
# define BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE 1
@@ -343,18 +339,11 @@
) \
/**/
-# if !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
-# define BOOST_MPL_HAS_MEMBER_REJECT(args, member_macro) \
- template< typename V > \
- static boost::mpl::aux::no_tag \
- BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)(...); \
- /**/
-# else
-# define BOOST_MPL_HAS_MEMBER_REJECT(args, member_macro) \
- static boost::mpl::aux::no_tag \
- BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)(...); \
- /**/
-# endif
+# define BOOST_MPL_HAS_MEMBER_REJECT(args, member_macro) \
+ template< typename V > \
+ static boost::mpl::aux::no_tag \
+ BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)(...); \
+ /**/
# if !BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES
# define BOOST_MPL_HAS_MEMBER_MULTI_ACCEPT(z, n, args) \
@@ -385,30 +374,10 @@
/**/
# endif
-# if !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION
-# define BOOST_MPL_HAS_MEMBER_TEST(args) \
- sizeof(BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)< U >(0)) \
- == sizeof(boost::mpl::aux::yes_tag) \
- /**/
-# else
-# if !BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES
-# define BOOST_MPL_HAS_MEMBER_TEST(args) \
- sizeof( \
- BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)( \
- static_cast< boost::mpl::aux::type_wrapper< U >* >(0) \
- ) \
- ) == sizeof(boost::mpl::aux::yes_tag) \
- /**/
-# else
-# define BOOST_MPL_HAS_MEMBER_TEST(args) \
- sizeof( \
- BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)( \
- static_cast< U* >(0) \
- ) \
- ) == sizeof(boost::mpl::aux::yes_tag) \
- /**/
-# endif
-# endif
+# define BOOST_MPL_HAS_MEMBER_TEST(args) \
+ sizeof(BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)< U >(0)) \
+ == sizeof(boost::mpl::aux::yes_tag) \
+ /**/
# define BOOST_MPL_HAS_MEMBER_INTROSPECT( \
args, substitute_macro, member_macro \