[Boost-commit] svn:boost r69994 - in sandbox/assign_v2: boost/assign/v2/put/adapter boost/assign/v2/put/deque boost/assign/v2/put/fun boost/assign/v2/ref/array boost/assign/v2/ref/list boost/assign/v2/ref/list_tuple/cpp0x boost/assign/v2/ref/tuple/cpp0x libs/assign/v2/src libs/assign/v2/test libs/assign/v2/test/ref

Subject: [Boost-commit] svn:boost r69994 - in sandbox/assign_v2: boost/assign/v2/put/adapter boost/assign/v2/put/deque boost/assign/v2/put/fun boost/assign/v2/ref/array boost/assign/v2/ref/list boost/assign/v2/ref/list_tuple/cpp0x boost/assign/v2/ref/tuple/cpp0x libs/assign/v2/src libs/assign/v2/test libs/assign/v2/test/ref
From: erwann.rogard_at_[hidden]
Date: 2011-03-14 20:39:12

Author: e_r
Date: 2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
New Revision: 69994
URL: http://svn.boost.org/trac/boost/changeset/69994

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/put/adapter/crtp.hpp                  |    27 ++++++++++++---------------             
   sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp               |     8 ++++----                                
   sandbox/assign_v2/boost/assign/v2/put/fun/deduce.hpp                    |     6 +++---                                  
   sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp               |     9 ++++-----                               
   sandbox/assign_v2/boost/assign/v2/ref/list/holder.hpp                   |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/as_args_list.hpp |     4 ++--                                    
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp    |     3 +--                                     
   sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/data.hpp              |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/src/main.cpp                           |     8 ++++----                                
   sandbox/assign_v2/libs/assign/v2/test/mix.cpp                           |    13 ++++++++-----                           
   sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp                     |    10 +++++-----                              
   11 files changed, 45 insertions(+), 47 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/put/adapter/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/adapter/crtp.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/adapter/crtp.hpp	2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -68,38 +68,35 @@
     {
 
         wrapper(D const& d):d_( d ){}
-            
+
         operator D const&()const{ return this->d_; }
-                    
-        typedef wrapper const& result_type;            
-        
+
+        typedef wrapper const& result_type;
+
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
         template<typename T>
         result_type operator()( T&& t )const
         {
-            this->d_(
-                this->fun( std::forward<Args>(args)... )
-            );
-            return (*this);
+            this->d_( std::forward<T>(t) ); return (*this);
         }
 #else
-        
+
         template<typename T>
         result_type operator()(T& t)const
         {
             this->d_( t ); return (*this);
         }
-        
+
         template<typename T>
         result_type operator()(T const & t)const
         {
             this->d_( t ); return (*this);
         }
 #endif
-                 
+
         private:
         D const& d_;
-        
+
     };
 }//put_aux
 //[syntax_put_adapter_crtp
@@ -137,7 +134,7 @@
     };
 
     template<typename /*<<Container>>*/C, typename /*<<Functor>>*/F, typename /*<<Modifier tag>>*/Tag, typename /*<<Derived type>>*/D>
-    class adapter_crtp 
+    class adapter_crtp
 //<-
         : public fun_holder<F>
         , public modifier_holder<Tag>
@@ -173,10 +170,10 @@
         typedef D const& result_type;
 
         template<typename R>
-        result_type 
+        result_type
         operator()( as_arg_list_adapter<R> range )const/*<-*/
         {
-             return ::boost::for_each( range(), wrapper<D>( this->derived() ) ); 
+             return ::boost::for_each( range(), wrapper<D>( this->derived() ) );
         }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
 //<-

Modified: sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp	2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -22,14 +22,14 @@
 namespace assign{
 namespace v2{
 namespace put_aux{
-    
+
     template<typename T>
     struct csv_deque_value : boost::decay<
         typename boost::remove_cv<T>::type
     >{};
 
 namespace result_of{
-    
+
     template<typename T>
     struct csv_deque: result_of::deque<
         typename csv_deque_value<T>::type
@@ -71,7 +71,7 @@
     typename result_of::csv_deque<T>::type
     csv_deque(const T& t, Args const& ...  args)/*<-*/
     {
-        result_of::csv_deque<T>::type result;
+        typename result_of::csv_deque<T>::type result;
         csv_deque_impl<T>(result, t, args...);
         return result;
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
@@ -79,7 +79,7 @@
 //]
 }// put_aux
 
-using put_aux::deque;
+using put_aux::csv_deque;
 
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 

Modified: sandbox/assign_v2/boost/assign/v2/put/fun/deduce.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/fun/deduce.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/fun/deduce.hpp	2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -40,8 +40,8 @@
     };
 
     template<typename /*<<Either of a value or pointer-container>>*/C>
-    struct /*<<Meta-function mapping `C`s element-type to a factory thereof>>*/deduce_fun 
-//<-    
+    struct /*<<Meta-function mapping `C`s element-type to a factory thereof>>*/deduce_fun
+//<-
         :  boost::mpl::eval_if<
             container_traits::is_ptr_container<C>,
             deduce_fun_pointer<C>,
@@ -56,4 +56,4 @@
 }// assign
 }// boost
 
-#endif BOOST_ASSIGN_V2_PUT_FUN_DEDUCE_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_PUT_FUN_DEDUCE_ER_2010_HPP

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-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -53,7 +53,7 @@
 //<-
 }// array_aux
 using array_aux::csv_array;
-namespace nth_result_of{ 
+namespace nth_result_of{
 
     template<array_size_type N, typename U>
     struct csv_array
@@ -82,7 +82,7 @@
     void csv_assign( R& result, U& u, Args&...args )
     {
         typedef typename R::wrapper_type wrapper_;
-        r.rebind( I::value, u );
+        result.rebind( I, u );
         csv_assign<I + 1>( result, args... );
     }
 
@@ -103,17 +103,16 @@
 
     template<typename T, typename...Args>/*<-*/
     typename boost::lazy_disable_if<
-        v2::type_traits::or_const<T, Args...>
+        v2::type_traits::or_const<T, Args...>,
         result_of::csv_array<T, Args...>
     >::type
-    BOOST_ASSIGN_V2_IGNORE(/*->*/typename result_of::csv_array<T, Args...>/*<-*/)/*->*/
     /*<<Enabled only if each of `t, args...` bind to non-const lvalue>>*/csv_array( T& t, Args&...args )/*<-*/
     {
         return csv_helper<T, Args...>::call( t, args... );
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
     template<typename T, typename...Args>
-    typename result_of::csv_array<T const, Args const...>
+    typename result_of::csv_array<T const, Args const...>::type
     csv_array( T const& t, Args const&...args )/*<-*/
     {
         return csv_helper<T const, Args const ...>::call( t, args... );

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/holder.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/holder.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/holder.hpp	2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -13,4 +13,4 @@
 #include <boost/assign/v2/ref/list/holder/head.hpp>
 #include <boost/assign/v2/ref/list/holder/tail.hpp>
 
-#endif BOOST_ASSIGN_V2_REF_LIST_HOLDER_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_REF_LIST_HOLDER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/as_args_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/as_args_list.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/as_args_list.hpp	2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -10,7 +10,7 @@
 #ifndef BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP0X_AS_ARGS_LIST_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP0X_AS_ARGS_LIST_ER_2010_HPP
 #include <boost/assign/v2/ref/list_tuple/list_tuple.hpp>
-#include <boost/assign/v2/ref/tuple/cpp0x/as_arglist.hpp>
+#include <boost/assign/v2/ref/tuple/as_arg_list.hpp>
 #include <boost/assign/v2/temporary/variadic_args_to_indices.hpp>
 #include <boost/mpl/size.hpp>
 
@@ -47,7 +47,7 @@
     {
         {
             typedef ::boost::mpl::int_<I> int_;
-            as_arglist( f, list.get( int_() ) ); // tuple
+            as_arg_list( f, list.get( int_() ) ); // tuple
         }
         {
             typedef ::boost::mpl::int_<I+1> next_;

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp	2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -10,7 +10,6 @@
 #ifndef BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP0X_CONTAINER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP0X_CONTAINER_ER_2010_HPP
 #include <utility>
-#include <boost/assign/v2/ref/list_tuple/size_type.hpp>
 #include <boost/assign/v2/ref/tuple/cpp0x/data.hpp>
 #include <boost/config.hpp>
 #include <boost/mpl/empty_base.hpp>
@@ -78,7 +77,7 @@
 
         typedef list_tuple_aux::list_size_type list_size_type;
         typedef list_tuple_aux::tuple_size_type tuple_size_type;
-        
+
         BOOST_STATIC_CONSTANT( list_size_type, static_get_size = N );
         BOOST_STATIC_CONSTANT(
             tuple_size_type,

Modified: sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/data.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/data.hpp	2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -10,7 +10,7 @@
 #ifndef BOOST_ASSIGN_V2_REF_TUPLE_CPP0X_DATA_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_TUPLE_CPP0X_DATA_ER_2010_HPP
 #include <utility>
-#include <boost/assign/v2/ref/tuple/cpp0x.hpp>
+#include <boost/assign/v2/ref/tuple/data.hpp>
 #include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_reference.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/src/main.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/src/main.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/src/main.cpp	2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -3,8 +3,8 @@
 //#include <libs/assign/v2/test/detail.h>
 #include <libs/assign/v2/test/ref.h>
 //#include <libs/assign/v2/test/mix.h>
-#include <libs/assign/v2/test/put.h>
-#include <libs/assign/v2/test/utility.h>
+//#include <libs/assign/v2/test/put.h>
+//#include <libs/assign/v2/test/utility.h>
 
 // Speed
 //#include <fstream>
@@ -45,10 +45,10 @@
     }
     {
         using namespace test_assign_v2;
-        xxx_put::test();
+        //xxx_put::test();
         //xxx_mix::test();
         xxx_ref::test();
-        xxx_utility::test();
+        //xxx_utility::test();
     }
 
     /*

Modified: sandbox/assign_v2/libs/assign/v2/test/mix.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/mix.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/mix.cpp	2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -36,13 +36,16 @@
                 cont | as2::_csv_put( 0, 1, 2, 3, 4, 5 ),
                 _1 % 2
             );
-            BOOST_ASSIGN_V2_CHECK(range::equal(
-                cont,
+            //BOOST_ASSIGN_V2_CHECK(range::equal(
+            //    cont,
                 /*<< [^1, 3, ..., 4] are held by reference (not copies) >>*/
-                as2::ref::csv_array(1, 3, 5, 0, 2, 4)
-            ));
+            //    as2::ref::csv_array(1, 3, 5, 0, 2, 4)
+            //));
+
+               // as2::ref::csv_array(1, 3, 5, 0, 2, 4);
+
             //]
-        } 
+        }
     }
 
 }// xxx_mix

Modified: sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp	2011-03-14 20:39:11 EDT (Mon, 14 Mar 2011)
@@ -32,14 +32,14 @@
             as2::ref::nth_result_of::array<3, T>::type ar3 = as2::ref::array( w )( x )( y );
             {
                 T& a = ar3.front(); T& b = ar3.back();
-                
+
                 BOOST_ASSIGN_V2_CHECK( &a == &w );
                 BOOST_ASSIGN_V2_CHECK( &b == &y );
             }
             as2::ref::nth_result_of::array<4, T>::type ar4 = ar3( z );
             {
                 T& a = ar4.front(); T& b = ar4.back();
-                
+
                 BOOST_ASSIGN_V2_CHECK( &a == &w );
                 BOOST_ASSIGN_V2_CHECK( &b == &z );
             }
@@ -47,7 +47,7 @@
             {
                 T& a = ( *begin( ar4 ) );
                 T& b = *next( begin( ar4 ), ar4.size() - 1 );
-                
+
                 BOOST_ASSIGN_V2_CHECK( &a == &w );
                 BOOST_ASSIGN_V2_CHECK( &b == &z );
             }
@@ -56,7 +56,7 @@
             //[test_ref_array_write
             typedef int T; T x, y, z; std::vector<T> r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
             boost::copy( r, begin( as2::ref::array( x )( y )( z ) | as2::ref::_get ) );
-            
+
             BOOST_ASSIGN_V2_CHECK( x == r[0] );
             BOOST_ASSIGN_V2_CHECK( z == r[2] );
             //]
@@ -64,7 +64,7 @@
         {
             //[test_ref_array_assign
             typedef int T; T x, y, z; as2::ref::array( x )( y )( z ).assign( -1 );
-            
+
             BOOST_ASSIGN_V2_CHECK( x == -1 );
             BOOST_ASSIGN_V2_CHECK( z == -1 );
             //]