[Boost-commit] svn:boost r69782 - in sandbox/assign_v2: boost/assign/v2/put/modulo/fun boost/assign/v2/put/modulo/modifier boost/assign/v2/ref boost/assign/v2/ref/array libs/assign/v2/test libs/assign/v2/test/ref/array libs/assign/v2/test/unit_testing libs/assign/v2/test/utility

Subject: [Boost-commit] svn:boost r69782 - in sandbox/assign_v2: boost/assign/v2/put/modulo/fun boost/assign/v2/put/modulo/modifier boost/assign/v2/ref boost/assign/v2/ref/array libs/assign/v2/test libs/assign/v2/test/ref/array libs/assign/v2/test/unit_testing libs/assign/v2/test/utility
From: erwann.rogard_at_[hidden]
Date: 2011-03-09 15:59:37

Author: e_r
Date: 2011-03-09 15:59:35 EST (Wed, 09 Mar 2011)
New Revision: 69782
URL: http://svn.boost.org/trac/boost/changeset/69782

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp      |    18 ++++++-                                 
   sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp |    57 ++++++++++++++++----------              
   sandbox/assign_v2/boost/assign/v2/ref/array.hpp                |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/array/csv.hpp            |    21 ---------                               
   sandbox/assign_v2/boost/assign/v2/ref/array/functor.hpp        |    84 --------------------------------------- 
   sandbox/assign_v2/libs/assign/v2/test/mix.cpp                  |     4                                         
   sandbox/assign_v2/libs/assign/v2/test/ref/array/csv.cpp        |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/ref/array/functor.cpp    |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/unit_testing/utility.cpp |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/utility/chain.cpp        |     2                                         
   10 files changed, 59 insertions(+), 137 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp	2011-03-09 15:59:35 EST (Wed, 09 Mar 2011)
@@ -15,11 +15,11 @@
 namespace boost{
 namespace assign{
 namespace v2{
-//[result_of_modulo_fun
+namespace put_aux{
 namespace result_of{
-        
-    template<typename /*<<Inherits crtp\<\> >>*/D>
-    struct /*<<Meta-function class>>*/ modulo_fun{
+
+    template<typename D>
+    struct modulo_fun{
             
         typedef put_aux::replace_fun<D> meta_;
             
@@ -29,6 +29,16 @@
     };
             
 }// result_of
+}// put_aux
+//[result_of_modulo_fun
+namespace result_of{
+
+	template<typename /*<<Inherits crtp\<\> >>*/ D>
+    struct /*<<Meta-function class>>*/ modulo_fun 
+    	: put_aux::result_of::modulo_fun<D>
+    {};
+
+}// result_of
 //]
 }// v2
 }// assign

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp	2011-03-09 15:59:35 EST (Wed, 09 Mar 2011)
@@ -28,30 +28,11 @@
         
 }// put_aux
 //]
-#ifndef BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_MODIFIER_TAG
-#define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_MODIFIER_TAG(NAME, Result)\
-namespace boost{\
-namespace assign{\
-namespace v2{\
-namespace put_aux{\
-\
-	template<typename Arg>\
-	struct meta_modifier_tag<BOOST_PP_CAT(keyword_,NAME), Arg>\
-	{\
-        template<typename D>\
-    	struct apply{ typedef Result type; };\
-	};\
-\
-}\
-}\
-}\
-}\
-/**/
-#endif
+namespace put_aux{
 namespace result_of{
         
-    template<typename /*<<Inherits crtp\<\> >>*/D>
-    struct /*<<Meta-function class>>*/ modulo_modifier{
+    template<typename D>
+    struct modulo_modifier{
             
         typedef put_aux::replace_modifier_tag<D> meta_;
             
@@ -67,9 +48,41 @@
     };
             
 }// result_of
+}// put_aux
+//[result_of_modulo_modifier
+namespace result_of{
+
+	template<typename /*<<Inherits crtp\<\> >>*/ D>
+    struct /*<<Meta-function class>>*/ modulo_modifier 
+    	: put_aux::result_of::modulo_modifier<D>
+    {};
+
+}// result_of
+//]
 }// v2
 }// assign
 }// boost
 
+#ifndef BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_MODIFIER_TAG
+#define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_MODIFIER_TAG(NAME, Result)\
+namespace boost{\
+namespace assign{\
+namespace v2{\
+namespace put_aux{\
+\
+	template<typename Arg>\
+	struct meta_modifier_tag<BOOST_PP_CAT(keyword_,NAME), Arg>\
+	{\
+        template<typename D>\
+    	struct apply{ typedef Result type; };\
+	};\
+\
+}\
+}\
+}\
+}\
+/**/
+#endif
+
 #endif // BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_ER_2010_HPP
 

Modified: sandbox/assign_v2/boost/assign/v2/ref/array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array.hpp	2011-03-09 15:59:35 EST (Wed, 09 Mar 2011)
@@ -11,8 +11,8 @@
 #define BOOST_ASSIGN_V2_REF_ARRAY_ER_2010_HPP
 #include <boost/assign/v2/ref/array/as_arg_list.hpp>
 #include <boost/assign/v2/ref/array/conversion.hpp>
-#include <boost/assign/v2/ref/array/csv.hpp>
-#include <boost/assign/v2/ref/array/functor.hpp>
+#include <boost/assign/v2/ref/array/array.hpp>
+#include <boost/assign/v2/ref/array/csv_array.hpp>
 #include <boost/assign/v2/ref/array/size_type.hpp>
 
 #endif // BOOST_ASSIGN_V2_REF_ARRAY_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv.hpp	2011-03-09 15:59:35 EST (Wed, 09 Mar 2011)
@@ -1,20 +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_REF_ARRAY_CSV_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_ARRAY_CSV_ER_2010_HPP
-#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-#include <boost/assign/v2/ref/array/csv/common.hpp>
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-#include <boost/assign/v2/ref/array/csv/cpp0x.hpp>
-#else
-#include <boost/assign/v2/ref/array/csv/cpp03.hpp>
-#endif
-
-#endif // BOOST_ASSIGN_V2_REF_ARRAY_CSV_ER_2010_HPP
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/functor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/functor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/functor.hpp	2011-03-09 15:59:35 EST (Wed, 09 Mar 2011)
@@ -1,83 +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_REF_ARRAY_FUNCTOR_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_ARRAY_FUNCTOR_ER_2010_HPP
-#include <boost/assign/v2/ref/array/alloc/lazy.hpp>
-#include <boost/assign/v2/ref/array/size_type.hpp>
-#include <boost/assign/v2/ref/list/list.hpp>
-#include <boost/assign/v2/ref/list/array.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace ref{
-namespace array_aux{
-
-    template<typename T>
-    struct empty_array : empty_list<list_aux::array_tag>{};
-
-    template<size_type N, typename T>
-    struct recursive_result
-    {
-        typedef typename recursive_result<N-1, T>::type previous_;
-        typedef typename previous_::template result<T&>::type type;
-    };
-
-    template<typename T>
-    struct recursive_result<0, T> : empty_array<T>{};
-
-}// array_aux
-namespace nth_result_of{
-
-    template<array_size_type N, typename T>
-    struct array
-        : array_aux::recursive_result<N, T>
-    {};
-
-}// nth_result_of
-namespace result_of{
-
-    template<typename U, typename T = U>
-    struct array
-        : nth_result_of::array<1, U>{};
-
-    template<typename U>
-    struct array<U, keyword_aux::nil>
-        : nth_result_of::array<0, U>{};
-
-}// result_of
-
-    template<typename T>
-    typename result_of::array<T, keyword_aux::nil>::type
-    array( keyword_aux::nil )
-    {
-        return ref::list<list_aux::array_tag>( v2::_nil );
-    }
-
-    template<typename T>
-    typename result_of::array<T>::type
-    array(T& t)
-    {
-        return array<T>( v2::_nil )( t );
-    }
-
-    template<typename T>
-    typename result_of::array<T const>::type
-    array(T const & t)
-    {
-        return array<T const>( v2::_nil )( t );
-    }
-
-}// ref
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file

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-09 15:59:35 EST (Wed, 09 Mar 2011)
@@ -18,8 +18,8 @@
 #include <boost/range/algorithm/stable_partition.hpp>
 #include <boost/typeof/typeof.hpp>
 #include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/pipe/csv.hpp>
-#include <boost/assign/v2/put/pipe/functor.hpp>
+#include <boost/assign/v2/put/pipe/csv_put.hpp>
+#include <boost/assign/v2/put/pipe/put.hpp>
 #include <boost/assign/v2/put/deque.hpp>
 #include <boost/assign/v2/ref/array.hpp>
 #include <boost/assign/v2/utility/chain/alias.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/ref/array/csv.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/array/csv.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/array/csv.cpp	2011-03-09 15:59:35 EST (Wed, 09 Mar 2011)
@@ -12,7 +12,7 @@
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/typeof/typeof.hpp>
 #include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/ref/array/csv.hpp>
+#include <boost/assign/v2/ref/array/csv_array.hpp>
 #include <boost/assign/v2/ref/wrapper.hpp>
 #include <libs/assign/v2/test/ref/array/csv.h>
 

Modified: sandbox/assign_v2/libs/assign/v2/test/ref/array/functor.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/array/functor.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/array/functor.cpp	2011-03-09 15:59:35 EST (Wed, 09 Mar 2011)
@@ -14,7 +14,7 @@
 
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/range/algorithm/copy.hpp>
-#include <boost/assign/v2/ref/array/functor.hpp>
+#include <boost/assign/v2/ref/array/array.hpp>
 #include <libs/assign/v2/test/ref/array/functor.h>
 
 namespace test_assign_v2{

Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/utility.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/utility.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/utility.cpp	2011-03-09 15:59:35 EST (Wed, 09 Mar 2011)
@@ -15,7 +15,7 @@
 #include <boost/test/test_tools.hpp>
 #define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
 #include <libs/assign/v2/test/utility/chain.cpp>
-#include <libs/assign/v2/test/utility/convert.cpp>
+#include <libs/assign/v2/test/utility/conversion.cpp>
 #include <boost/test/unit_test.hpp>
 using boost::unit_test::test_suite;
 test_suite* init_unit_test_suite( int argc, char* argv[] )

Modified: sandbox/assign_v2/libs/assign/v2/test/utility/chain.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/chain.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/chain.cpp	2011-03-09 15:59:35 EST (Wed, 09 Mar 2011)
@@ -15,7 +15,7 @@
 #include <boost/range/end.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/algorithm/equal.hpp>
-#include <boost/assign/v2/ref/array/csv.hpp>
+#include <boost/assign/v2/ref/array/csv_array.hpp>
 #include <boost/assign/v2/utility/chain/check.hpp>
 #include <boost/assign/v2/utility/chain.hpp>
 #include <boost/assign/v2/utility/chain/alias.hpp>