[Boost-commit] svn:boost r71754 - in sandbox/assign_v2/boost/assign/v2: chain ref/aux_/list ref/aux_/list/array ref/aux_/list/holder

Subject: [Boost-commit] svn:boost r71754 - in sandbox/assign_v2/boost/assign/v2: chain ref/aux_/list ref/aux_/list/array ref/aux_/list/holder
From: erwann.rogard_at_[hidden]
Date: 2011-05-05 20:36:56

Author: e_r
Date: 2011-05-05 20:36:55 EDT (Thu, 05 May 2011)
New Revision: 71754
URL: http://svn.boost.org/trac/boost/changeset/71754

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/chain/chain.hpp                |     5 +++--                                   
   sandbox/assign_v2/boost/assign/v2/ref/aux_/list/array/policy.hpp |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/aux_/list/array/rebind.hpp |     3 +--                                     
   sandbox/assign_v2/boost/assign/v2/ref/aux_/list/at.hpp           |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/tail.hpp  |    10 ++++++----                              
   5 files changed, 12 insertions(+), 10 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/chain/chain.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/chain/chain.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/chain/chain.hpp	2011-05-05 20:36:55 EDT (Thu, 05 May 2011)
@@ -24,9 +24,9 @@
 namespace assign{
 namespace v2{
 //[syntax_chain_chain
-namespace chain_aux{
+namespace chain_aux{/*<-*/
 
-    /*<-*/typedef ::boost::mpl::void_ void_;/*->*/
+    typedef ::boost::mpl::void_ void_;/*->*/
 
     template<typename U>
     struct adaptor1/*<-*/
@@ -89,6 +89,7 @@
 
 //<-
 }
+//->
 namespace result_of{
 
     using chain_aux::result_of::chain;

Modified: sandbox/assign_v2/boost/assign/v2/ref/aux_/list/array/policy.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/aux_/list/array/policy.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/aux_/list/array/policy.hpp	2011-05-05 20:36:55 EDT (Thu, 05 May 2011)
@@ -97,7 +97,7 @@
             typedef typename boost::remove_reference<H>::type u1_;
             typedef typename list_aux::policy_helper3<u1_, T>::type value_;
             typedef array_aux::lazy_alloc<
-                tail_holder<T>::static_size::value
+                tail_holder<T>::tail_static_size::value
                 ,value_
                 ,derived_
             > type;

Modified: sandbox/assign_v2/boost/assign/v2/ref/aux_/list/array/rebind.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/aux_/list/array/rebind.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/aux_/list/array/rebind.hpp	2011-05-05 20:36:55 EDT (Thu, 05 May 2011)
@@ -16,7 +16,6 @@
 #include <boost/mpl/int.hpp>
 
 namespace boost{
-    struct use_default;
 namespace assign{
 namespace v2{
 namespace ref{
@@ -62,7 +61,7 @@
     )
     {
         typedef list_aux::container<Tag, H, T> list_;
-        BOOST_STATIC_ASSERT( A::static_size <= list_::static_size::value );
+        BOOST_STATIC_ASSERT( A::static_size <= list_::tail_static_size::value );
         typedef ::boost::mpl::int_<0> zero_;
         typedef ::boost::mpl::int_<A::static_size> size_;
         typedef typename ::boost::mpl::equal_to<size_, zero_>::type exit_;

Modified: sandbox/assign_v2/boost/assign/v2/ref/aux_/list/at.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/aux_/list/at.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/aux_/list/at.hpp	2011-05-05 20:36:55 EDT (Thu, 05 May 2011)
@@ -29,7 +29,7 @@
     struct is_head :
         ::boost::mpl::equal_to<
             ::boost::mpl::size_t<I + 1>,
-            typename T::static_size
+            typename T::tail_static_size
         >
     {};
 

Modified: sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/tail.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/tail.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/tail.hpp	2011-05-05 20:36:55 EDT (Thu, 05 May 2011)
@@ -13,6 +13,7 @@
 #include <boost/assign/v2/ref/aux_/list/fwd.hpp>
 #include <boost/config.hpp>
 #include <boost/mpl/int.hpp>
+#include <boost/mpl/plus.hpp>
 #include <boost/call_traits.hpp>
 
 namespace boost{
@@ -25,9 +26,10 @@
     struct tail_holder
     {
         typedef T tail_type;
-        typedef ::boost::mpl::int_<
-            T::static_size::value + 1
-        > static_size;
+        typedef ::boost::mpl::plus<
+        	typename T::tail_static_size,
+            ::boost::mpl::int_<1>
+        > tail_static_size;
         typedef T const& result_of_tail_type;
 
         tail_holder(typename boost::call_traits<T>::param_type t) 
@@ -44,7 +46,7 @@
     struct tail_holder<nil_>
     {
         typedef nil_ tail_type;
-        typedef ::boost::mpl::int_<0> static_size;
+        typedef ::boost::mpl::int_<0> tail_static_size;
         tail_holder(){}
 
         typedef tail_type result_of_tail_type;