[Boost-commit] svn:boost r69989 - in sandbox/assign_v2: boost/assign/v2/put/deque boost/assign/v2/put/pipe boost/assign/v2/ref/wrapper boost/assign/v2/utility boost/assign/v2/utility/chain boost/assign/v2/utility/conversion libs/assign/v2/test libs/assign/v2/test/put libs/assign/v2/test/utility

Subject: [Boost-commit] svn:boost r69989 - in sandbox/assign_v2: boost/assign/v2/put/deque boost/assign/v2/put/pipe boost/assign/v2/ref/wrapper boost/assign/v2/utility boost/assign/v2/utility/chain boost/assign/v2/utility/conversion libs/assign/v2/test libs/assign/v2/test/put libs/assign/v2/test/utility
From: erwann.rogard_at_[hidden]
Date: 2011-03-14 19:29:12

Author: e_r
Date: 2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
New Revision: 69989
URL: http://svn.boost.org/trac/boost/changeset/69989

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp          |     1 +                                       
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp             |     4 ++--                                    
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp             |     6 +++---                                  
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp             |     8 ++++----                                
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/range_get.hpp        |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/utility/chain.hpp                |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/utility/chain/operator_and.hpp   |     6 +++---                                  
   sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp   |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp |     4 +++-                                    
   sandbox/assign_v2/libs/assign/v2/test/mix.cpp                      |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/put/deque.cpp                |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/utility/chain.cpp            |    35 +++++++++++++++++------------------     
   sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp       |     2 +-                                      
   13 files changed, 40 insertions(+), 38 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -66,6 +66,7 @@
         csv_deque_impl<T>(r, std::forward<Args>( args )... );
     }
 //->
+
     template<typename T, typename... Args>
     typename result_of::csv_deque<T>::type
     csv_deque(const T& t, Args const& ...  args)/*<-*/

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -42,8 +42,8 @@
 
 }// put_pipe_aux
 
-	put_pipe_aux::arg_list_generator<> const _csv_put/*<-*/
-    	= put_pipe_aux::arg_list_generator<>()/*->*/;
+    put_pipe_aux::arg_list_generator<> const _csv_put/*<-*/
+        = put_pipe_aux::arg_list_generator<>()/*->*/;
 
 //]
 }// v2

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -34,9 +34,9 @@
         BOOST_STATIC_CONSTANT( bool, is_const = boost::is_const<T>::value );
 
         wrapper()/*<-*/
-        	{/*TODO or null pointer?*/}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
+            {/*TODO or null pointer?*/}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
         explicit /*<<Equivalent to `rebind( r )`>>*/wrapper( T& r )/*<-*/
-        	: ref_(&r)
+            : ref_(&r)
         {}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
         void /*<<Semantics: `ref_ = &r`>>*/rebind(T& r )/*<-*/
         {
@@ -49,7 +49,7 @@
         }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
         T* get_pointer() const/*<-*/
         { 
-        	return this->ref_; 
+            return this->ref_; 
         }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
         using wrapper_crtp<wrapper, T>::operator=;

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -52,10 +52,10 @@
 
         D& derived()/*<-*/
         { 
-        	return static_cast<D&>( *this ); 
+            return static_cast<D&>( *this ); 
         }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
         D const & derived()const/*<-*/{ 
-        	return static_cast<D const&>( *this ); 
+            return static_cast<D const&>( *this ); 
         }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
         void operator=(non_const& t )/*<-*/
@@ -64,7 +64,7 @@
         }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
         void operator=(const_& t )/*<-*/
         {
-        	this->derived().assign( t );
+            this->derived().assign( t );
         }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
         void swap( wrapper_crtp& that )/*<-*/
         {
@@ -108,7 +108,7 @@
     template<typename D, typename T>
     void rebind( wrapper_crtp<D,T>& a, T& t )/*<-*/
     { 
-    	a.rebind( t ); 
+        a.rebind( t ); 
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
     template<typename D, typename T>

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/range_get.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/range_get.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/range_get.hpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -115,7 +115,7 @@
 //->
 
     range_aux::get_adaptor const _get/*<-*/
-    	= range_aux::get_adaptor()/*->*/;
+        = range_aux::get_adaptor()/*->*/;
 
 //<-
 }

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain.hpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -11,6 +11,6 @@
 #define BOOST_ASSIGN_V2_UTILITY_CHAIN_ER_2010_HPP
 
 #include <boost/assign/v2/utility/chain/chain.hpp>
-// #include <boost/assign/v2/utility/chain/alias.hpp> // keep commented out as it is optional
+// #include <boost/assign/v2/utility/chain/operator_and.hpp> // keep commented out as it is optional
 
 #endif // BOOST_ASSIGN_V2_UTILITY_CHAIN_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/operator_and.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/operator_and.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/operator_and.hpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -8,8 +8,8 @@
 //  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_ALIAS_ER_2010_HPP
-#define BOOST_ASSIGN_V2_CHAIN_ALIAS_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_CHAIN_OPERATOR_AND_ER_2010_HPP
+#define BOOST_ASSIGN_V2_CHAIN_OPERATOR_AND_ER_2010_HPP
 #include <boost/assign/v2/utility/chain/meta.hpp>
 #include <boost/assign/v2/utility/chain/chain.hpp>
 
@@ -38,4 +38,4 @@
 }// assign
 }// boost
 
-#endif // BOOST_ASSIGN_V2_CHAIN_ALIAS_ER_2010_HPP
\ No newline at end of file
+#endif // BOOST_ASSIGN_V2_CHAIN_OPERATOR_AND_ER_2010_HPP
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -40,7 +40,7 @@
     }
 
 
-	template<typename C, typename R>
+    template<typename C, typename R>
     struct deduce_tag;
 //->
     template<typename C, typename R>

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -35,7 +35,7 @@
         public:
 
         explicit converter(typename call_traits<R>::param_type r)/*<-*/
-        	 : w( r )
+             : w( r )
         {}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
         template<typename C>
@@ -68,8 +68,10 @@
 //<-
 namespace{
 //->
+
     conversion_aux::converter_adapter const _converter/*<-*/
         = conversion_aux::converter_adapter()/*->*/;
+
 //<-
 }
 //->

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-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -26,7 +26,7 @@
 #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>
+#include <boost/assign/v2/utility/chain/operator_and.hpp>
 #include <libs/assign/v2/test/mix.h>
 
 #include <iostream>

Modified: sandbox/assign_v2/libs/assign/v2/test/put/deque.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/deque.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/deque.cpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -23,7 +23,7 @@
 
     void test()
     {
-
+    
         using namespace boost;
         namespace as2 = assign::v2;    
         {
@@ -40,7 +40,7 @@
             /*<-*/BOOST_ASSIGN_V2_CHECK( BOOST_ASSIGN_V2_IGNORE(/*->*/assert( /*<-*/))/*->*/ cont.front() == 72 );
             /*<-*/BOOST_ASSIGN_V2_CHECK( BOOST_ASSIGN_V2_IGNORE(/*->*/assert( /*<-*/))/*->*/ as2::csv_deque( 72 )( 31 )( 48 ).back() == 48 );
 
-			BOOST_MPL_ASSERT(( is_same<C0, C1> ));
+            BOOST_MPL_ASSERT(( is_same<C0, C1> ));
 
             //]
         }

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-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -18,14 +18,13 @@
 #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>
+#include <boost/assign/v2/utility/chain/operator_and.hpp>
 #include <libs/assign/v2/test/utility/chain.h>
 
 namespace test_assign_v2{
 namespace xxx_utility{
 namespace xxx_chain{
 
-
     void test()
     {
         using namespace boost;
@@ -37,40 +36,40 @@
         }
         // Non-Boost.Assign.v2 containers
         {
-            //[chain_r
+            //[test_utility_chain_read
             typedef std::string T;
             array<T, 2> head;  head[0] = "A"; head[1] = "B";
-            std::list<T> tail; tail.push_back( "Y" ); tail.push_back( "Z" );
+            std::list<T> tail; tail.push_back( "C" ); tail.push_back( "D" );
             std::vector<T> joined( begin( head ), end( head ) ); copy( tail, std::back_inserter( joined ) );
+
             BOOST_ASSIGN_V2_CHECK(
                 range::equal( joined, head | as2::_chain( tail ) )
             );
             //]
         }
         {
-            //[chain_w
-            typedef std::string note; std::vector<note> scale( 4 );
-            scale[0] = "do"; scale[1] = "re"; scale[2] = "mi"; 
-            scale[3] = "fa"; scale[4] = "so"; scale[5] = "la"; scale[6] = "si";
-            array<note, 2> do_mi; std::list<note> fa_si( 4 );
-            copy( scale, begin( do_mi | as2::_chain( fa_si ) ) );
-            BOOST_ASSIGN_V2_CHECK( do_mi[0] == "do" );
-            BOOST_ASSIGN_V2_CHECK( do_mi[1] == "mi" );
-            BOOST_ASSIGN_V2_CHECK( fa_si.front() == "fa" );
-            BOOST_ASSIGN_V2_CHECK( fa_si.back() == "si" );
+            //[test_utility_chain_write
+            typedef std::string word; std::vector<word> words( 4 );
+            words[0] = "foo"; words[1] = "bar"; words[2] = "baz"; 
+            words[3] = "qux"; words[4] = "quux"; words[5] = "grault"; words[6] = "garply";
+            array<word, 2> head; std::list<word> tail( 4 );
+            copy( words, begin( head | as2::_chain( tail ) ) );
+            
+            BOOST_ASSIGN_V2_CHECK( head[0] == "foo" );
+            BOOST_ASSIGN_V2_CHECK( head[1] == "baz" );
+            BOOST_ASSIGN_V2_CHECK( tail.front() == "qux" );
+            BOOST_ASSIGN_V2_CHECK( tail.back() == "garply" );
             //]
         }
         // Boost.Assign.v2 containers
         {
-            //[chain_ref_array
+            //[test_utility_chain_write_refs
             /*<< Needed to bring && into scope >>*/ using namespace assign::v2;
             std::vector<int> consecutive8( 8 ); for(int i = 1; i < 8; i++){ consecutive8[i] = 1 + i; }
             array<int, 5> consecutive5; int six, seven, eight;
             boost::copy(
                 consecutive8,
-                begin(
-                    consecutive5 && (/*<< rvalue! >>*/ as2::ref::csv_array( six, seven, eight ) | as2::ref::_get )
-                )
+                begin( consecutive5 && (/*<< rvalue! >>*/ as2::ref::csv_array( six, seven, eight ) | as2::ref::_get ) )
             );
 
             BOOST_ASSIGN_V2_CHECK( consecutive5.front() == 1 );

Modified: sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp	2011-03-14 19:29:10 EDT (Mon, 14 Mar 2011)
@@ -55,7 +55,7 @@
             //]
         }
         {
-			//test_utility_conversion_stl
+            //test_utility_conversion_stl
             typedef int T; typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48; 
             f< std::vector<T> >( as2::converter( r ), r );
             f< std::deque<T> >( as2::converter( r ), r );