[Boost-commit] svn:boost r68312 - in sandbox/assign_v2: boost/assign/v2/ref/fusion boost/assign/v2/utility/chain libs/assign/v2/test/put libs/assign/v2/test/put/pipe

Subject: [Boost-commit] svn:boost r68312 - in sandbox/assign_v2: boost/assign/v2/ref/fusion boost/assign/v2/utility/chain libs/assign/v2/test/put libs/assign/v2/test/put/pipe
From: erwann.rogard_at_[hidden]
Date: 2011-01-19 22:26:04

Author: e_r
Date: 2011-01-19 22:25:47 EST (Wed, 19 Jan 2011)
New Revision: 68312
URL: http://svn.boost.org/trac/boost/changeset/68312

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/ref/fusion/container.hpp   |    22 ++++++++++++----------                  
   sandbox/assign_v2/boost/assign/v2/ref/fusion/fwd.hpp         |     5 +++--                                   
   sandbox/assign_v2/boost/assign/v2/utility/chain/iterator.hpp |    19 +++++--------------                     
   sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp         |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/stl.cpp       |     3 ++-                                     
   sandbox/assign_v2/libs/assign/v2/test/put/stl.cpp            |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/put/tuple_refs.cpp     |     2 +-                                      
   7 files changed, 25 insertions(+), 30 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/ref/fusion/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/fusion/container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/fusion/container.hpp	2011-01-19 22:25:47 EST (Wed, 19 Jan 2011)
@@ -26,6 +26,7 @@
 #include <boost/assign/v2/ref/fusion/policy.hpp>
 #include <boost/assign/v2/ref/fusion/link_holder.hpp>
 #include <boost/assign/v2/ref/fusion/head_holder.hpp>
+#include <boost/assign/v2/ref/fusion/fwd.hpp> // consistency
 
 namespace boost{
         struct use_default;
@@ -34,14 +35,15 @@
 namespace ref{
 namespace fusion_aux{
 
-    template<std::size_t N, typename L,typename Tag1, typename Tag2, typename T>
+    template<fusion_aux::size_type N, 
+    	typename L, typename Tag1, typename Tag2, typename T>
         struct interface : ::boost::mpl::apply4<
         fusion_aux::policy<Tag2>,
         ::boost::mpl::int_<N>, L, Tag1, T
     >{};
 
-    template<
-    	std::size_t N, typename L, typename Tag1, typename Tag2, typename T>
+    template<fusion_aux::size_type N, typename L, 
+        typename Tag1, typename Tag2, typename T>
     class container 
             : public fusion_aux::link_holder<L, N == 0>,
         public fusion_aux::head_holder<Tag1, T, N == 0>,	
@@ -70,9 +72,9 @@
                 // -- used by most_const -- //
                 typedef T head_value_type;
         typedef L link_value_type;
+        typedef fusion_aux::size_type size_type;
 
-		typedef std::size_t size_type;
-        BOOST_STATIC_CONSTANT(std::size_t, static_size = N);
+        BOOST_STATIC_CONSTANT(size_type, static_size = N);
         typedef typename ::boost::mpl::equal_to<size_,int0_>::type is_empty_;
 
         explicit container(){}
@@ -113,14 +115,14 @@
 
         // ---- static_lookup ---- //
 
-        template<int I>
+        template<size_type I>
         struct is_head : ::boost::mpl::bool_< I + 1 == N >{};
 
-        template<int I>
+        template<size_type I>
         struct link_result_static_lookup : L::template 
                 result_static_lookup<I>{};
 
-		template<int I>
+        template<size_type I>
                 struct result_static_lookup : ::boost::mpl::eval_if<
                 is_head<I>,
             ::boost::mpl::identity<T&>,
@@ -129,7 +131,7 @@
 
                 // A template is needed even as the argument is known, to prevent
         // compiler errors for N = 0.
-        template<int I>
+        template<size_type I>
         typename boost::lazy_enable_if<
                 is_head<I>,
                 result_static_lookup<I>
@@ -139,7 +141,7 @@
                 return this->head.get(); 
         }
 
-        template<int I>
+        template<size_type I>
         typename boost::lazy_disable_if<
                 is_head<I>,
                 result_static_lookup<I>

Modified: sandbox/assign_v2/boost/assign/v2/ref/fusion/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/fusion/fwd.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/fusion/fwd.hpp	2011-01-19 22:25:47 EST (Wed, 19 Jan 2011)
@@ -9,6 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_FUSION_FWD_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_FUSION_FWD_ER_2010_HPP
+#include <boost/assign/v2/ref/fusion/size_type.hpp>
 
 namespace boost{
 namespace assign{ 
@@ -16,11 +17,11 @@
 namespace ref{
 namespace fusion_aux{
 
-    template<std::size_t N, typename L, 
+    template<fusion_aux::size_type N, typename L, 
             typename Tag1,typename Tag2, typename T>
     class container;
     
-    template<typename A, std::size_t N, typename L, 
+    template<typename A, fusion_aux::size_type N, typename L, 
             typename Tag1, typename Tag2, typename T>
     void assign_array(
             A& a, 

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/iterator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/iterator.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/iterator.hpp	2011-01-19 22:25:47 EST (Wed, 19 Jan 2011)
@@ -40,23 +40,14 @@
         
         typedef typename boost::remove_reference<reference>::type value_type;
 
-/*
-typename demote_iterator_traversal_tag<
-                                  typename iterator_traversal<Iterator1>::type
-                                , typename iterator_traversal<Iterator2>::type>::type
-*/
 
     
-//    	typedef boost::range_detail::chain_iterator<
             typedef boost::range_detail::join_iterator<
-        	It1,
-        	It2,
-        	value_type, 	
-        	reference,
-			// TODO should be able to use default 
-            // problems arise because traits are probably not defined for 
-            // complicated ranges
-            boost::single_pass_traversal_tag  
+        	It1
+        	,It2
+        	,value_type
+        	,reference
+            // , boost::single_pass_traversal_tag  
     	> type;
 
         };

Modified: sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp	2011-01-19 22:25:47 EST (Wed, 19 Jan 2011)
@@ -11,7 +11,7 @@
 #include <map>
 #include <boost/assign/v2/detail/checking/container.hpp>
 #include <boost/assign/v2/detail/checking/constants.hpp>
-#include <boost/assign/v2/put.hpp>
+#include <boost/assign/v2/put/sub.hpp>
 #include <libs/assign/v2/test/put/modulo.h>
 
 namespace test_assign_v2{

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/stl.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/stl.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/stl.cpp	2011-01-19 22:25:47 EST (Wed, 19 Jan 2011)
@@ -18,7 +18,8 @@
 
 #include <boost/assign/v2/detail/checking/container.hpp>
 #include <boost/assign/v2/detail/checking/constants.hpp>
-#include <boost/assign/v2/put/pipe.hpp>
+#include <boost/assign/v2/put/pipe/functor.hpp>
+#include <boost/assign/v2/put/pipe/csv.hpp>
 
 #include <libs/assign/v2/test/put/pipe/stl.h>
 

Modified: sandbox/assign_v2/libs/assign/v2/test/put/stl.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/stl.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/stl.cpp	2011-01-19 22:25:47 EST (Wed, 19 Jan 2011)
@@ -17,7 +17,7 @@
 #include <set>
 #include <stack>
 #include <vector>
-#include <boost/assign/v2/put.hpp>
+#include <boost/assign/v2/put/sub.hpp>
 #include <boost/assign/v2/detail/checking/constants.hpp>
 #include <boost/assign/v2/detail/checking/container.hpp>
 

Modified: sandbox/assign_v2/libs/assign/v2/test/put/tuple_refs.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/tuple_refs.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/tuple_refs.cpp	2011-01-19 22:25:47 EST (Wed, 19 Jan 2011)
@@ -11,7 +11,7 @@
 #include <boost/tuple/tuple.hpp>
 #include <boost/assign/v2/detail/checking/check.hpp>
 #include <boost/assign/v2/detail/checking/constants.hpp>
-#include <boost/assign/v2/put.hpp>
+#include <boost/assign/v2/put/sub.hpp>
 #include <libs/assign/v2/test/put/tuple_refs.h>
 
 namespace test_assign_v2{