[Boost-commit] svn:boost r69762 - in sandbox/assign_v2/boost/assign/v2/put/pipe: . csv

Subject: [Boost-commit] svn:boost r69762 - in sandbox/assign_v2/boost/assign/v2/put/pipe: . csv
From: erwann.rogard_at_[hidden]
Date: 2011-03-09 08:01:38

Author: e_r
Date: 2011-03-09 08:01:37 EST (Wed, 09 Mar 2011)
New Revision: 69762
URL: http://svn.boost.org/trac/boost/changeset/69762

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp |     4 +-                                      
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp  |     4 +-                                      
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp       |    65 --------------------------------------- 
   sandbox/assign_v2/boost/assign/v2/put/pipe/functor.hpp       |     2                                         
   4 files changed, 6 insertions(+), 69 deletions(-)

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-03-09 08:01:37 EST (Wed, 09 Mar 2011)
@@ -11,7 +11,7 @@
 #define BOOST_ASSIGN_V2_PUT_PIPE_CSV_GENERATOR_HPP_ER_2010
 #include <boost/assign/v2/ref/array/csv.hpp>
 #include <boost/assign/v2/ref/wrapper/copy.hpp>
-#include <boost/assign/v2/put/pipe/csv/rhs.hpp>
+#include <boost/assign/v2/put/pipe/csv/arg_list.hpp>
 #include <boost/assign/v2/put/pipe/modulo_traits.hpp>
 #include <boost/mpl/apply.hpp>
 #include <boost/mpl/vector/vector0.hpp>
@@ -65,7 +65,7 @@
 
         template<std::size_t N, typename U = na_> // size?
         struct result{
-            typedef put_pipe_aux::csv_rhs<ParList, N, U> type;
+            typedef put_pipe_aux::arg_list<ParList, N, U> type;
         };
 
         typename result<0>::type

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp	2011-03-09 08:01:37 EST (Wed, 09 Mar 2011)
@@ -22,10 +22,10 @@
 
     template<typename C,
         typename ParList, csv_size_type N, typename U>
-    C& operator|(C& cont, put_pipe_aux::csv_rhs<ParList, N, U> const& rhs_){
+    C& operator|(C& cont, put_pipe_aux::csv_rhs<ParList, N, U> const& arg_list_){
 
                 v2::ref::as_arg_list(
-            v2::ref::as_modulo_list<ParList>( put( cont ), rhs_.par_list_cont() ),
+            v2::ref::as_modulo_list<ParList>( put( cont ), arg_list.par_list_cont() ),
             rhs_.arg_list_cont()
         );
         return cont;

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp	2011-03-09 08:01:37 EST (Wed, 09 Mar 2011)
@@ -1,64 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  Boost.Assign v2                                                         //
-//                                                                          //
-//  Copyright (C) 2003-2004 Thorsten Ottosen                                //
-//  Copyright (C) 2010 Erwann Rogard                                        //
-//  Use, modification and distribution are subject to the                   //
-//  Boost Software License, Version 1.0. (See accompanying file             //
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_PUT_PIPE_CSV_RHS_HPP_ER_2010
-#define BOOST_ASSIGN_V2_PUT_PIPE_CSV_RHS_HPP_ER_2010
-#include <boost/assign/v2/ref/array/csv.hpp>
-#include <boost/assign/v2/put/pipe/csv/size_type.hpp>
-#include <boost/assign/v2/put/pipe/modulo_traits.hpp>
-
-namespace boost{
-    struct use_default;
-namespace assign{
-namespace v2{
-namespace put_pipe_aux{
-
-    template<typename Pars, csv_size_type N, typename U>
-    struct csv_rhs
-    {
-        typedef boost::use_default tag2_;
-        typedef modulo_traits<Pars> modulo_traits_;
-        typedef typename modulo_traits_::size par_list_size; // TODO needed?
-        typedef typename modulo_traits_::cont_ par_list_cont_type;
-        typedef typename v2::ref::nth_result_of::csv_array<
-            N,
-            U
-        >::type arg_list_cont_type; //notice it's arg, not args
-
-        csv_rhs(){}
-        csv_rhs(par_list_cont_type const& a, arg_list_cont_type const& b)
-            : par_list_cont_( a ), arg_list_cont_( b ){}
-
-        par_list_cont_type const& par_list_cont()const 
-        {
-            return this->par_list_cont_;
-        }
-
-        arg_list_cont_type& arg_list_cont() // TODO needed (non-const)?
-        {
-            return this->arg_list_cont_;
-        }
-
-        arg_list_cont_type const& arg_list_cont() const
-        {
-            return this->arg_list_cont_;
-        }
-
-        protected:
-        par_list_cont_type par_list_cont_;
-        arg_list_cont_type arg_list_cont_;
-
-    };
-
-}// put_pipe_aux
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_PUT_PIPE_CSV_RHS_HPP_ER_2010
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/functor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/functor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/functor.hpp	2011-03-09 08:01:37 EST (Wed, 09 Mar 2011)
@@ -10,7 +10,7 @@
 #ifndef BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_ER_2010_HPP
 #include <boost/assign/v2/put/pipe/functor/operator.hpp>
-#include <boost/assign/v2/put/pipe/functor/rhs.hpp>
+#include <boost/assign/v2/put/pipe/functor/args_list.hpp>
 #include <boost/assign/v2/put/pipe/functor/size_type.hpp>
 
 #endif // BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_ER_2010_HPP