[Boost-commit] svn:boost r85951 - in trunk/boost/variant: . detail

Subject: [Boost-commit] svn:boost r85951 - in trunk/boost/variant: . detail
From: steveire_at_[hidden]
Date: 2013-09-26 05:48:32

Author: skelly
Date: 2013-09-26 05:48:32 EDT (Thu, 26 Sep 2013)
New Revision: 85951
URL: http://svn.boost.org/trac/boost/changeset/85951

Log:
Variant: Remove use of obsolete macros.

Text files modified: 
   trunk/boost/variant/detail/initializer.hpp |    11 ++++++++---                             
   trunk/boost/variant/variant.hpp            |     6 ++----                                  
   2 files changed, 10 insertions(+), 7 deletions(-)

Modified: trunk/boost/variant/detail/initializer.hpp
==============================================================================
--- trunk/boost/variant/detail/initializer.hpp	Thu Sep 26 05:48:16 2013	(r85950)
+++ trunk/boost/variant/detail/initializer.hpp	2013-09-26 05:48:32 EDT (Thu, 26 Sep 2013)	(r85951)
@@ -167,13 +167,18 @@
             >::param_type BOOST_PP_CAT(param_T,N); \
     /**/
 
-template < BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_PARAMS >
+template < BOOST_VARIANT_ENUM_PARAMS(typename recursive_enabled_T) >
 struct preprocessor_list_initializer
 {
 public: // static functions
 
     #define BOOST_VARIANT_AUX_PP_INITIALIZE_FUNCTION(z,N,_) \
-        BOOST_VARIANT_AUX_PP_INITIALIZER_DEFINE_PARAM_T(N) \
+        typedef typename unwrap_recursive< \
+              BOOST_PP_CAT(recursive_enabled_T,N) \
+            >::type BOOST_PP_CAT(public_T,N); \
+        typedef typename call_traits< \
+              BOOST_PP_CAT(public_T,N) \
+            >::param_type BOOST_PP_CAT(param_T,N); \
         static int initialize( \
               void* dest \
             , BOOST_PP_CAT(param_T,N) operand \
@@ -235,7 +240,7 @@
 
 #define BOOST_VARIANT_AUX_INITIALIZER_T( mpl_seq, typename_base ) \
     ::boost::detail::variant::preprocessor_list_initializer< \
-          BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_ARGS(typename_base) \
+          BOOST_VARIANT_ENUM_PARAMS(typename_base) \
         > \
     /**/
 

Modified: trunk/boost/variant/variant.hpp
==============================================================================
--- trunk/boost/variant/variant.hpp	Thu Sep 26 05:48:16 2013	(r85950)
+++ trunk/boost/variant/variant.hpp	2013-09-26 05:48:32 EDT (Thu, 26 Sep 2013)	(r85951)
@@ -2164,15 +2164,13 @@
     void
 
     template <typename U>
-        BOOST_VARIANT_AUX_FAIL_COMPARISON_RETURN_TYPE
-    operator==(const U&) const
+    void operator==(const U&) const
     {
         BOOST_STATIC_ASSERT( false && sizeof(U) );
     }
 
     template <typename U>
-        BOOST_VARIANT_AUX_FAIL_COMPARISON_RETURN_TYPE
-    operator<(const U&) const
+    void operator<(const U&) const
     {
         BOOST_STATIC_ASSERT( false && sizeof(U) );
     }