[Boost-commit] svn:boost r71024 - in sandbox/assign_v2/boost/assign/v2: detail/traits/type ref/array ref/array/cpp03

Subject: [Boost-commit] svn:boost r71024 - in sandbox/assign_v2/boost/assign/v2: detail/traits/type ref/array ref/array/cpp03
From: erwann.rogard_at_[hidden]
Date: 2011-04-05 22:03:38

Author: e_r
Date: 2011-04-05 22:03:37 EDT (Tue, 05 Apr 2011)
New Revision: 71024
URL: http://svn.boost.org/trac/boost/changeset/71024

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp |     4 ++                                      
   sandbox/assign_v2/boost/assign/v2/ref/array/cpp03/csv_array.hpp   |     8 +----                                   
   sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp         |    53 ++++++++++++++++++++++----------------- 
   3 files changed, 35 insertions(+), 30 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp	2011-04-05 22:03:37 EDT (Tue, 05 Apr 2011)
@@ -20,7 +20,9 @@
 namespace v2{
 namespace type_traits{
 
-template<typename ...Args> struct or_const : ::boost::mpl::false_{};
+template<typename ...Args> struct or_const 
+	: ::boost::mpl::false_
+{};
 
 template<typename T, typename ...Args>
 struct or_const<T, Args...> 

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/cpp03/csv_array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/cpp03/csv_array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/cpp03/csv_array.hpp	2011-04-05 22:03:37 EDT (Tue, 05 Apr 2011)
@@ -19,6 +19,7 @@
 namespace assign{
 namespace v2{
 namespace ref{
+namespace array_aux{
 
 #define BOOST_ASSIGN_V2_MACRO1(z, i, data) result.rebind(i, BOOST_PP_CAT(data, i) );
 #define BOOST_ASSIGN_V2_MACRO2(N, U)\
@@ -43,9 +44,6 @@
 \
 /**/
 
-
-namespace array_aux{
-
 BOOST_PP_REPEAT_FROM_TO(
     1,
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_CSV_ARITY),
@@ -57,9 +55,7 @@
 #undef BOOST_ASSIGN_V2_MACRO3
 
 }// array_aux
-
-using array_aux::csv_array;
-
+	using array_aux::csv_array;
 }// ref
 }// v2
 }// assign

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp	2011-04-05 22:03:37 EDT (Tue, 05 Apr 2011)
@@ -33,15 +33,14 @@
 
     template<
         array_size_type N
-        , typename U // U& has to be a reference
+        , typename U // U& is a reference
     >
     struct csv_array/*<-*/
     {
-        typedef array_aux::instant_alloc<N, U> type;
+        typedef instant_alloc<N, U> type;
     }/*->*/;
 
-}// result_of
-
+}// nth_result_of
 
     template<typename U>
     typename nth_result_of::csv_array<0, U>::type
@@ -51,26 +50,16 @@
         return result_();
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
-}// array_aux
-using array_aux::csv_array;
-namespace nth_result_of{
-
-    template<array_size_type N, typename U>
-    struct csv_array/*<-*/
-        : array_aux::nth_result_of::csv_array<N, U>
-    {}/*->*/;
-
-}// nth_result_of
 /*<-*/
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 /*->*/
-namespace array_aux{
 namespace result_of{
 
     template<typename U, typename... Args>
-    struct csv_array/*<-*/ : nth_result_of::csv_array<
-        1 + sizeof...(Args),  U
-    >
+    struct csv_array/*<-*/ 
+    	: nth_result_of::csv_array<
+        	1 + sizeof...(Args),  U
+    	>
     {}/*->*/;
 
 }// result_of
@@ -119,19 +108,37 @@
         return csv_helper<T const, Args const ...>::call( t, args... );
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
+/*<-*/
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
+/*->*/
+
 }// array_aux
+/*<-*/
+#if BOOST_ASSIGN_V2_ENABLE_CPP0X
+/*->*/
+
+	using array_aux::csv_array;
+
 namespace result_of{
 
     template<typename U, typename... Args>
-    struct csv_array/*<-*/ : nth_result_of::csv_array<
-        1 + sizeof...(Args),  U
-    >
+    struct csv_array/*<-*/ 
+    	: array_aux::csv_array<U, ...Args>
     {}/*->*/;
 
 }// result_of
-//<-
+/*<-*/
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->
+/*->*/
+namespace nth_result_of{
+
+    template<array_size_type N, typename U>
+    struct csv_array/*<-*/
+        : array_aux::nth_result_of::csv_array<N, U>
+    {}/*->*/;
+
+}// nth_result_of
+
 }// ref
 //]
 }// v2