[Boost-commit] svn:boost r72489 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/chain boost/assign/v2/include boost/assign/v2/support/config libs/assign/v2/doc

Subject: [Boost-commit] svn:boost r72489 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/chain boost/assign/v2/include boost/assign/v2/support/config libs/assign/v2/doc
From: erwann.rogard_at_[hidden]
Date: 2011-06-08 11:21:56

Author: e_r
Date: 2011-06-08 11:21:51 EDT (Wed, 08 Jun 2011)
New Revision: 72489
URL: http://svn.boost.org/trac/boost/changeset/72489

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/chain.hpp                              |     4                                         
   sandbox/assign_v2/boost/assign/v2/chain/chain.hpp                        |   104 --------------------------------------- 
   sandbox/assign_v2/boost/assign/v2/chain/check.hpp                        |     2                                         
   sandbox/assign_v2/boost/assign/v2/chain/operator.hpp                     |     4                                         
   sandbox/assign_v2/boost/assign/v2/include/chain.hpp                      |     2                                         
   sandbox/assign_v2/boost/assign/v2/support/config/limit_functor_arity.hpp |     2                                         
   sandbox/assign_v2/libs/assign/v2/doc/org.qbk                             |     2                                         
   7 files changed, 9 insertions(+), 111 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/chain.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/chain.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/chain.hpp	2011-06-08 11:21:51 EDT (Wed, 08 Jun 2011)
@@ -10,9 +10,9 @@
 #ifndef BOOST_ASSIGN_V2_CHAIN_ER_2011_HPP
 #define BOOST_ASSIGN_V2_CHAIN_ER_2011_HPP
 
-#include <boost/assign/v2/chain/chain.hpp>
+#include <boost/assign/v2/chain/adaptor.hpp>
 // This header :
-// #include <boost/assign/v2/chain/operator.hpp> 
+// #include <boost/assign/v2/chain/operator.hpp>
 // is commented out because operator&& overloading is controversial
 
 #endif // BOOST_ASSIGN_V2_CHAIN_ER_2011_HPP

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-06-08 11:21:51 EDT (Wed, 08 Jun 2011)
@@ -1,103 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  Boost.Assign v2                                                         //
-//                                                                          //
-//  Copyright (C) 2003-2004 Thorsten Ottosen                                //
-//  Copyright (C) 2009 Neil Groves                                          //
-//  Copyright (C) 2010 Manuel Peinado Gallego                               //
-//  Copyright (C) 2011 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_CHAIN_CHAIN_ER_2011_HPP
-#define BOOST_ASSIGN_V2_CHAIN_CHAIN_ER_2011_HPP
-#include <boost/assign/v2/support/pp/ignore.hpp>
-#include <boost/assign/v2/chain/meta.hpp>
-#include <boost/mpl/void.hpp>
-
-// Design:
-// - Original design was boost::chain in RangeEx (later joined)
-// - ER : lvalue-preserving
-// - Finally, MPG proposed a way to compose chains http://gist.github.com/287791
-
-namespace boost{
-namespace assign{
-namespace v2{
-//[syntax_chain_chain
-namespace chain_aux{/*<-*/
-
-    typedef ::boost::mpl::void_ void_;/*->*/
-
-    template<typename U>
-    struct adaptor1/*<-*/
-    {
-        adaptor1( U& r ) 
-            : ptr( &r )
-        {}
-        U& reference()const{ return *this->ptr; }
-        private:
-        mutable U* ptr;
-    }/*->*/;
-
-    struct adaptor2/*<-*/
-    {
-
-        adaptor2(){}
-
-        template<typename U>
-        struct result{
-           typedef chain_aux::adaptor1<U> type;
-           static type call(U& u){ return type( u ); }
-        };
-
-        template<typename R>
-        typename result<R>::type
-        operator()(R& r)const{
-            return result<R>::call ( r );
-        }
-
-        template<typename R>
-        typename result<R const>::type
-        operator()(R const& r)const{
-            return result<R const>::call( r );
-        }
-
-    }/*->*/;
-
-    template<typename R1, typename U2>
-    typename result_of::chain<R1, U2>::type
-    operator|(R1 & r1, chain_aux::adaptor1<U2> const & h)/*<-*/
-    {
-        typedef result_of::chain<R1, U2> caller_;
-        return caller_::call( r1, h.reference() );
-    }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-    
-    template<typename R1, typename U2>
-    typename result_of::chain<R1 const, U2>::type
-    operator|(R1 const & r1, chain_aux::adaptor1<U2> const & h)/*<-*/
-    {
-        typedef result_of::chain<R1 const, U2> caller_;
-        return caller_::call( r1, h.reference() );
-    }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-
-}// chain_aux
-//<-
-namespace{
-//->
-
-    const chain_aux::adaptor2 _chain/*<-*/ = chain_aux::adaptor2()/*->*/;
-
-//<-
-}
-//->
-namespace result_of{
-
-    using chain_aux::result_of::chain;
-
-}// result_of
-//]
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_CHAIN_PIPE_ER_2011_HPP
+// TODO remove file

Modified: sandbox/assign_v2/boost/assign/v2/chain/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/chain/check.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/chain/check.hpp	2011-06-08 11:21:51 EDT (Wed, 08 Jun 2011)
@@ -14,7 +14,7 @@
 #include <boost/assign/v2/support/config/check.hpp>
 #include <boost/assign/v2/ref/array/get.hpp>
 #include <boost/assign/v2/ref/wrapper/copy.hpp>
-#include <boost/assign/v2/chain/chain.hpp>
+#include <boost/assign/v2/chain/adaptor.hpp>
 #include <boost/assign/v2/chain/meta.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/chain/operator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/chain/operator.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/chain/operator.hpp	2011-06-08 11:21:51 EDT (Wed, 08 Jun 2011)
@@ -11,7 +11,7 @@
 #ifndef BOOST_ASSIGN_V2_CHAIN_OPERATOR_ER_2011_HPP
 #define BOOST_ASSIGN_V2_CHAIN_OPERATOR_ER_2011_HPP
 #include <boost/assign/v2/chain/meta.hpp>
-#include <boost/assign/v2/chain/chain.hpp>
+#include <boost/assign/v2/chain/adaptor.hpp>
 
 namespace boost{
 namespace assign{
@@ -38,4 +38,4 @@
 }// assign
 }// boost
 
-#endif // BOOST_ASSIGN_V2_CHAIN_OPERATOR_AND_ER_2011_HPP
\ No newline at end of file
+#endif // BOOST_ASSIGN_V2_CHAIN_OPERATOR_AND_ER_2011_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/chain.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/chain.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/chain.hpp	2011-06-08 11:21:51 EDT (Wed, 08 Jun 2011)
@@ -9,5 +9,5 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE_CHAIN_ER_2011_HPP
 #define BOOST_ASSIGN_V2_INCLUDE_CHAIN_ER_2011_HPP
-#include <boost/assign/v2/chain/chain.hpp>
+#include <boost/assign/v2/chain/adaptor.hpp>
 #endif // BOOST_ASSIGN_V2_INCLUDE_CHAIN_ER_2011_HPP

Modified: sandbox/assign_v2/boost/assign/v2/support/config/limit_functor_arity.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/support/config/limit_functor_arity.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/support/config/limit_functor_arity.hpp	2011-06-08 11:21:51 EDT (Wed, 08 Jun 2011)
@@ -30,7 +30,7 @@
    functor(x[0], ..., x[n-1])         |    n
 */
 
-#define BOOST_ASSIGN_V2_LIMIT_FUNCTOR_ARITY 4
+#define BOOST_ASSIGN_V2_LIMIT_FUNCTOR_ARITY BOOST_MPL_LIMIT_METAFUNCTION_ARITY
 
 //]
 

Modified: sandbox/assign_v2/libs/assign/v2/doc/org.qbk
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/doc/org.qbk	(original)
+++ sandbox/assign_v2/libs/assign/v2/doc/org.qbk	2011-06-08 11:21:51 EDT (Wed, 08 Jun 2011)
@@ -7,7 +7,7 @@
 This is a header only template library that depends on __url_boost__. Accordingly, the latter has to be in the compiler's search path, 
 and using a given feature of __url_boost_assign_v2__ only requires including the corresponding header file. Under __url_cpp03__ 
 compilation time may be long so it is advised to include headers selectively 
-[footnote As an indication, compiling all of [@../../test/ [^libs/assign/v2/test]] takes about 6 mn using __url_cpp03__, 
+[footnote As an indication, compiling all of [@../../test/ [^libs/assign/v2/test]] takes about 7 mn using __url_cpp03__, 
 and 1 mn using __url_cpp0x__, under the machine specifaction given [link perf here].].
 
 Headers can be looked for by module or by identifier: