[Boost-commit] svn:boost r69029 - in sandbox/assign_v2/boost/assign/v2/put: container/csv deque ext frame modulo pipe/csv pipe/functor pipe/functor/cpp03

Subject: [Boost-commit] svn:boost r69029 - in sandbox/assign_v2/boost/assign/v2/put: container/csv deque ext frame modulo pipe/csv pipe/functor pipe/functor/cpp03
From: erwann.rogard_at_[hidden]
Date: 2011-02-19 05:40:33

Author: e_r
Date: 2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
New Revision: 69029
URL: http://svn.boost.org/trac/boost/changeset/69029

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/put/container/csv/adapter.hpp      |    12 ++++++------                            
   sandbox/assign_v2/boost/assign/v2/put/deque/csv.hpp                  |    13 +++++++------                           
   sandbox/assign_v2/boost/assign/v2/put/deque/functor.hpp              |    18 +++++++++---------                      
   sandbox/assign_v2/boost/assign/v2/put/ext/repeat.hpp                 |     8 ++++----                                
   sandbox/assign_v2/boost/assign/v2/put/ext/xxx.hpp                    |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp                 |     6 +++---                                  
   sandbox/assign_v2/boost/assign/v2/put/modulo/generic.hpp             |     4 +---                                    
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp         |    14 +++++++-------                          
   sandbox/assign_v2/boost/assign/v2/put/pipe/functor/cpp03/forward.hpp |    12 ++++++------                            
   sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp           |    10 +++++-----                              
   10 files changed, 49 insertions(+), 50 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/put/container/csv/adapter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/csv/adapter.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/csv/adapter.hpp	2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
@@ -69,22 +69,22 @@
         }
 
 #else
-#define MACRO1(z, i, data) ( BOOST_PP_CAT(_, i) )
-#define MACRO2(z, N, data)\
+#define BOOST_ASSIGN_V2_MACRO1(z, i, data) ( BOOST_PP_CAT(_, i) )
+#define BOOST_ASSIGN_V2_MACRO2(z, N, data)\
     typename result_of::put<C>::type\
     operator()( BOOST_PP_ENUM_PARAMS(N, value_type const & _) )\
     {\
-        return put( this->get() ) BOOST_PP_REPEAT(N, MACRO1, ~ );\
+        return put( this->get() ) BOOST_PP_REPEAT(N, BOOST_ASSIGN_V2_MACRO1, ~ );\
     }\
 /**/
 BOOST_PP_REPEAT_FROM_TO(
         1,
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_CSV_ARITY),
-    MACRO2,
+    BOOST_ASSIGN_V2_MACRO2,
     ~
 )
-#undef MACRO1
-#undef MACRO2
+#undef BOOST_ASSIGN_V2_MACRO1
+#undef BOOST_ASSIGN_V2_MACRO2
 #endif
                 C& container()const{
                 return static_cast<super1_t const&>(*this).get();

Modified: sandbox/assign_v2/boost/assign/v2/put/deque/csv.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/csv.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/csv.hpp	2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
@@ -13,6 +13,7 @@
 #include <boost/assign/v2/detail/keyword/nil.hpp>
 #include <boost/assign/v2/put/deque/cont.hpp>
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
+#include <boost/assign/v2/put/deque/functor.hpp>
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <utility>
 #else
@@ -59,8 +60,8 @@
     }
 
 #else
-#define MACRO1(z, i, data) ( BOOST_PP_CAT(_, i) )
-#define MACRO2(z, N, data)\
+#define BOOST_ASSIGN_V2_MACRO1(z, i, data) ( BOOST_PP_CAT(_, i) )
+#define BOOST_ASSIGN_V2_MACRO2(z, N, data)\
         template<typename T>\
     typename result_of::deque<\
             typename boost::decay<T>::type\
@@ -68,17 +69,17 @@
     csv_deque( BOOST_PP_ENUM_PARAMS(N, T const & _) )\
     {\
             typedef typename boost::decay<T>::type decay_;\
-        return deque<decay_>( v2::_nil) BOOST_PP_REPEAT(N, MACRO1, ~ );\
+        return deque<decay_>( v2::_nil) BOOST_PP_REPEAT(N, BOOST_ASSIGN_V2_MACRO1, ~ );\
     }\
 /**/
 BOOST_PP_REPEAT_FROM_TO(
         1,
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_CSV_ARITY),
-    MACRO2,
+    BOOST_ASSIGN_V2_MACRO2,
     ~
 )
-#undef MACRO1
-#undef MACRO2
+#undef BOOST_ASSIGN_V2_MACRO1
+#undef BOOST_ASSIGN_V2_MACRO2
 #endif
 
 }// v2

Modified: sandbox/assign_v2/boost/assign/v2/put/deque/functor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/functor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/functor.hpp	2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
@@ -71,7 +71,7 @@
         return deque<T>(v2::_nil)();
     }
 
-#define MACRO1(r, SeqU) \
+#define BOOST_ASSIGN_V2_MACRO1(r, SeqU) \
     template<typename T, BOOST_ASSIGN_V2_decl_params(SeqU)> \
     typename result_of::deque<T>::type\
     deque( BOOST_ASSIGN_V2_decl_args(SeqU) ){ \
@@ -80,20 +80,20 @@
         ); \
     } \
 /**/
-#define MACRO2(z, n, data) BOOST_PP_SEQ_FOR_EACH_PRODUCT(\
-	MACRO1, \
+#define BOOST_ASSIGN_V2_MACRO2(z, n, data) BOOST_PP_SEQ_FOR_EACH_PRODUCT(\
+	BOOST_ASSIGN_V2_MACRO1, \
     BOOST_PP_SEQ_FIRST_N(BOOST_PP_INC(n), BOOST_ASSIGN_V2_SEQ)\
 ) \
 /**/
 BOOST_PP_REPEAT(
         BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY,
-    MACRO2,
+    BOOST_ASSIGN_V2_MACRO2,
     ~
 )
-#undef MACRO1
-#undef MACRO2
+#undef BOOST_ASSIGN_V2_MACRO1
+#undef BOOST_ASSIGN_V2_MACRO2
 
-#define MACRO(z, N, data) \
+#define BOOST_ASSIGN_V2_MACRO(z, N, data) \
     template<typename T BOOST_PP_ENUM_TRAILING_PARAMS(N, typename U)> \
     typename result_of::deque<T>::type\
     deque( BOOST_PP_ENUM_BINARY_PARAMS(N, U, &_) ){ \
@@ -112,10 +112,10 @@
 BOOST_PP_REPEAT_FROM_TO(
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY),
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_ARITY),
-    MACRO,
+    BOOST_ASSIGN_V2_MACRO,
     ~
 )
-#undef MACRO
+#undef BOOST_ASSIGN_V2_MACRO
 
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 

Modified: sandbox/assign_v2/boost/assign/v2/put/ext/repeat.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/ext/repeat.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/ext/repeat.hpp	2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
@@ -45,7 +45,7 @@
         {
         }
 
-#define MACRO(arg)\
+#define BOOST_ASSIGN_V2_MACRO(arg)\
         size_type m = this->n;\
         while(m--) this->inner.impl(\
             v,\
@@ -56,16 +56,16 @@
         void impl(V& v, BOOST_ASSIGN_V2_forward_param(T, t) )const
         {
 
-            MACRO( BOOST_ASSIGN_V2_forward_arg(T, t) )
+            BOOST_ASSIGN_V2_MACRO( BOOST_ASSIGN_V2_forward_arg(T, t) )
         }
 
             template<typename V, typename T>
         void impl(V& v, T* t)const
         {
-            MACRO( t )
+            BOOST_ASSIGN_V2_MACRO( t )
         }
 
-#undef MACRO
+#undef BOOST_ASSIGN_V2_MACRO
 
         size_type const& size()const{ return this->n; }
 

Modified: sandbox/assign_v2/boost/assign/v2/put/ext/xxx.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/ext/xxx.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/ext/xxx.hpp	2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
@@ -15,7 +15,7 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_base_of.hpp>
 
-/* needed throughout /put/ext : */ 
+// Needed by dependants
 #include <boost/assign/v2/detail/keyword/nil.hpp> 
 #include <boost/assign/v2/put/modulo/modifier.hpp>
 #include <boost/assign/v2/put/frame/base.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp	2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
@@ -128,7 +128,7 @@
         public:
                 using super_t::operator();
 
-#define MACRO(z, N, data) \
+#define BOOST_ASSIGN_V2_MACRO(z, N, data) \
         template<BOOST_PP_ENUM_PARAMS(N, typename T)> \
     result_type \
     impl( BOOST_PP_ENUM_BINARY_PARAMS(N, T, & _) )const \
@@ -139,10 +139,10 @@
 BOOST_PP_REPEAT_FROM_TO(
         1,
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_ARITY),
-    MACRO,
+    BOOST_ASSIGN_V2_MACRO,
     ~
 )
-#undef MACRO
+#undef BOOST_ASSIGN_V2_MACRO
 #endif
                 C& container()const{ return this->derived().container(); }
 

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/generic.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/generic.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/generic.hpp	2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
@@ -20,15 +20,13 @@
     template<typename T>
     struct generic_
     {
-    
             template<typename P>
         struct apply
         {
                 static T t;
             static P p;
             typedef BOOST_TYPEOF_TPL( t % p ) type;
-        };
-    
+        };    
     };
     
 }// result_of_modulo

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp	2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
@@ -127,38 +127,38 @@
 
 #else
 
-#define MACRO1(N, U)\
+#define BOOST_ASSIGN_V2_MACRO1(N, U)\
     return result_( \
         this->pars_cont, \
         ref::csv_array<U>( BOOST_PP_ENUM_PARAMS(N, _) ) \
     );\
 /**/
 
-#define MACRO2(z, N, data)\
+#define BOOST_ASSIGN_V2_MACRO2(z, N, data)\
         template<typename T>\
         typename result<N, T>::type\
     operator()( BOOST_PP_ENUM_PARAMS(N, T &_) )const \
     { \
             typedef typename result<N, T>::type result_;\
-        MACRO1( N, T )\
+        BOOST_ASSIGN_V2_MACRO1( N, T )\
     } \
         template<typename T>\
         typename result<N, T const>::type\
     operator()( BOOST_PP_ENUM_PARAMS(N, T const &_) )const \
     { \
             typedef typename result<N, T const>::type result_;\
-        MACRO1( N, T const )\
+        BOOST_ASSIGN_V2_MACRO1( N, T const )\
     } \
 /**/
 
 BOOST_PP_REPEAT_FROM_TO(
         1,
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_CSV_ARITY),
-    MACRO2,
+    BOOST_ASSIGN_V2_MACRO2,
     ~
 )
-#undef MACRO1
-#undef MACRO2
+#undef BOOST_ASSIGN_V2_MACRO1
+#undef BOOST_ASSIGN_V2_MACRO2
 
 #endif
 

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/functor/cpp03/forward.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/functor/cpp03/forward.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/functor/cpp03/forward.hpp	2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
@@ -25,24 +25,24 @@
 
     // --- Tuple --- //
 
-#define MACRO1(z, I, data) ::boost::get<I>( data )
-#define MACRO(z, N, data)\
+#define BOOST_ASSIGN_V2_MACRO1(z, I, data) ::boost::get<I>( data )
+#define BOOST_ASSIGN_V2_MACRO(z, N, data)\
     template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)>\
     void forward(\
         F const& f,\
         ::boost::tuples::tuple<BOOST_PP_ENUM_PARAMS(N, T)> const& t\
     )\
     {\
-        f( BOOST_PP_ENUM(N, MACRO1, t) );\
+        f( BOOST_PP_ENUM(N, BOOST_ASSIGN_V2_MACRO1, t) );\
     }\
 /**/
 BOOST_PP_REPEAT(
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_ARITY),
-    MACRO,
+    BOOST_ASSIGN_V2_MACRO,
     ~
 )
-#undef MACRO1
-#undef MACRO
+#undef BOOST_ASSIGN_V2_MACRO1
+#undef BOOST_ASSIGN_V2_MACRO
     // --- List  --- //
 
 #define params(T) BOOST_PP_ENUM_PARAMS(BOOST_ASSIGN_V2_LIMIT_ARITY,T)

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp	2011-02-19 05:40:31 EST (Sat, 19 Feb 2011)
@@ -216,10 +216,10 @@
 
                 using super_t::operator();
 
-#define MACRO1( z, n, data )\
+#define BOOST_ASSIGN_V2_MACRO1( z, n, data )\
  ( BOOST_PP_CAT(_,n) )\
 /**/
-#define MACRO2(z, N1, data)\
+#define BOOST_ASSIGN_V2_MACRO2(z, N1, data)\
     template<BOOST_PP_ENUM_PARAMS(N1, typename U)>\
     typename result<\
         ::boost::mpl::vector<\
@@ -240,11 +240,11 @@
 BOOST_PP_REPEAT_FROM_TO(
         1,
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_ARITY),
-    MACRO2,
+    BOOST_ASSIGN_V2_MACRO2,
     ~
 )
-#undef MACRO1
-#undef MACRO2
+#undef BOOST_ASSIGN_V2_MACRO1
+#undef BOOST_ASSIGN_V2_MACRO2
 
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X