[Boost-commit] svn:boost r71039 - in sandbox/assign_v2: boost/assign/v2/conversion boost/assign/v2/deque boost/assign/v2/deque/cpp03 boost/assign/v2/detail boost/assign/v2/detail/traits boost/assign/v2/detail/traits/aux_ boost/assign/v2/detail/traits/type boost/assign/v2/include/ref boost/assign/v2/interpreter boost/assign/v2/option boost/assign/v2/option/modifier boost/assign/v2/pipe boost/assign/v2/put boost/assign/v2/ref/array boost/assign/v2/ref/array/cpp03 boost/assign/v2/ref/aux_/list boost/assign/v2/ref/aux_/list/holder libs/assign/v2/test libs/assign/v2/test/option libs/assign/v2/test/pipe libs/assign/v2/test/pipe/option libs/assign/v2/test/put libs/assign/v2/test/ref

Subject: [Boost-commit] svn:boost r71039 - in sandbox/assign_v2: boost/assign/v2/conversion boost/assign/v2/deque boost/assign/v2/deque/cpp03 boost/assign/v2/detail boost/assign/v2/detail/traits boost/assign/v2/detail/traits/aux_ boost/assign/v2/detail/traits/type boost/assign/v2/include/ref boost/assign/v2/interpreter boost/assign/v2/option boost/assign/v2/option/modifier boost/assign/v2/pipe boost/assign/v2/put boost/assign/v2/ref/array boost/assign/v2/ref/array/cpp03 boost/assign/v2/ref/aux_/list boost/assign/v2/ref/aux_/list/holder libs/assign/v2/test libs/assign/v2/test/option libs/assign/v2/test/pipe libs/assign/v2/test/pipe/option libs/assign/v2/test/put libs/assign/v2/test/ref
From: erwann.rogard_at_[hidden]
Date: 2011-04-06 14:38:39

Author: e_r
Date: 2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
New Revision: 71039
URL: http://svn.boost.org/trac/boost/changeset/71039

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/conversion/deduce_tag.hpp              |    12 +-                                      
   sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque.hpp              |    44 ++++++------                            
   sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp                    |    58 ++++++++--------                        
   sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp                     |    14 ++--                                    
   sandbox/assign_v2/boost/assign/v2/detail/switch.hpp                      |    20 +++---                                  
   sandbox/assign_v2/boost/assign/v2/detail/traits/aux_/fwd_container.hpp   |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/aux_/value_container.hpp |     6                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container.hpp            |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp        |    12 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/ref/array.hpp                  |    16 ++++                                    
   sandbox/assign_v2/boost/assign/v2/include/ref/csv_array.hpp              |    16 ++++                                    
   sandbox/assign_v2/boost/assign/v2/include/ref/get.hpp                    |    16 ++++                                    
   sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp                   |     4                                         
   sandbox/assign_v2/boost/assign/v2/interpreter/csv.hpp                    |    26 +++---                                  
   sandbox/assign_v2/boost/assign/v2/interpreter/data_generator.hpp         |    10 +-                                      
   sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp               |    10 +-                                      
   sandbox/assign_v2/boost/assign/v2/option/data_generator.hpp              |    74 +++++++++++-----------                  
   sandbox/assign_v2/boost/assign/v2/option/list.hpp                        |    64 +++++++++---------                      
   sandbox/assign_v2/boost/assign/v2/option/modifier/framework.hpp          |     6                                         
   sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp                       |     6                                         
   sandbox/assign_v2/boost/assign/v2/put/csv_put.hpp                        |    96 ++++++++++++++--------------            
   sandbox/assign_v2/boost/assign/v2/put/delayed_csv_put.hpp                |   132 ++++++++++++++++++++--------------------
   sandbox/assign_v2/boost/assign/v2/ref/array/cpp03/csv_array.hpp          |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp                |    10 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/aux_/list/container.hpp            |    20 +++---                                  
   sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/tail.hpp          |     8 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/chain.cpp                          |     4                                         
   sandbox/assign_v2/libs/assign/v2/test/conversion.cpp                     |     5                                         
   sandbox/assign_v2/libs/assign/v2/test/deque.cpp                          |     8 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/option/data.cpp                    |    14 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp                 |     6                                         
   sandbox/assign_v2/libs/assign/v2/test/option/list.cpp                    |    30 ++++----                                
   sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp                  |    12 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp                  |     5                                         
   sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp            |     9 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp                   |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp               |     5                                         
   sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp            |     3                                         
   sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp             |     1                                         
   sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp             |     1                                         
   sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp       |     1                                         
   sandbox/assign_v2/libs/assign/v2/test/put/ptr.cpp                        |    12 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/put/put.cpp                        |    26 +++---                                  
   sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp                      |     4                                         
   sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp                  |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/ref/get.cpp                        |     4                                         
   46 files changed, 439 insertions(+), 401 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/conversion/deduce_tag.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/conversion/deduce_tag.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/conversion/deduce_tag.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -32,14 +32,14 @@
 namespace conversion_aux{
 
     template<
-    	typename C		// Container
-        , typename R	// Range
+        typename C        // Container
+        , typename R    // Range
     >
     struct deduce_tag 
-    	: switch_aux::result<
-        	switch_tag::conversion,
-        	C
-    	>
+        : switch_aux::result<
+            switch_tag::conversion,
+            C
+        >
     {};
 
 }// conversion_aux

Modified: sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -23,47 +23,47 @@
 #define BOOST_ASSIGN_V2_MACRO(z, N, is_const)\
     template<typename T BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)>\
     typename boost::lazy_disable_if<\
-    	is_option_crtp<T0>,\
+        is_option_crtp<T0>,\
         result_of::csv_deque<T>\
     >::type\
     csv_deque(BOOST_PP_ENUM_BINARY_PARAMS(\
-    	N, T, BOOST_PP_EXPR_IF(is_const, const)& _\
+        N, T, BOOST_PP_EXPR_IF(is_const, const)& _\
     ))\
     {\
-    	typename result_of::csv_deque<T>::type result;\
+        typename result_of::csv_deque<T>::type result;\
         csv( result BOOST_PP_ENUM_TRAILING_PARAMS(N, _) );\
-		return result;\
+        return result;\
     }\
     template<\
-    	typename T, typename O\
+        typename T, typename O\
         BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)\
     >\
     typename boost::lazy_enable_if<\
-    	is_option_crtp<O>,\
-    	result_of::csv_deque_option<O, T>\
+        is_option_crtp<O>,\
+        result_of::csv_deque_option<O, T>\
     >::type\
     csv_deque(\
-    	O const& options\
+        O const& options\
         BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(\
-        	N, T, BOOST_PP_EXPR_IF(is_const, const)& _\
+            N, T, BOOST_PP_EXPR_IF(is_const, const)& _\
     ))\
     {\
-   		typedef typename result_of::csv_deque<T>::type before_op_;\
-		typedef typename result_of::csv_deque_option<O, T>::type result_;\
+           typedef typename result_of::csv_deque<T>::type before_op_;\
+        typedef typename result_of::csv_deque_option<O, T>::type result_;\
         result_ result = before_op_() % options;\
         csv( result BOOST_PP_ENUM_TRAILING_PARAMS(N, _) );\
-		return result;\
+        return result;\
     }\
 /**/
 
 BOOST_PP_REPEAT_FROM_TO(
-	1,
+    1,
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_CSV_ARITY),
     BOOST_ASSIGN_V2_MACRO,
     0
 )
 BOOST_PP_REPEAT_FROM_TO(
-	1, 
+    1, 
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_CSV_ARITY),
     BOOST_ASSIGN_V2_MACRO,
     1
@@ -75,29 +75,29 @@
 #define BOOST_ASSIGN_V2_MACRO(z, N, is_const)\
     template<typename T>\
     typename boost::lazy_disable_if<\
-    	is_option_crtp<T>,\
-    	result_of::csv_deque<T>\
+        is_option_crtp<T>,\
+        result_of::csv_deque<T>\
     >::type\
     csv_deque(\
-    	BOOST_PP_ENUM_PARAMS(N, T BOOST_PP_EXPR_IF(is_const, const) & _)\
+        BOOST_PP_ENUM_PARAMS(N, T BOOST_PP_EXPR_IF(is_const, const) & _)\
     )\
     {\
         return csv_deque<T, BOOST_PP_ENUM( N, BOOST_ASSIGN_V2_PAR_LIST, T)>(\
-        	BOOST_PP_ENUM_PARAMS(N, _)\
+            BOOST_PP_ENUM_PARAMS(N, _)\
         );\
     }\
     template<typename O, typename T>\
     typename boost::lazy_enable_if<\
-    	is_option_crtp<O>,\
-    	result_of::csv_deque_option<O, T>\
+        is_option_crtp<O>,\
+        result_of::csv_deque_option<O, T>\
     >::type\
     csv_deque(\
-    	O const& options,\
+        O const& options,\
         BOOST_PP_ENUM_PARAMS(N, T BOOST_PP_EXPR_IF(is_const, const) & _)\
     )\
     {\
         return csv_deque<T, O, BOOST_PP_ENUM( N, BOOST_ASSIGN_V2_PAR_LIST, T )>(\
-        	options,\
+            options,\
             BOOST_PP_ENUM_PARAMS(N, _)\
         );\
     }\

Modified: sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -31,7 +31,7 @@
     template<typename T>
     struct csv_deque_deduce_value/*<-*/ : boost::decay<
         typename boost::remove_cv<
-        	typename boost::remove_reference<T>::type
+            typename boost::remove_reference<T>::type
         >::type
     >{}/*->*/;
 
@@ -39,15 +39,15 @@
 
     template<typename T>
     struct csv_deque/*<-*/
-    	: result_of::deque<
-        	typename csv_deque_deduce_value<T>::type
-    	>
+        : result_of::deque<
+            typename csv_deque_deduce_value<T>::type
+        >
     {}/*->*/;
 
     template<typename Os, typename T>
-    struct csv_deque_option/*<-*/	
-    	: modulo_result<
-        	typename result_of::csv_deque<T>::type,
+    struct csv_deque_option/*<-*/    
+        : modulo_result<
+            typename result_of::csv_deque<T>::type,
             Os
         >
     {}/*->*/;
@@ -64,59 +64,59 @@
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 //->
         
-	// Explicit T
+    // Explicit T
     
     template<typename T, typename U, typename... Args>
     typename boost::lazy_disable_if<
-    	is_option_crtp_cpp0x<U>,
-    	result_of::csv_deque<T>
+        is_option_crtp_cpp0x<U>,
+        result_of::csv_deque<T>
     >::type
     csv_deque(U&& u, Args&& ...  args)/*<-*/
     {
         typename result_of::csv_deque<T>::type result;
-		csv( result, std::forward<U>( u ), std::forward<Args>( args )... );
+        csv( result, std::forward<U>( u ), std::forward<Args>( args )... );
         return result;
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
     template<typename T, typename O, typename... Args>
     typename boost::lazy_enable_if<
-    	is_option_crtp<O>,
-    	result_of::csv_deque_option<O, T>
+        is_option_crtp<O>,
+        result_of::csv_deque_option<O, T>
     >::type
     csv_deque(O const& options, Args&& ...  args)/*<-*/
     {
-    	typedef typename result_of::csv_deque<T>::type before_op_;
+        typedef typename result_of::csv_deque<T>::type before_op_;
         typename result_of::csv_deque_option<
-        	O, T
+            O, T
         >::type result = before_op_() % options;
-		csv( result, std::forward<Args>( args )... );
+        csv( result, std::forward<Args>( args )... );
         return result;
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
-	// Implicit T
+    // Implicit T
     
     template<typename T, typename... Args>
     typename boost::lazy_disable_if<
-    	is_option_crtp_cpp0x<T>,
-    	result_of::csv_deque<T>
+        is_option_crtp_cpp0x<T>,
+        result_of::csv_deque<T>
     >::type
     csv_deque(T&& t, Args&& ...  args)/*<-*/
     {
-    	csv_deque<T>( 
-        	std::forward<T>( t ), 
+        csv_deque<T>( 
+            std::forward<T>( t ), 
             std::forward<Args>( args )... 
         );
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
     template<typename O, typename T, typename... Args>
     typename boost::lazy_enable_if
-    	is_option_crtp<O>,
-    	result_of::csv_deque_option<Os, T>
+        is_option_crtp<O>,
+        result_of::csv_deque_option<Os, T>
     >::type
     csv_deque(O const& options, T&& t, Args&& ...  args)/*<-*/
     {
-    	csv_deque<T>( 
-        	options, 
+        csv_deque<T>( 
+            options, 
             std::forward<T>( t ), 
             std::forward<Args>( args )... 
         );
@@ -130,7 +130,7 @@
 //<-
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 //->
-	using interpreter_aux::csv_deque;
+    using interpreter_aux::csv_deque;
 //<-
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 //->
@@ -139,12 +139,12 @@
 
     template<typename T>
     struct csv_deque/*<-*/
-    	: interpreter_aux::result_of::csv_deque<T>
+        : interpreter_aux::result_of::csv_deque<T>
     {}/*->*/;
 
     template<typename Os, typename T>
-    struct csv_deque_option/*<-*/	
-    	: interpreter_aux::result_of::csv_deque_option<Os, T>
+    struct csv_deque_option/*<-*/    
+        : interpreter_aux::result_of::csv_deque_option<Os, T>
     {}/*->*/;
 
 }// result_of

Modified: sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -28,13 +28,13 @@
     struct value/*<-*/{}/*->*/;
 
 }//keyword_aux
-	typedef keyword_aux::ignore			ignore_;
-	typedef keyword_aux::element		element_;
-	typedef keyword_aux::key			key_;
-	typedef keyword_aux::map			map_;
-	typedef keyword_aux::nil			nil_;
-	typedef keyword_aux::use_default	use_default_;
-	typedef keyword_aux::value			value_;	
+    typedef keyword_aux::ignore            ignore_;
+    typedef keyword_aux::element        element_;
+    typedef keyword_aux::key            key_;
+    typedef keyword_aux::map            map_;
+    typedef keyword_aux::nil            nil_;
+    typedef keyword_aux::use_default    use_default_;
+    typedef keyword_aux::value            value_;    
 /*<-*/namespace{/*->*/
     const ignore_ _ignore/*<-*/ = ignore_()/*->*/;
     const element_ _element/*<-*/ = element_()/*->*/;

Modified: sandbox/assign_v2/boost/assign/v2/detail/switch.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/switch.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/switch.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -25,14 +25,14 @@
 
     template<typename SwitchTag, int CaseNumber> struct case_
     {
-    	// Specialize like this:
+        // Specialize like this:
         // template<>
-    	// struct case_<SwitchTag, CaseNumber> : helper<Value, Predicate>{};
+        // struct case_<SwitchTag, CaseNumber> : helper<Value, Predicate>{};
     };
 
     template<typename Expression>
     struct always_true_ 
-    	: ::boost::mpl::true_
+        : ::boost::mpl::true_
     {};
 
     template<typename Value, template<typename> class Predicate = always_true_>
@@ -42,7 +42,7 @@
         
         template<typename Expression> 
         struct apply 
-        	: Predicate<Expression>
+            : Predicate<Expression>
         {};
         
     };
@@ -56,14 +56,14 @@
     template<typename SwitchTag, typename Expression, int CaseNumber = 0>
     struct result : ::boost::mpl::eval_if<
         ::boost::mpl::apply1< 
-        	switch_aux::case_<SwitchTag, CaseNumber>, 
+            switch_aux::case_<SwitchTag, CaseNumber>, 
             Expression 
         >,
         switch_aux::extract_value< 
-        	switch_aux::case_<SwitchTag, CaseNumber> 
+            switch_aux::case_<SwitchTag, CaseNumber> 
         >,
         switch_aux::result< 
-        	SwitchTag, Expression, CaseNumber + 1
+            SwitchTag, Expression, CaseNumber + 1
         >
     >{};
 
@@ -90,11 +90,11 @@
 /**/
 
 // Usage:
-// 	#define BOOST_ASSIGN_V2_SWITCH_TAG unspecified
+//     #define BOOST_ASSIGN_V2_SWITCH_TAG unspecified
 // for i = 0,...,n-1
-// 	BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_CASE(i, Fi, Valuei)
+//     BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_CASE(i, Fi, Valuei)
 // and
-// 	BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_CASE(n, Valuen)
+//     BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_CASE(n, Valuen)
 
 }// v2
 }// assign

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/aux_/fwd_container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/aux_/fwd_container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/aux_/fwd_container.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -46,7 +46,7 @@
 namespace detail{
 namespace multi_array{
 
-	struct multi_array_base;
+    struct multi_array_base;
 
 }// multi_array
 }// detail

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/aux_/value_container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/aux_/value_container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/aux_/value_container.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -44,11 +44,11 @@
     template<typename C> 
     struct value_is_map : ::boost::mpl::false_{};
 
-	typedef ::boost::detail::multi_array::multi_array_base multi_array_base_;
+    typedef ::boost::detail::multi_array::multi_array_base multi_array_base_;
 
-	template<typename C>
+    template<typename C>
     struct value_is_multi_array
-    	: boost::is_base_of<multi_array_base_, C>
+        : boost::is_base_of<multi_array_base_, C>
     {};
 
 }// container_aux

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -49,7 +49,7 @@
     struct value : through_value_container<value_value, C>{};
 
     template<
-    	typename C	// Multi-array
+        typename C    // Multi-array
     >
     struct element : through_value_container<value_element, C>{};
 

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -21,20 +21,20 @@
 namespace type_traits{
 
 template<typename ...Args> struct or_const 
-	: ::boost::mpl::false_
+    : ::boost::mpl::false_
 {};
 
 template<typename T, typename ...Args>
 struct or_const<T, Args...> 
-	: ::boost::mpl::or_<
-    	boost::is_const<T>,
-    	or_const<Args...>
-	>
+    : ::boost::mpl::or_<
+        boost::is_const<T>,
+        or_const<Args...>
+    >
 {};
 
 template<typename T, typename ...Args>
 struct or_const<T const, Args...> 
-	: ::boost::mpl::true_
+    : ::boost::mpl::true_
 {};
 
 }// type_traits

Modified: sandbox/assign_v2/boost/assign/v2/include/ref/array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/ref/array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/ref/array.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -1 +1,15 @@
-// TODO remove file
\ No newline at end of file
+//////////////////////////////////////////////////////////////////////////////
+//  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_INCLUDE_REF_ARRAY_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE_REF_ARRAY_ER_2010_HPP
+#include <boost/assign/v2/ref/array/array.hpp>
+
+#endif // BOOST_ASSIGN_V2_INCLUDE_REF_ARRAY_ER_2010_HPP
+

Modified: sandbox/assign_v2/boost/assign/v2/include/ref/csv_array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/ref/csv_array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/ref/csv_array.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -1 +1,15 @@
-// TODO remove file
\ No newline at end of file
+//////////////////////////////////////////////////////////////////////////////
+//  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_INCLUDE_REF_CSV_ARRAY_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE_REF_CSV_ARRAY_ER_2010_HPP
+#include <boost/assign/v2/ref/array/csv_array.hpp>
+
+#endif // BOOST_ASSIGN_V2_INCLUDE_REF_CSV_ARRAY_ER_2010_HPP
+

Modified: sandbox/assign_v2/boost/assign/v2/include/ref/get.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/ref/get.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/ref/get.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -1 +1,15 @@
-// TODO remove file
\ No newline at end of file
+//////////////////////////////////////////////////////////////////////////////
+//  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_INCLUDE_REF_GET_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE_REF_GET_ER_2010_HPP
+#include <boost/assign/v2/ref/array/get.hpp>
+
+#endif // BOOST_ASSIGN_V2_INCLUDE_REF_GET_ER_2010_HPP
+    

Modified: sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -136,8 +136,8 @@
     template<
         typename C              // Container, 
         , typename F            // Data generator
-        , typename MTag  		// Modifier tag
-        , typename DTag      	// Data tag
+        , typename MTag          // Modifier tag
+        , typename DTag          // Data tag
         , typename D            // Derived
     >
     class interpreter_crtp

Modified: sandbox/assign_v2/boost/assign/v2/interpreter/csv.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/csv.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/csv.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -34,20 +34,20 @@
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 //->
 
-	template<typename C, typename F, typename MTag, typename DTag, typename D>
-	void csv( 
-    	interpreter_crtp<C, F, MTag, DTag, D> const& interpreter
+    template<typename C, typename F, typename MTag, typename DTag, typename D>
+    void csv( 
+        interpreter_crtp<C, F, MTag, DTag, D> const& interpreter
     )/*<-*/
     {
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-	template<typename C, typename F, typename MTag, typename DTag, typename D>
+    template<typename C, typename F, typename MTag, typename DTag, typename D>
     void csv( 
-    	interpreter_crtp<C, F, MTag, DTag, D> const& interpreter, 
-    	T&& t, Args&&... args 
+        interpreter_crtp<C, F, MTag, DTag, D> const& interpreter, 
+        T&& t, Args&&... args 
     )/*<-*/
     {
         return csv( 
-        	interpreter( std::forward<T>( t ) ), 
+            interpreter( std::forward<T>( t ) ), 
             std::forward<Args>( args )... 
         );
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
@@ -57,22 +57,22 @@
 #define BOOST_ASSIGN_V2_MACRO1(z, i, data) ( BOOST_PP_CAT(_, i) )
 #define BOOST_ASSIGN_V2_MACRO2(z, N, is_const)\
     template<\
-    	typename C, typename F, typename MTag, typename DTag, typename D\
+        typename C, typename F, typename MTag, typename DTag, typename D\
         BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)\
     >\
     void csv(\
-    	interpreter_crtp<C, F, MTag, DTag, D> const& interpreter\
-		BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(\
-        	N, T, BOOST_PP_EXPR_IF(is_const, const) & _\
+        interpreter_crtp<C, F, MTag, DTag, D> const& interpreter\
+        BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(\
+            N, T, BOOST_PP_EXPR_IF(is_const, const) & _\
         )\
     )\
     {\
-	    interpreter BOOST_PP_REPEAT(N, BOOST_ASSIGN_V2_MACRO1, ~ );\
+        interpreter BOOST_PP_REPEAT(N, BOOST_ASSIGN_V2_MACRO1, ~ );\
     }\
 /**/
 
 BOOST_PP_REPEAT_FROM_TO(
-	1, // otherwise redefintion of csv()
+    1, // otherwise redefintion of csv()
     BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_CSV_ARITY),
     BOOST_ASSIGN_V2_MACRO2,
     0

Modified: sandbox/assign_v2/boost/assign/v2/interpreter/data_generator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/data_generator.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/data_generator.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -33,13 +33,13 @@
 namespace interpreter_aux{
 
     template<
-        typename C 		// Value or pointer-container
+        typename C         // Value or pointer-container
     >
     struct deduce_data_generator/*<-*/
-    	: data_generator<
-        	C, 
-        	typename switch_aux::result< 
-            	switch_tag::data_generator,
+        : data_generator<
+            C, 
+            typename switch_aux::result< 
+                switch_tag::data_generator,
                 C
             >::type
         >

Modified: sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -15,6 +15,7 @@
 #include <boost/assign/v2/interpreter/fwd.hpp>
 #include <boost/assign/v2/option/modifier/insert.hpp>
 #include <boost/assign/v2/option/modifier/iterate.hpp>
+#include <boost/assign/v2/option/modifier/row_major.hpp>
 #include <boost/assign/v2/option/modifier/std.hpp>
 #include <boost/concept_check.hpp>
 #include <boost/mpl/apply.hpp>
@@ -64,10 +65,11 @@
 }// switch_tag
 
 #define BOOST_ASSIGN_V2_SWITCH_TAG modifier_tag
-BOOST_ASSIGN_V2_SWITCH_CASE( 0, container_aux::is_associative, modifier_tag::insert )
-BOOST_ASSIGN_V2_SWITCH_CASE( 1, container_aux::is_array, modifier_tag::iterate<> )
-BOOST_ASSIGN_V2_SWITCH_CASE( 2, container_aux::has_push_deduced_value, 	modifier_tag::push )
-BOOST_ASSIGN_V2_SWITCH_CASE_DEFAULT( 3, modifier_tag::push_back )
+BOOST_ASSIGN_V2_SWITCH_CASE( 0, container_aux::is_multi_array, modifier_tag::row_major )
+BOOST_ASSIGN_V2_SWITCH_CASE( 1, container_aux::is_associative, modifier_tag::insert )
+BOOST_ASSIGN_V2_SWITCH_CASE( 2, container_aux::is_array, modifier_tag::iterate<> )
+BOOST_ASSIGN_V2_SWITCH_CASE( 3, container_aux::has_push_deduced_value,     modifier_tag::push )
+BOOST_ASSIGN_V2_SWITCH_CASE_DEFAULT( 4, modifier_tag::push_back )
 #undef BOOST_ASSIGN_V2_SWITCH_TAG
 
 /*->*/

Modified: sandbox/assign_v2/boost/assign/v2/option/data_generator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/data_generator.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/data_generator.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -7,8 +7,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_OPTION_DATA_GENERATOR_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTION_DATA_GENERATOR_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_OPTION_DATA_ER_2010_HPP
+#define BOOST_ASSIGN_V2_OPTION_DATA_ER_2010_HPP
 #include <boost/assign/v2/detail/functor/value.hpp>
 #include <boost/assign/v2/detail/keyword.hpp>
 #include <boost/assign/v2/detail/pp/ignore.hpp>
@@ -22,16 +22,16 @@
     struct use_default;
 namespace assign{
 namespace v2{
-//[syntax_option_data_generator
+//[syntax_option_data
 namespace interpreter_aux{
 
     template<
-        typename C 		// Value or pointer-container
-        , typename F	// Functor or keyword	
+        typename C         // Value or pointer-container
+        , typename F    // Functor or keyword    
     >
     struct data_generator/*<-*/
     {
-    	typedef F type;
+        typedef F type;
     }/*->*/;
 
     template<
@@ -39,7 +39,7 @@
     >
     struct data_generator<C, element_>/*<-*/
     {
-    	typedef typename container_aux::element<C>::type element_;
+        typedef typename container_aux::element<C>::type element_;
         typedef functor_aux::value<element_> type;
     }/*->*/;
 
@@ -48,7 +48,7 @@
     {
         typedef typename container_aux::key<C>::type key_;
         typedef functor_aux::value<key_> type;
-	}/*->*/;
+    }/*->*/;
 
     template<typename C>
     struct data_generator<C, map_>/*<-*/
@@ -57,11 +57,11 @@
         typedef typename container_aux::mapped<C>::type mapped_;
         typedef typename container_aux::value<C>::type value_;
         typedef functor_aux::pair<value_, key_, mapped_> type;
-	}/*->*/;
+    }/*->*/;
 
     template<typename C>
     struct data_generator<C, use_default_>/*<-*/
-		: deduce_data_generator<C>
+        : deduce_data_generator<C>
     {}/*->*/;
 
     template<typename C>
@@ -75,7 +75,7 @@
 namespace result_of{
 
     template<typename D, typename C, typename F = use_default_>
-    struct option_data_generator/*<-*/
+    struct option_data/*<-*/
         : ::boost::mpl::apply1<
             interpreter_aux::replace_data_generator<D>, 
             typename data_generator<C, F>::type
@@ -85,13 +85,13 @@
 }// result_of
 
     template<typename F/*<-*/= ignore_/*->*/>
-    struct option_data_generator/*<-*/
-    	: option_crtp<
-        	option_data_generator<F> 
+    struct option_data/*<-*/
+        : option_crtp<
+            option_data<F> 
         >
     {
-        option_data_generator(){}
-        option_data_generator(F f) : f_( f ){}
+        option_data(){}
+        option_data(F f) : f_( f ){}
 
         template<typename C>
         F const& get()const{ return this->f_; }
@@ -101,13 +101,13 @@
     }/*->*/;
 
 //<-
-	template<typename Kwd>
-    struct option_data_generator_helper
-    	: option_crtp<
-        	option_data_generator<Kwd> 
+    template<typename Kwd>
+    struct option_data_helper
+        : option_crtp<
+            option_data<Kwd> 
         >
     {
-		template<typename C>
+        template<typename C>
         typename data_generator<C, Kwd>::type 
         get()const
         { 
@@ -117,11 +117,11 @@
 
 #define BOOST_ASSIGN_V2_MACRO(Kwd)\
     template<>\
-    struct option_data_generator<Kwd>\
-    	: option_data_generator_helper<Kwd>\
+    struct option_data<Kwd>\
+        : option_data_helper<Kwd>\
     {\
-        option_data_generator(){}\
-        option_data_generator(ignore_){}\
+        option_data(){}\
+        option_data(ignore_){}\
     };\
 /**/    
 BOOST_ASSIGN_V2_MACRO(element_)
@@ -135,13 +135,13 @@
     // Overrides data generator
     template<typename C, typename F, typename MTag
         , typename DTag, typename D, typename F1>
-    typename result_of::option_data_generator<D, C, F1>::type
+    typename result_of::option_data<D, C, F1>::type
     operator%(
         interpreter_crtp<C, F, MTag, DTag, D> const& lhs,
-        option_data_generator<F1> const& rhs
+        option_data<F1> const& rhs
     )/*<-*/
     {
-        typedef typename result_of::option_data_generator<
+        typedef typename result_of::option_data<
             D, C, F1
         >::type result_;
         return result_( 
@@ -151,26 +151,26 @@
         );
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
-    struct keyword_data_generator
+    struct keyword_data
     /*<-*/{
 
         template<typename F>
-        option_data_generator<F> operator=(F const& f)const{
-            return option_data_generator<F>( f );
+        option_data<F> operator=(F const& f)const{
+            return option_data<F>( f );
         }
 
     }/*->*/;
 
 }// interpreter_aux
 namespace{
-    const interpreter_aux::keyword_data_generator _data/*<-*/ 
-        = interpreter_aux::keyword_data_generator()/*->*/;
+    const interpreter_aux::keyword_data _data/*<-*/ 
+        = interpreter_aux::keyword_data()/*->*/;
 }
 namespace result_of{
 
     template<typename D, typename C, typename F>
-    struct option_data_generator/*<-*/
-        : interpreter_aux::result_of::option_data_generator<D, C, F>
+    struct option_data/*<-*/
+        : interpreter_aux::result_of::option_data<D, C, F>
     {}/*->*/;
 
 }// result_of
@@ -190,7 +190,7 @@
 namespace interpreter_aux{\
 \
     template<typename T>\
-    option_data_generator< FUN > NAME()\
+    option_data< FUN > NAME()\
     {\
         return ( v2::_data = FUN() );\
     }\
@@ -223,4 +223,4 @@
 #include <boost/lambda/lambda.hpp>
 BOOST_ASSIGN_V2_OPTION_DATA_KEYWORD(identity, ::boost::lambda::_1)
 
-#endif // BOOST_ASSIGN_V2_OPTION_DATA_GENERATOR_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_DATA_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/option/list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/list.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/list.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -77,21 +77,21 @@
     
     template<typename O, bool is_list = false> 
     struct option_crtp{};
-	
+    
     template<typename O>
     struct is_option_crtp 
-    	: boost::mpl::or_<
-        	boost::is_base_of< option_crtp<O, false>, O>,
-        	boost::is_base_of< option_crtp<O, true>, O>
+        : boost::mpl::or_<
+            boost::is_base_of< option_crtp<O, false>, O>,
+            boost::is_base_of< option_crtp<O, true>, O>
         >
     {};
 
-	template<
-    	typename O	// O&&, O&
+    template<
+        typename O    // O&&, O&
     >
     struct is_option_crtp_cpp0x : is_option_crtp<
-    	typename boost::remove_cv<
-        	typename boost::remove_reference<O>::type
+        typename boost::remove_cv<
+            typename boost::remove_reference<O>::type
         >::type
     >{};
             
@@ -104,34 +104,34 @@
 
     template<typename Head, typename Tail, bool exit>
     struct list_option_inherit 
-    	: Tail
+        : Tail
     {
-    	list_option_inherit(){}
-    	list_option_inherit( Tail tail ) 
-        	: Tail( tail )
+        list_option_inherit(){}
+        list_option_inherit( Tail tail ) 
+            : Tail( tail )
         {}
     };
 
     template<typename Head, typename Tail>
     struct list_option_inherit<Head, Tail, true> 
-    	: Tail, 
+        : Tail, 
         option_crtp< 
-        	list_option<Head, Tail, true>,
+            list_option<Head, Tail, true>,
             true
         >
     {
-    	list_option_inherit(){}
-    	list_option_inherit( Tail tail ) 
-        	: Tail( tail )
+        list_option_inherit(){}
+        list_option_inherit( Tail tail ) 
+            : Tail( tail )
         {}
     };
 
     template<typename Head, typename Tail, bool exit>
     struct list_option 
-    	: list_option_inherit<Head, Tail, exit>
+        : list_option_inherit<Head, Tail, exit>
     {
 
-		typedef list_option_inherit<Head, Tail, exit> super_t;
+        typedef list_option_inherit<Head, Tail, exit> super_t;
         typedef Head head_type;
         typedef Tail tail_type;
 
@@ -194,9 +194,9 @@
 
 namespace result_of{
 
-	template<typename L, typename O1>
-	struct list_option_modulo
-    	: L:: template result<O1>
+    template<typename L, typename O1>
+    struct list_option_modulo
+        : L:: template result<O1>
     {};
 
 
@@ -209,15 +209,15 @@
 namespace interpreter_aux{
 namespace result_of{
 
-	template<typename O1, typename O2>
+    template<typename O1, typename O2>
     struct option_modulo 
-    	: result_of::list_option_modulo<
-    		typename result_of::list_option_modulo<
-    			empty_list_option,
-        		O1
-    		>::type, 
-        	O2
-    	>
+        : result_of::list_option_modulo<
+            typename result_of::list_option_modulo<
+                empty_list_option,
+                O1
+            >::type, 
+            O2
+        >
     {};
 
 }// result_of
@@ -226,8 +226,8 @@
     typename result_of::option_modulo<O1, O2>::type
     operator%(option_crtp<O1, false> const option1, O2 const& option2)
     {
-    	O1 const& ref = static_cast<O1 const&>( option1 );
-		return _list_option % ref % option2;
+        O1 const& ref = static_cast<O1 const&>( option1 );
+        return _list_option % ref % option2;
     }
 
 }// interpreter_aux

Modified: sandbox/assign_v2/boost/assign/v2/option/modifier/framework.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/modifier/framework.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/modifier/framework.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -28,8 +28,8 @@
         , typename Arg /*<-*/= ignore_/*->*/ // Specifies an aspect of the implementation
     >
     struct option_modifier/*<-*/
-    	: option_crtp<
-         	option_modifier<Keyword, Arg> 
+        : option_crtp<
+             option_modifier<Keyword, Arg> 
         >
     /*->*/
     {
@@ -135,7 +135,7 @@
     template<typename D, typename Arg>\
     struct BOOST_PP_CAT(option_, NAME)\
         : result_of::option_modifier<\
-        	D,\
+            D,\
             interpreter_aux::BOOST_PP_CAT(keyword_,NAME),\
             Arg\
         >\

Modified: sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -183,15 +183,15 @@
     >
     C& operator|(C& cont, interpreter_aux::arg_list<H, T, N, U> const& arg_list)/*<-*/
     {
-    	typedef typename ::boost::mpl::if_c<
-        	!container_aux::is_map<C>::value,
+        typedef typename ::boost::mpl::if_c<
+            !container_aux::is_map<C>::value,
             use_default_,
             value_
         >::type arg_;
 
         v2::ref::as_arg_list(    
             arg_list.apply( 
-            	put( cont ) % ( _data = arg_() ) 
+                put( cont ) % ( _data = arg_() ) 
             ),
             arg_list.arg_list_cont()
         );

Modified: sandbox/assign_v2/boost/assign/v2/put/csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/csv_put.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/csv_put.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -31,67 +31,67 @@
 //[syntax_csv_put
 namespace interpreter_aux{
 
-	template<typename F>
+    template<typename F>
     struct csv_ready
-    	: ::boost::mpl::true_
+        : ::boost::mpl::true_
     {};
 
-	template<typename T, typename K, typename M>
+    template<typename T, typename K, typename M>
     struct csv_ready<
-		functor_aux::pair<T, K, M>
+        functor_aux::pair<T, K, M>
     > 
-    	: ::boost::mpl::false_
+        : ::boost::mpl::false_
     {};
 
 namespace result_of{
 
-	template<typename C, typename F, typename MTag, typename DTag>
-	struct if_csv_ready : ::boost::mpl::identity<
-    	put_interpreter<C, F, MTag, DTag>
+    template<typename C, typename F, typename MTag, typename DTag>
+    struct if_csv_ready : ::boost::mpl::identity<
+        put_interpreter<C, F, MTag, DTag>
     >
     {};
 
-	template<typename C, typename F, typename MTag, typename DTag>
-	struct else_csv_ready : result_of::option_data_generator<
-    	put_interpreter<C, F, MTag, DTag>, C, value_
+    template<typename C, typename F, typename MTag, typename DTag>
+    struct else_csv_ready : result_of::option_data<
+        put_interpreter<C, F, MTag, DTag>, C, value_
     >
     {};
 
-	template<typename C, typename F, typename MTag, typename DTag>
-	struct make_csv_ready : ::boost::mpl::eval_if<
-		csv_ready<F>,
+    template<typename C, typename F, typename MTag, typename DTag>
+    struct make_csv_ready : ::boost::mpl::eval_if<
+        csv_ready<F>,
         if_csv_ready<C, F, MTag, DTag>,
         else_csv_ready<C, F, MTag, DTag>
     >{};
 
 }// result_of
 
-	template<typename C, typename F, typename MTag, typename DTag>
+    template<typename C, typename F, typename MTag, typename DTag>
     typename result_of::if_csv_ready<C, F, MTag, DTag>::type
-	make_csv_ready( 
-    	put_interpreter<C, F, MTag, DTag> const& interpreter, 
+    make_csv_ready( 
+        put_interpreter<C, F, MTag, DTag> const& interpreter, 
         boost::mpl::true_ suitable
     )
     {
-		return interpreter;
-	}
+        return interpreter;
+    }
 
-	template<typename C, typename F, typename MTag, typename DTag>
+    template<typename C, typename F, typename MTag, typename DTag>
     typename result_of::else_csv_ready<C, F, MTag, DTag>::type
-	make_csv_ready( 
-    	put_interpreter<C, F, MTag, DTag> const& interpreter, 
+    make_csv_ready( 
+        put_interpreter<C, F, MTag, DTag> const& interpreter, 
         boost::mpl::false_ suitable
     )
     {
-		return interpreter % ( _data = _value );
-	}
+        return interpreter % ( _data = _value );
+    }
 
-	template<typename C, typename F, typename MTag, typename DTag>
+    template<typename C, typename F, typename MTag, typename DTag>
     typename result_of::make_csv_ready<C, F, MTag, DTag>::type
-	make_csv_ready( put_interpreter<C, F, MTag, DTag> const& interpreter)
+    make_csv_ready( put_interpreter<C, F, MTag, DTag> const& interpreter)
     {
-		return make_csv_ready( 
-        	interpreter, 
+        return make_csv_ready( 
+            interpreter, 
             typename csv_ready<F>::type() 
         );
     }
@@ -101,56 +101,56 @@
 //->
 
 
-	template<typename C, typename O, bool is, typename Args>
+    template<typename C, typename O, bool is, typename Args>
     typename boost::enable_if< 
-    	is_option_crtp<O> 
+        is_option_crtp<O> 
     >::type csv_put( C& cont, option_crtp<O, is> const& crtp, Args&&... args )
     {
-    	O const& options = static_cast<O const&>( crtp );
-    	csv(
-    		make_csv_ready( 
+        O const& options = static_cast<O const&>( crtp );
+        csv(
+            make_csv_ready( 
                 put( cont ) % options
-        	),
-          	std::forward<Args>( args )...  
+            ),
+              std::forward<Args>( args )...  
         );
     }
 
-	template<typename C, typename Args>
+    template<typename C, typename Args>
     typename boost::disable_if< 
-    	is_option_crtp<O> 
+        is_option_crtp<O> 
     >::type csv_put( C& cont, Args&&... args)
     {
-    	csv(
-    		make_csv_ready( put( cont ) ),
-          	std::forward<Args>( args )...  
+        csv(
+            make_csv_ready( put( cont ) ),
+              std::forward<Args>( args )...  
         );
     }
 
 //]
 #else
 
-	template<typename C>
+    template<typename C>
     void csv_put( C& cont ){}
 
 #define BOOST_ASSIGN_V2_MACRO(z, N, is_const)\
     template<typename C, typename O, BOOST_PP_ENUM_PARAMS(N, typename T)>\
-	typename boost::enable_if<\
-    	is_option_crtp<O>\
+    typename boost::enable_if<\
+        is_option_crtp<O>\
     >::type csv_put(\
-    	C& cont, O const& options,\
+        C& cont, O const& options,\
         BOOST_PP_ENUM_BINARY_PARAMS(N, T, BOOST_PP_EXPR_IF(is_const, const)& _)\
     )\
     {\
         csv(\
-        	make_csv_ready( put( cont ) % options ) \
-        	, BOOST_PP_ENUM_PARAMS(N, _)\
+            make_csv_ready( put( cont ) % options ) \
+            , BOOST_PP_ENUM_PARAMS(N, _)\
         );\
     }\
     template<typename C, BOOST_PP_ENUM_PARAMS(N, typename T)>\
     typename boost::disable_if<\
-    	is_option_crtp<T0>\
+        is_option_crtp<T0>\
     >::type csv_put(\
-    	C& cont,\
+        C& cont,\
         BOOST_PP_ENUM_BINARY_PARAMS(N, T, BOOST_PP_EXPR_IF(is_const, const)& _)\
     )\
     {\

Modified: sandbox/assign_v2/boost/assign/v2/put/delayed_csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/delayed_csv_put.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/delayed_csv_put.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -73,97 +73,97 @@
 
 namespace result_of{
 
-	template<arg_list_size_type N, typename U, typename Os = empty_list_option>
+    template<arg_list_size_type N, typename U, typename Os = empty_list_option>
     struct delayed_csv_put
     {
         typedef delayed_csv_put_holder<
-        	typename ref::wrapper_param<U>::type, N, Os
+            typename ref::wrapper_param<U>::type, N, Os
         > type;
     };
 
 }// result_of
 
-	// Explicit U
+    // Explicit U
 
-	template<typename U, typename...Args>
-	typename result_of::delayed_csv_put<U, size_of...(Args)>::type
-	delayed_csv_put(Args&&... args)
-	{
-		return typename result_of::delayed_csv_put<U, size_of...(Args)>::type(
-			ref::csv_array<U>( std::forward<Args>( args )... )
-		);
-	}
-
-	template<typename U, typename O, bool is, typename...Args>
-	typename result_of::delayed_csv_put<U, size_of...(Args), O>::type
-	delayed_csv_put(option_crtp<O, is> const& crtp, Args&&... args)
-	{
-    	typedef O const& options_;
+    template<typename U, typename...Args>
+    typename result_of::delayed_csv_put<U, size_of...(Args)>::type
+    delayed_csv_put(Args&&... args)
+    {
+        return typename result_of::delayed_csv_put<U, size_of...(Args)>::type(
+            ref::csv_array<U>( std::forward<Args>( args )... )
+        );
+    }
+
+    template<typename U, typename O, bool is, typename...Args>
+    typename result_of::delayed_csv_put<U, size_of...(Args), O>::type
+    delayed_csv_put(option_crtp<O, is> const& crtp, Args&&... args)
+    {
+        typedef O const& options_;
         options_ options = static_cast<options_>( crtp );
-		return typename result_of::delayed_csv_put<
-        	U, size_of...(Args), O
+        return typename result_of::delayed_csv_put<
+            U, size_of...(Args), O
         >::type(
-			options,
-			ref::csv_array<U>( std::forward<Args>( args )... )
-		);
-	}
-
-	// Implicit U
-
-	template<typename U, typename...Args>
-	typename result_of::delayed_csv_put<U, 1 + size_of...(Args)>::type
-	delayed_csv_put(U&& u, Args&&... args)
-	{
-    	return delayed_csv_put<U>( 
-        	std::forward<U>( u ), 
+            options,
+            ref::csv_array<U>( std::forward<Args>( args )... )
+        );
+    }
+
+    // Implicit U
+
+    template<typename U, typename...Args>
+    typename result_of::delayed_csv_put<U, 1 + size_of...(Args)>::type
+    delayed_csv_put(U&& u, Args&&... args)
+    {
+        return delayed_csv_put<U>( 
+            std::forward<U>( u ), 
             std::forward<Args>( args ) ... 
         );
     }
 
-	template<typename U, typename O, bool is, typename...Args>
-	typename result_of::delayed_csv_put<U, 1 + size_of...(Args), O>::type
-	delayed_csv_put(option_crtp<O, is> const& crtp, U&& u, Args&&... args)
-	{
-    	return delayed_csv_put<U>( 
-        	crtp,  
+    template<typename U, typename O, bool is, typename...Args>
+    typename result_of::delayed_csv_put<U, 1 + size_of...(Args), O>::type
+    delayed_csv_put(option_crtp<O, is> const& crtp, U&& u, Args&&... args)
+    {
+        return delayed_csv_put<U>( 
+            crtp,  
             std::forward<U>( u ), 
             std::forward<Args>( args ) ... 
         );
-	}
+    }
     
 #else
 
-	template<typename U>
-	typename result_of::delayed_csv_put<U, 0>::type
-	delayed_csv_put()
-	{
-		return typename result_of::delayed_csv_put<U, 0>::type(
-			ref::csv_array<U>();
-		);
-	}
+    template<typename U>
+    typename result_of::delayed_csv_put<U, 0>::type
+    delayed_csv_put()
+    {
+        return typename result_of::delayed_csv_put<U, 0>::type(
+            ref::csv_array<U>();
+        );
+    }
 
 #define BOOST_ASSIGN_V2_MACRO2(z, N, U)\
-	template<typename T, arg_list_size_type N>\
-	typename result_of::delayed_csv_put<U, N>::type\
-	delayed_csv_put( BOOST_PP_ENUM_PARAMS(N, U &_) )\
-	{\
-		return typename result_of::delayed_csv_put<U, N>::type(\
-			ref::csv_array<U>( BOOST_PP_ENUM_PARAMS(N, _) )\
-		);\
-	}\
-	template<typename T, typename O, bool is, arg_list_size_type N>\
-	typename result_of::delayed_csv_put<U, N>::type\
-	delayed_csv_put(\
-    	option_crtp<O, is> const& crtp,\
+    template<typename T, arg_list_size_type N>\
+    typename result_of::delayed_csv_put<U, N>::type\
+    delayed_csv_put( BOOST_PP_ENUM_PARAMS(N, U &_) )\
+    {\
+        return typename result_of::delayed_csv_put<U, N>::type(\
+            ref::csv_array<U>( BOOST_PP_ENUM_PARAMS(N, _) )\
+        );\
+    }\
+    template<typename T, typename O, bool is, arg_list_size_type N>\
+    typename result_of::delayed_csv_put<U, N>::type\
+    delayed_csv_put(\
+        option_crtp<O, is> const& crtp,\
         BOOST_PP_ENUM_PARAMS(N, U &_)\
     )\
-	{\
-    	typedef O const& options_;\
+    {\
+        typedef O const& options_;\
         options_ options = static_cast<options_>( crtp );\
-		return typename result_of::delayed_csv_put<U, N>::type(\
-			ref::csv_array<U>( BOOST_PP_ENUM_PARAMS(N, _) )\
-		);\
-	}\
+        return typename result_of::delayed_csv_put<U, N>::type(\
+            ref::csv_array<U>( BOOST_PP_ENUM_PARAMS(N, _) )\
+        );\
+    }\
 /**/
 
 BOOST_PP_REPEAT_FROM_TO(
@@ -189,7 +189,7 @@
     C& operator|(C& cont, delayed_csv_put_holder<N, U, Os> const& rhs)/*<-*/
     {
         v2::ref::as_arg_list( 
-        	make_csv_ready( put( cont ) % rhs.options() ), 
+            make_csv_ready( put( cont ) % rhs.options() ), 
             rhs.arg_list() 
         );
         return cont;

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/cpp03/csv_array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/cpp03/csv_array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/cpp03/csv_array.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -55,7 +55,7 @@
 #undef BOOST_ASSIGN_V2_MACRO3
 
 }// array_aux
-	using array_aux::csv_array;
+    using array_aux::csv_array;
 }// ref
 }// v2
 }// assign

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -57,9 +57,9 @@
 
     template<typename U, typename... Args>
     struct csv_array/*<-*/ 
-    	: nth_result_of::csv_array<
-        	1 + sizeof...(Args),  U
-    	>
+        : nth_result_of::csv_array<
+            1 + sizeof...(Args),  U
+        >
     {}/*->*/;
 
 }// result_of
@@ -117,13 +117,13 @@
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 /*->*/
 
-	using array_aux::csv_array;
+    using array_aux::csv_array;
 
 namespace result_of{
 
     template<typename U, typename... Args>
     struct csv_array/*<-*/ 
-    	: array_aux::csv_array<U, ...Args>
+        : array_aux::csv_array<U, ...Args>
     {}/*->*/;
 
 }// result_of

Modified: sandbox/assign_v2/boost/assign/v2/ref/aux_/list/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/aux_/list/container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/aux_/list/container.hpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -34,12 +34,12 @@
         typedef tail_holder<T> tail_holder_;
         typedef head_holder<H> head_holder_;
 
-		typedef boost::mpl::false_ false_;
-		typedef boost::mpl::true_ true_;
+        typedef boost::mpl::false_ false_;
+        typedef boost::mpl::true_ true_;
 
         public:
 
-		typedef boost::is_same<T, nil_> is_empty;
+        typedef boost::is_same<T, nil_> is_empty;
 
         container(){}
 
@@ -50,28 +50,28 @@
         };
 
         explicit container(typename ptr_wrapper<T>::type t, H h)
-        	: tail_holder_( t ), 
-            	head_holder_( h )
+            : tail_holder_( t ), 
+                head_holder_( h )
         {}
 
         template<typename H1>
         typename result<H1&>::type
         operator()(H1& h)const{ 
-    		return this->impl( h ); 
+            return this->impl( h ); 
         }
 
         template<typename H1>
         typename result<H1 const&>::type
         operator()(H1 const& h)const{ 
-        	return this->impl( h ); 
+            return this->impl( h ); 
         }
         
         protected:
 
-		typename ptr_wrapper<container>::type clone()const
+        typename ptr_wrapper<container>::type clone()const
         {
-        	return typename ptr_wrapper<container>::type( 
-            	new container( *this ) 
+            return typename ptr_wrapper<container>::type( 
+                new container( *this ) 
             ); 
         }
 

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-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -21,10 +21,10 @@
 namespace ref{
 namespace list_aux{
 
-	template<typename T>
+    template<typename T>
     struct ptr_wrapper
     {
-    	typedef boost::shared_ptr<T const> type;
+        typedef boost::shared_ptr<T const> type;
     };
 
     template<typename T>
@@ -32,10 +32,10 @@
     {
         typedef T tail_type;
         typedef ::boost::mpl::int_<
-        	T::static_size::value + 1
+            T::static_size::value + 1
         > static_size;
         typedef T const& result_of_tail_type;
-		typedef typename ptr_wrapper<T>::type ptr_wrapper_;
+        typedef typename ptr_wrapper<T>::type ptr_wrapper_;
 
         tail_holder(ptr_wrapper_ w) : tail_( w ){}
         result_of_tail_type tail()const{ return *this->tail_; }

Modified: sandbox/assign_v2/libs/assign/v2/test/chain.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/chain.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/chain.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -16,8 +16,8 @@
 #include <boost/range/end.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/algorithm/equal.hpp>
-#include <boost/assign/v2/ref/array/csv_array.hpp>
-#include <boost/assign/v2/deque/csv_deque.hpp>
+#include <boost/assign/v2/include/ref/csv_array.hpp>
+#include <boost/assign/v2/include/csv_deque.hpp>
 #include <boost/assign/v2/chain/check.hpp>
 #include <boost/assign/v2/chain.hpp>
 #include <boost/assign/v2/chain/logical_and.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/conversion.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/conversion.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/conversion.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -12,7 +12,8 @@
 #include <boost/array.hpp>
 #include <boost/assign/v2/detail/check/equal_container.hpp>
 #include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/conversion.hpp>
+#include <boost/assign/v2/include/convert.hpp>
+#include <boost/assign/v2/include/converter.hpp>
 #include <boost/assign/v2/conversion/check.hpp>
 #include <boost/assign/v2/ref/array.hpp>
 #include <boost/assign/v2/deque.hpp>
@@ -46,7 +47,7 @@
             ar_ const& ar = ( r | as2::convert<ar_>() );
             
             BOOST_ASSIGN_V2_CHECK( 
-            	range::equal( ar, as2::csv_deque( 1 , 10, 100 ) ) 
+                range::equal( ar, as2::csv_deque( 1 , 10, 100 ) ) 
             );
             //]
         }

Modified: sandbox/assign_v2/libs/assign/v2/test/deque.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/deque.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/deque.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -13,8 +13,8 @@
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/deque/csv_deque.hpp>
-#include <boost/assign/v2/deque/deque.hpp>
+#include <boost/assign/v2/include/csv_deque.hpp>
+#include <boost/assign/v2/include/deque.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <libs/assign/v2/test/deque.h>
 
@@ -56,12 +56,12 @@
             benchmark.push_back( T("LHR", "London") );
             benchmark.push_back( T("PEK", "Beijing") );
             BOOST_ASSIGN_V2_CHECK( 
-            	range::equal( benchmark, airports1 )
+                range::equal( benchmark, airports1 )
             ); 
             
             C airports2 = as2::deque<T>("AUH", "Abu Dhabi")("JFK", "New York")("LHR", "London")("PEK", "Beijing");
             BOOST_ASSIGN_V2_CHECK( 
-            	range::equal( benchmark, airports2 )
+                range::equal( benchmark, airports2 )
             ); 
             //]
         }

Modified: sandbox/assign_v2/libs/assign/v2/test/option/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/data.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/data.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -16,8 +16,8 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/deque.hpp>
 #include <boost/assign/v2/option/data_generator.hpp>
-#include <boost/assign/v2/put/csv_put.hpp>
-#include <boost/assign/v2/put/put.hpp>
+#include <boost/assign/v2/include/csv_put.hpp>
+#include <boost/assign/v2/include/put.hpp>
 #include <boost/function.hpp>
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/lambda.hpp>
@@ -41,9 +41,9 @@
             /*<-*/typedef double(*fp)(double);/*->*/
             typedef function<double(double)> f_;
             as2::csv_put( 
-            	exponent
+                exponent
                 , as2::_data = f_( /*<-*/fp(/*->*/ log10 /*<-*/)/*->*/ ) 
-            	, 1.0, 10.0, 100.0, 1000.0, 10000.0 
+                , 1.0, 10.0, 100.0, 1000.0, 10000.0 
             );
 
             double eps = numeric::bounds<double>::smallest();
@@ -54,7 +54,7 @@
         {
             //[test_option_data_recursive
             int i = 1, k = 1;
-			
+            
             BOOST_AUTO(
                 factorials, (
                     as2::deque<int>( as2::_nil ) % (
@@ -64,8 +64,8 @@
             );
 
             BOOST_ASSIGN_V2_CHECK( 
-            	range::equal( 
-                	factorials, 
+                range::equal( 
+                    factorials, 
                     as2::csv_deque( 1, 2, 6, 24, 120 ) 
                 ) 
             );

Modified: sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -12,7 +12,7 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/deque.hpp>
 #include <boost/assign/v2/option/modifier/iterate.hpp> 
-#include <boost/assign/v2/put/csv_put.hpp>
+#include <boost/assign/v2/include/csv_put.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/apply.hpp>
@@ -50,9 +50,9 @@
 
             int index = 3; 
             as2::csv_put( 
-            	alternating
+                alternating
                 , as2::_iterate = lambda::var( index )++
-            	, +2, -3, +3, -4, +4, -5, +5 
+                , +2, -3, +3, -4, +4, -5, +5 
             );
 
             BOOST_ASSIGN_V2_CHECK(     

Modified: sandbox/assign_v2/libs/assign/v2/test/option/list.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/list.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/list.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -9,11 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #include <deque>
 #include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/deque/csv_deque.hpp>
+#include <boost/assign/v2/include/csv_deque.hpp>
 #include <boost/assign/v2/option/list.hpp>
 #include <boost/assign/v2/option/data_generator.hpp>
 #include <boost/assign/v2/option/modifier/std.hpp>
-#include <boost/assign/v2/put/put.hpp>
+#include <boost/assign/v2/include/put.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <boost/typeof/typeof.hpp>
@@ -25,28 +25,28 @@
 
     void test()
     {
-    	using namespace boost;
+        using namespace boost;
         namespace as2 = assign::v2;
         
         {
-        	//[test_option_list
-        	std::deque<int> cont;
-			( as2::put( cont ) % as2::_list_option )( 4 )( 5 );
+            //[test_option_list
+            std::deque<int> cont;
+            ( as2::put( cont ) % as2::_list_option )( 4 )( 5 );
             
             BOOST_ASSIGN_V2_CHECK( cont[0] == 4 );
-        	BOOST_ASSIGN_V2_CHECK( cont[1] == 5 );
+            BOOST_ASSIGN_V2_CHECK( cont[1] == 5 );
 
-        	BOOST_AUTO( 
-            	options, 
-            	as2::_push_front % ( as2::_data = ( lambda::_1 % 10 ) ) 
-        	);
-        	( as2::put( cont ) % options )( 13 )( 12 )( 11 );
+            BOOST_AUTO( 
+                options, 
+                as2::_push_front % ( as2::_data = ( lambda::_1 % 10 ) ) 
+            );
+            ( as2::put( cont ) % options )( 13 )( 12 )( 11 );
 
-        	BOOST_ASSIGN_V2_CHECK( 
-            	range::equal( cont, as2::csv_deque( 1, 2, 3, 4, 5 ) ) 
+            BOOST_ASSIGN_V2_CHECK( 
+                range::equal( cont, as2::csv_deque( 1, 2, 3, 4, 5 ) ) 
             );
             //]
-    	}
+        }
 
     }
     

Modified: sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -12,7 +12,7 @@
 #include <cmath>
 #include <list>
 #include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/put.hpp>
+#include <boost/assign/v2/include/put.hpp>
 #include <boost/assign/v2/deque.hpp>
 #include <boost/assign/v2/option/data_generator.hpp>
 #include <boost/assign/v2/option/modifier/mapped.hpp>
@@ -39,10 +39,10 @@
             typedef std::map<month_, days_> C; C year;
             (
                 as2::put( year )
-                	( "feb", 28 )( "apr", 30 )( "jun", 30 )( "sep", 30 )( "nov", 30 )
+                    ( "feb", 28 )( "apr", 30 )( "jun", 30 )( "sep", 30 )( "nov", 30 )
                     % ( as2::_data = as2::_key ) % ( as2::_mapped = ( lambda::_1 = 31 ) )
             )/*<<Calls `year[ month_( "jan" ) ] = 31`>>*/( "jan" )( "mar" )( "may" )( "jul" )( "aug" )( "oct" )( "dec" );
-			
+            
             BOOST_ASSIGN_V2_CHECK( year["jan"] == 31 );
             BOOST_ASSIGN_V2_CHECK( year["dec"] == 31 );
             //]
@@ -65,13 +65,13 @@
                 alternating,
                 (
                     as2::deque<int>( 
-                    	as2::as_arg_list( std::list<int>( 10, 1 ) ) 
+                        as2::as_arg_list( std::list<int>( 10, 1 ) ) 
                     ) % ( as2::_mapped = ( lambda::_1 *= -1 ) )
                 )( 1 )( 3 )( 5 )( 7 )( 9 )
             );
             BOOST_ASSIGN_V2_CHECK( 
-            	range::equal(
-                	alternating,
+                range::equal(
+                    alternating,
                     as2::csv_deque( +1, -1, +1, -1, +1, -1, +1, -1, +1, -1 )
                 )
             );

Modified: sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -10,8 +10,7 @@
 #include <vector>
 #include <boost/typeof/typeof.hpp>
 #include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/csv_put.hpp>
-// Options come next
+#include <boost/assign/v2/include/csv_put.hpp>
 #include <boost/assign/v2/option/modifier/std.hpp>
 #include <boost/assign/v2/option/modifier/repeat.hpp>
 #include <boost/assign/v2/deque.hpp>
@@ -33,7 +32,7 @@
 
             BOOST_ASSIGN_V2_CHECK( 
                 range::equal( 
-                	cont, 
+                    cont, 
                     as2::csv_deque( 1, 1, 10, 10, 100, 100 ) 
                 ) 
             );

Modified: sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -13,9 +13,8 @@
 #include <set>
 #include <string>
 #include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/csv_put.hpp>
+#include <boost/assign/v2/include/csv_put.hpp>
 #include <boost/assign/v2/deque.hpp>
-// Options come next
 #include <boost/assign/v2/option/modifier/std.hpp>
 #include <boost/circular_buffer.hpp>
 #include <boost/range/begin.hpp>
@@ -46,7 +45,7 @@
             typedef as2::result_of::put<std::vector<int> >::type put_;
             typedef as2::modifier_tag::push_front tag_;
             typedef as2::result_of::option_std_modifier<
-            	put_, tag_
+                put_, tag_
             >::type result1_;
             typedef as2:: interpreter_aux::replace_modifier_tag<put_> meta2_;
             typedef ::boost::mpl::apply1<meta2_, tag_>::type result2_;
@@ -97,7 +96,7 @@
             as2::csv_put( list, as2::_push_back, 1, 10, 100 );
 
             BOOST_ASSIGN_V2_CHECK( 
-            	range::equal( list, as2::csv_deque( 1, 10, 100 ) ) 
+                range::equal( list, as2::csv_deque( 1, 10, 100 ) ) 
             );
             //]
         }
@@ -121,7 +120,7 @@
             );
 
             BOOST_ASSIGN_V2_CHECK( 
-            	range::equal( two_power_n, as2::csv_deque( 1, 2, 4, 8, 16 ) ) 
+                range::equal( two_power_n, as2::csv_deque( 1, 2, 4, 8, 16 ) ) 
             );
             //]
         }

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -12,7 +12,7 @@
 #include <string>
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/detail/traits/container.hpp>
-#include <boost/assign/v2/deque/csv_deque.hpp>
+#include <boost/assign/v2/include/csv_deque.hpp>
 #include <boost/assign/v2/pipe/csv_put.hpp> 
 #include <boost/ptr_container/ptr_map.hpp>
 #include <boost/range/algorithm/equal.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -11,9 +11,8 @@
 #include <list>
 #include <vector>
 #include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/deque/csv_deque.hpp>
+#include <boost/assign/v2/include/csv_deque.hpp>
 #include <boost/assign/v2/pipe/csv_put.hpp>
-// Options come next
 #include <boost/assign/v2/option/data_generator.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/range/algorithm/equal.hpp>
@@ -36,7 +35,7 @@
                 range::equal(
                     factorials | ( 
                         as2::_csv_put 
-                        	% ( as2::_data = ( lambda::var(k) *= lambda::_1 ) ) 
+                            % ( as2::_data = ( lambda::var(k) *= lambda::_1 ) ) 
                     )/*<<Equivalent to calling `factorials.push_back( k *= ++i )`>>*/( 1, 2, 3, 4, 5 ),
                     as2::csv_deque<int>( 1, 2, 6, 24, 120 )
                 )

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -10,8 +10,7 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 
 #include <boost/assign/v2/pipe/csv_put.hpp>
-#include <boost/assign/v2/deque/csv_deque.hpp>
-// Options come next
+#include <boost/assign/v2/include/csv_deque.hpp>
 #include <boost/assign/v2/option/modifier/iterate.hpp>
 #include <boost/array.hpp>
 #include <boost/lambda/lambda.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -11,7 +11,6 @@
 #include <string>
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/pipe/csv_put.hpp>
-// Options come next
 #include <boost/assign/v2/option/data_generator.hpp>
 #include <boost/assign/v2/option/modifier/mapped.hpp>
 #include <boost/lambda/lambda.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -11,7 +11,6 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/pipe/csv_put.hpp>
 #include <boost/assign/v2/deque.hpp>
-// Options come next
 #include <boost/assign/v2/option/modifier/repeat.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <libs/assign/v2/test/pipe/option/repeat.h>

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -18,7 +18,6 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/pipe/csv_put.hpp>
 #include <boost/assign/v2/deque.hpp>
-// Options come next
 #include <boost/assign/v2/option/modifier/std.hpp>
 #include <libs/assign/v2/test/pipe/option/std_modifier.h>
 

Modified: sandbox/assign_v2/libs/assign/v2/test/put/ptr.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/ptr.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/ptr.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -11,8 +11,8 @@
 #include <utility>
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/detail/pp/ignore.hpp>
-#include <boost/assign/v2/put/csv_put.hpp>
-#include <boost/assign/v2/put/put.hpp>
+#include <boost/assign/v2/include/csv_put.hpp>
+#include <boost/assign/v2/include/put.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/ptr_container/ptr_array.hpp>
 #include <boost/ptr_container/ptr_deque.hpp>
@@ -32,8 +32,8 @@
 
         namespace as2 = boost::assign::v2;
 
-		// ARRAY
-        {	
+        // ARRAY
+        {    
             //[test_put_ptr_array
             typedef int T;
             T x = 1, y = 2, z = 3; boost::ptr_array<T, 3> cont;
@@ -43,7 +43,7 @@
             BOOST_ASSIGN_V2_CHECK( cont.back() == z );
             //]
         }
-		// SEQUENCE
+        // SEQUENCE
         {
             //[test_put_ptr_deque
             typedef int T; T x = 1, y = 2, z = 0; boost::ptr_deque<T> cont;
@@ -92,7 +92,7 @@
         }
         // SET
         {
-        	// Shows that x, y, z can be variadic
+            // Shows that x, y, z can be variadic
             //[test_put_ptr_set
             typedef std::string T; boost::ptr_set<T> assoc;
             T x = "isomer", y = "ephemeral", z = "prosaic";

Modified: sandbox/assign_v2/libs/assign/v2/test/put/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/put.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/put.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -24,9 +24,9 @@
 
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/detail/traits.hpp>
-#include <boost/assign/v2/deque/csv_deque.hpp>
-#include <boost/assign/v2/put/put.hpp>
-#include <boost/assign/v2/put/csv_put.hpp>
+#include <boost/assign/v2/include/csv_deque.hpp>
+#include <boost/assign/v2/include/put.hpp>
+#include <boost/assign/v2/include/csv_put.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/range/algorithm_ext/iota.hpp>
 #include <boost/range/begin.hpp>
@@ -48,13 +48,13 @@
         using namespace boost;
         namespace as2 = assign::v2;
 
-		// STL
+        // STL
         {
             //[test_csv_put_stl
-            std::queue<int> adapter; 	as2::csv_put( adapter, 1, 10, 100 );
-            array<int, 3> array; 		as2::csv_put( array,   1, 10, 100 );
-            std::set<int> assoc; 		as2::csv_put( assoc,   1, 10, 100 );
-            std::list<int> seq; 		as2::csv_put( seq,     1, 10, 100 );
+            std::queue<int> adapter;     as2::csv_put( adapter, 1, 10, 100 );
+            array<int, 3> array;         as2::csv_put( array,   1, 10, 100 );
+            std::set<int> assoc;         as2::csv_put( assoc,   1, 10, 100 );
+            std::list<int> seq;         as2::csv_put( seq,     1, 10, 100 );
             //]
             BOOST_ASSIGN_V2_CHECK(  adapter.front()    == 1 );
             BOOST_ASSIGN_V2_CHECK(  adapter.back()     == 100 );
@@ -65,7 +65,7 @@
             BOOST_ASSIGN_V2_CHECK(  seq.front()        == 1 );
             BOOST_ASSIGN_V2_CHECK(  seq.back()         == 100 );
         }
-		// ARRAY
+        // ARRAY
         {
              //[test_csv_put_keypad
             std::vector<int> numeric( 10 ); iota( numeric, 0 ); typedef std::string str_;
@@ -106,7 +106,7 @@
             BOOST_ASSIGN_V2_CHECK(  fabs( ragged[2].front() + 99.99     ) < eps );
             BOOST_ASSIGN_V2_CHECK(  fabs( ragged[2].back()  + 99.99     ) < eps );
         }
-		// SEQUENCE
+        // SEQUENCE
         {
             //[test_csv_put_bitset
             typedef std::string str_; typedef std::bitset<3> number; 
@@ -154,7 +154,7 @@
             BOOST_ASSIGN_V2_CHECK( set.count( "baz" ) == 1 );
             //]
         }
-		// MAP
+        // MAP
         {    
             //[test_put_unordered_map
             typedef std::string word_; 
@@ -186,13 +186,13 @@
             as2::csv_put( cb, 1, 2, 3 );
              
             BOOST_ASSIGN_V2_CHECK(
-            	range::equal(cb, as2::csv_deque(1, 2, 3) )
+                range::equal(cb, as2::csv_deque(1, 2, 3) )
             );
 
             as2::csv_put( cb, 4, 5 );
 
             BOOST_ASSIGN_V2_CHECK(
-            	range::equal(cb, as2::csv_deque(3, 4, 5) )
+                range::equal(cb, as2::csv_deque(3, 4, 5) )
             );
             //]
         }

Modified: sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 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/array.hpp>
+#include <boost/assign/v2/include/ref/array.hpp>
 #include <libs/assign/v2/test/ref/array.h>
 
 namespace test_assign_v2{
@@ -29,7 +29,7 @@
         using namespace boost;
         namespace as2 = assign::v2;
         {
-        	
+            
             //[test_ref_array_temporaries
             boost::array<int, 3> ar; 
             ar[0] = 1; ar[1] = 10; ar[2] = 100;

Modified: sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 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_array.hpp>
+#include <boost/assign/v2/include/ref/csv_array.hpp>
 #include <boost/assign/v2/ref/wrapper.hpp>
 #include <libs/assign/v2/test/ref/csv_array.h>
 

Modified: sandbox/assign_v2/libs/assign/v2/test/ref/get.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/get.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/get.cpp	2011-04-06 14:38:30 EDT (Wed, 06 Apr 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #include <boost/array.hpp>
 #include <boost/range/begin.hpp>
-#include <boost/assign/v2/ref/array/get.hpp>
+#include <boost/assign/v2/include/ref/get.hpp>
 #include <boost/assign/v2/ref/wrapper/copy.hpp>
-#include <boost/assign/v2/deque/csv_deque.hpp>
+#include <boost/assign/v2/include/csv_deque.hpp>
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <libs/assign/v2/test/ref/wrapper.h>