[Boost-commit] svn:boost r69555 - in sandbox/assign_v2: boost/assign/v2/detail/functor boost/assign/v2/put boost/assign/v2/put/container/functor boost/assign/v2/put/deduce boost/assign/v2/put/deque boost/assign/v2/put/ext boost/assign/v2/put/frame boost/assign/v2/put/modulo boost/assign/v2/put/pipe boost/assign/v2/put/pipe/functor boost/assign/v2/put/pipe/modulo boost/assign/v2/put/std boost/assign/v2/ref/wrapper boost/assign/v2/utility/chain boost/assign/v2/utility/convert boost/assign/v2/utility/csv libs/assign/v2/src libs/assign/v2/test libs/assign/v2/test/detail libs/assign/v2/test/put libs/assign/v2/test/put/container libs/assign/v2/test/put/deque libs/assign/v2/test/put/pipe libs/assign/v2/test/put/pipe/functor libs/assign/v2/test/ref libs/assign/v2/test/unit_testing libs/assign/v2/test/utility

Subject: [Boost-commit] svn:boost r69555 - in sandbox/assign_v2: boost/assign/v2/detail/functor boost/assign/v2/put boost/assign/v2/put/container/functor boost/assign/v2/put/deduce boost/assign/v2/put/deque boost/assign/v2/put/ext boost/assign/v2/put/frame boost/assign/v2/put/modulo boost/assign/v2/put/pipe boost/assign/v2/put/pipe/functor boost/assign/v2/put/pipe/modulo boost/assign/v2/put/std boost/assign/v2/ref/wrapper boost/assign/v2/utility/chain boost/assign/v2/utility/convert boost/assign/v2/utility/csv libs/assign/v2/src libs/assign/v2/test libs/assign/v2/test/detail libs/assign/v2/test/put libs/assign/v2/test/put/container libs/assign/v2/test/put/deque libs/assign/v2/test/put/pipe libs/assign/v2/test/put/pipe/functor libs/assign/v2/test/ref libs/assign/v2/test/unit_testing libs/assign/v2/test/utility
From: erwann.rogard_at_[hidden]
Date: 2011-03-04 15:52:30

Author: e_r
Date: 2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
New Revision: 69555
URL: http://svn.boost.org/trac/boost/changeset/69555

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/detail/functor/new.hpp               |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/container/functor/make.hpp       |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/deduce.hpp                       |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/deduce/fun.hpp                   |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/deduce/modulo.hpp                |    50 -------------------                     
   sandbox/assign_v2/boost/assign/v2/put/deque.hpp                        |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/deque/cont.hpp                   |    21 -------                                 
   sandbox/assign_v2/boost/assign/v2/put/ext/iterate.hpp                  |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/ext/lookup.hpp                   |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/ext/repeat.hpp                   |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/ext/xxx.hpp                      |    61 -----------------------                 
   sandbox/assign_v2/boost/assign/v2/put/frame.hpp                        |     1                                         
   sandbox/assign_v2/boost/assign/v2/put/frame/base.hpp                   |    28 ----------                              
   sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp                   |    17 +++---                                  
   sandbox/assign_v2/boost/assign/v2/put/modulo.hpp                       |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/modulo/ext.hpp                   |   102 --------------------------------------- 
   sandbox/assign_v2/boost/assign/v2/put/modulo/fun.hpp                   |    28 ++++++----                              
   sandbox/assign_v2/boost/assign/v2/put/modulo/fun_modifier.hpp          |     1                                         
   sandbox/assign_v2/boost/assign/v2/put/modulo/modifier.hpp              |    42 +---------------                        
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv.hpp                     |    11 ++-                                     
   sandbox/assign_v2/boost/assign/v2/put/pipe/functor.hpp                 |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp             |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/traits.hpp           |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/std/insert.hpp                   |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/std/push.hpp                     |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/std/push_back.hpp                |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/std/push_front.hpp               |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/std/xxx.hpp                      |    89 ----------------------------------      
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/range_get.hpp            |     1                                         
   sandbox/assign_v2/boost/assign/v2/utility/chain/use_const.hpp          |     2                                         
   sandbox/assign_v2/boost/assign/v2/utility/convert/check.hpp            |     4 -                                       
   sandbox/assign_v2/boost/assign/v2/utility/convert/converter.hpp        |     6 +-                                      
   sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp         |     2                                         
   sandbox/assign_v2/boost/assign/v2/utility/csv/make.hpp                 |    44 ++++++++--------                        
   sandbox/assign_v2/boost/assign/v2/utility/csv/result.hpp               |     2                                         
   sandbox/assign_v2/libs/assign/v2/src/main.cpp                          |     8 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp               |    18 ++++--                                  
   sandbox/assign_v2/libs/assign/v2/test/other.cpp                        |    58 +++++++++++-----------                  
   sandbox/assign_v2/libs/assign/v2/test/put.cpp                          |    16 ++---                                   
   sandbox/assign_v2/libs/assign/v2/test/put/container/functor.cpp        |    40 +++++++++------                         
   sandbox/assign_v2/libs/assign/v2/test/put/deque.cpp                    |     8 ---                                     
   sandbox/assign_v2/libs/assign/v2/test/put/deque/ext.cpp                |    47 ------------------                      
   sandbox/assign_v2/libs/assign/v2/test/put/deque/ext.h                  |    26 ---------                               
   sandbox/assign_v2/libs/assign/v2/test/put/deque/functor.cpp            |     9 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/put/deque/modulo.cpp             |    49 ------------------                      
   sandbox/assign_v2/libs/assign/v2/test/put/deque/modulo.h               |    26 ---------                               
   sandbox/assign_v2/libs/assign/v2/test/put/deque/std.cpp                |    43 ----------------                        
   sandbox/assign_v2/libs/assign/v2/test/put/deque/std.h                  |    26 ---------                               
   sandbox/assign_v2/libs/assign/v2/test/put/ext.cpp                      |    65 -------------------------               
   sandbox/assign_v2/libs/assign/v2/test/put/ext.h                        |    24 ---------                               
   sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp                   |    39 ++------------                          
   sandbox/assign_v2/libs/assign/v2/test/put/pipe.cpp                     |     6 +                                       
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor.cpp             |     6 --                                      
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/container.cpp   |    52 ++++++++++----------                    
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/container.h     |    25 ---------                               
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/forward.h       |     4                                         
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/fun.cpp         |    58 ----------------------                  
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/fun.h           |    28 ----------                              
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/rhs.cpp         |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/std.cpp         |    55 ---------------------                   
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/std.h           |    28 ----------                              
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/str_literal.cpp |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/str_literal.h   |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/modulo.cpp              |     8 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/modulo.h                |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/range.cpp               |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/put/ptr.cpp                      |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/put/std.cpp                      |    40 ---------------                         
   sandbox/assign_v2/libs/assign/v2/test/put/std.h                        |    24 ---------                               
   sandbox/assign_v2/libs/assign/v2/test/ref.cpp                          |     1                                         
   sandbox/assign_v2/libs/assign/v2/test/ref/list_tuple.cpp               |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp             |    42 ++++++---------                         
   sandbox/assign_v2/libs/assign/v2/test/utility/convert.cpp              |    20 +++---                                  
   73 files changed, 268 insertions(+), 1209 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/detail/functor/new.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/functor/new.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/functor/new.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -83,7 +83,7 @@
     };
 
 /*
-	TODO remove
+    TODO remove
     template<typename V>
     struct deduce_new_
     {

Modified: sandbox/assign_v2/boost/assign/v2/put/container/functor/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/functor/make.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/functor/make.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -22,8 +22,8 @@
     template<typename C>
     struct put
     {
-		typedef typename put_aux::deduce_fun<C>::type f_;
-		typedef typename put_aux::deduce_modifier_tag<C>::type modifier_tag_;
+        typedef typename put_aux::deduce_fun<C>::type f_;
+        typedef typename put_aux::deduce_modifier_tag<C>::type modifier_tag_;
         typedef put_aux::adapter<C, f_, modifier_tag_> type;
     };
 

Modified: sandbox/assign_v2/boost/assign/v2/put/deduce.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deduce.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deduce.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -14,8 +14,6 @@
 #include <boost/assign/v2/put/deduce/fwd.hpp>
 #include <boost/assign/v2/put/deduce/fun.hpp>
 #include <boost/assign/v2/put/deduce/modifier_tag.hpp>
-#include <boost/assign/v2/put/deduce/modulo.hpp>
-//#include <boost/assign/v2/put/deduce/traits.hpp>
 
 
 #endif

Modified: sandbox/assign_v2/boost/assign/v2/put/deduce/fun.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deduce/fun.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deduce/fun.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -34,7 +34,7 @@
         typedef functor_aux::constructor<value_type> type;
     };
 
-	template<typename C>
+    template<typename C>
     struct deduce_fun :  boost::mpl::eval_if<
         container_traits::is_ptr_container<C>,
         deduce_fun_pointer<C>,

Modified: sandbox/assign_v2/boost/assign/v2/put/deduce/modulo.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deduce/modulo.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deduce/modulo.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,49 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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_PUT_DEDUCE_MODULO_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_DEDUCE_MODULO_ER_2010_HPP
-#include <boost/mpl/assert.hpp>
-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/identity.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-#include <boost/assign/v2/put/deduce/modifier_tag.hpp>
-
-namespace boost{
-    struct use_default;
-namespace assign{
-namespace v2{
-namespace put_aux{
-
-    struct kwd_deduce{};
-
-    template<typename T>
-    typename T::result_of_modulo::deduce::type
-    operator%(T const& t, kwd_deduce const& kwd)
-    {
-        return t.modulo_deduce();
-    }
-
-    template<typename Option1, typename Option2>
-    struct deduce : ::boost::mpl::eval_if<
-        boost::is_same<Option1, boost::use_default>,
-        boost::mpl::identity<Option2>,
-        boost::mpl::identity<Option1>
-    >{};
-
-}// put_aux
-namespace{
-    const put_aux::kwd_deduce _deduce = put_aux::kwd_deduce();
-}
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/boost/assign/v2/put/deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -11,7 +11,8 @@
 #define BOOST_ASSIGN_V2_PUT_DEQUE_ER_2010_HPP
 
 #include <boost/assign/v2/put/deque/cont.hpp>
+#include <boost/assign/v2/put/deque/csv.hpp> // TODO remove
 #include <boost/assign/v2/put/deque/functor.hpp>
-#include <boost/assign/v2/put/deque/csv.hpp>
+#include <boost/assign/v2/put/deque/modulo.hpp>
 
 #endif

Modified: sandbox/assign_v2/boost/assign/v2/put/deque/cont.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/cont.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/cont.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -16,32 +16,13 @@
 #include <boost/range/size.hpp>
 #include <boost/range/size_type.hpp>
 
-#include <boost/assign/v2/put/modulo/fun.hpp>
-#include <boost/assign/v2/put/modulo/modifier.hpp>
 #include <boost/assign/v2/put/frame/crtp.hpp>
-
 #include <boost/assign/v2/put/deque/fwd.hpp>
+#include <boost/assign/v2/put/deque/modulo.hpp>
 
 namespace boost{
 namespace assign{
 namespace v2{
-namespace result_of_modulo{
-
-    template<typename T,typename F,typename Tag>
-    struct fun<put_deque_aux::cont<T, F, Tag> >
-    {
-        template<typename F1>
-        struct apply{ typedef put_deque_aux::cont<T, F1, Tag> type; };
-    };
-
-    template<typename T,typename F,typename Tag>
-    struct modifier<put_deque_aux::cont<T, F, Tag> >
-    {
-        template<typename NewTag>
-        struct apply{ typedef put_deque_aux::cont<T, F, NewTag> type; };
-    };
-
-}//result_of_modulo
 namespace put_deque_aux{
 
     template<typename T>

Modified: sandbox/assign_v2/boost/assign/v2/put/ext/iterate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/ext/iterate.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/ext/iterate.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -12,7 +12,7 @@
 #include <cstddef>
 #include <boost/assign/v2/detail/functor/identity.hpp>
 
-#include <boost/assign/v2/put/ext/xxx.hpp>
+#include <boost/assign/v2/put/modulo/ext/xxx.hpp>
 
 namespace boost{
 namespace assign{
@@ -103,7 +103,7 @@
 
 }// put_aux
 
-BOOST_ASSIGN_V2_PUT_EXT_XXX(iterate)
+BOOST_ASSIGN_V2_PUT_MODULO_EXT_XXX(iterate)
 
 }// v2
 }// assign

Modified: sandbox/assign_v2/boost/assign/v2/put/ext/lookup.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/ext/lookup.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/ext/lookup.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -13,7 +13,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/assign/v2/detail/functor/identity.hpp>
 
-#include <boost/assign/v2/put/ext/xxx.hpp>
+#include <boost/assign/v2/put/modulo/ext/xxx.hpp>
 
 namespace boost{
 namespace assign{
@@ -85,7 +85,7 @@
 
 }// put_aux
 
-BOOST_ASSIGN_V2_PUT_EXT_XXX(lookup)
+BOOST_ASSIGN_V2_PUT_MODULO_EXT_XXX(lookup)
 
 }// v2
 }// assign

Modified: sandbox/assign_v2/boost/assign/v2/put/ext/repeat.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/ext/repeat.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/ext/repeat.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_EXT_REPEAT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_EXT_REPEAT_ER_2010_HPP
-#include <boost/assign/v2/put/ext/xxx.hpp>
+#include <boost/assign/v2/put/modulo/ext/xxx.hpp>
 
 namespace boost{
 namespace assign{
@@ -112,7 +112,7 @@
 
 }// put_aux
 
-BOOST_ASSIGN_V2_PUT_EXT_XXX(repeat)
+BOOST_ASSIGN_V2_PUT_MODULO_EXT_XXX(repeat)
 
 }// v2
 }// assign

Modified: sandbox/assign_v2/boost/assign/v2/put/ext/xxx.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/ext/xxx.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/ext/xxx.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,60 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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_PUT_EXT_XXX_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_EXT_XXX_ER_2010_HPP
-#include <boost/preprocessor/cat.hpp>
-#include <boost/mpl/apply.hpp>
-#include <boost/mpl/quote.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-
-// Needed by dependants
-#include <boost/assign/v2/detail/keyword/nil.hpp>
-#include <boost/assign/v2/put/modulo/modifier.hpp>
-#include <boost/assign/v2/put/frame/base.hpp>
-
-#include <boost/assign/v2/detail/pp/forward.hpp>
-#include <boost/assign/v2/put/frame/modifier.hpp>
-#include <boost/assign/v2/put/modulo/ext.hpp>
-
-#define BOOST_ASSIGN_V2_PUT_EXT_XXX(Param)\
-namespace result_of_modulo{\
-    template<typename T, typename Arg>\
-    struct Param\
-        : ::boost::mpl::apply1<\
-            result_of_modulo::ext<T>\
-            , put_parameter::Param<Arg>\
-        >\
-    {};\
-}\
-namespace put_aux{\
-\
-    template<typename T,typename Arg>\
-    typename boost::lazy_enable_if<\
-        boost::is_base_of<put_aux::put_base, T>,\
-        result_of_modulo::Param<T, Arg>\
-    >::type\
-    operator%(\
-        T const& t,\
-        put_aux::Param<Arg> const& p\
-    )\
-    {\
-        typedef result_of_modulo::Param<T, Arg> caller_;\
-        return caller_::call( t, p );\
-    }\
-\
-}\
-namespace{\
-    put_aux::BOOST_PP_CAT(Param,_keyword) const BOOST_PP_CAT(_,Param)\
-        = put_aux::BOOST_PP_CAT(Param,_keyword)();\
-}\
-/**/
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/boost/assign/v2/put/frame.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -10,7 +10,6 @@
 #ifndef BOOST_ASSIGN_V2_PUT_FRAME_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_FRAME_ER_2010_HPP
 
-#include <boost/assign/v2/put/frame/base.hpp>
 #include <boost/assign/v2/put/frame/crtp.hpp>
 #include <boost/assign/v2/put/frame/modifier.hpp>
 #include <boost/assign/v2/put/frame/sub.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/put/frame/base.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame/base.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame/base.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,27 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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_PUT_FRAME_BASE_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_FRAME_BASE_ER_2010_HPP
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace put_aux{
-
-    struct put_base{
-        // This base is used in some enable_if
-    };
-
-}// put_aux
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -14,7 +14,7 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/assign/v2/detail/pp/forward.hpp>
 #include <boost/assign/v2/detail/traits/container/is_ptr_container.hpp>
-#include <boost/assign/v2/put/frame/base.hpp>
+#include <boost/assign/v2/put/frame/fwd.hpp>
 #include <boost/assign/v2/put/frame/modifier.hpp>
 #include <boost/assign/v2/put/modulo/fun.hpp>
 #include <boost/assign/v2/put/deduce/fun.hpp>
@@ -67,8 +67,7 @@
     // and Tag. It then models concept_sub::Post
     template<typename C, typename F, typename Tag, typename D>
     class crtp :
-        public put_base
-        , public fun_holder<F>
+        public fun_holder<F>
         , public modifier_holder<Tag>
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 //do nothing
@@ -107,7 +106,7 @@
         template<typename...Args>
         result_type operator()( Args&&...args )const
         {
-            return  this->modify( 
+            return  this->modify(
                 /*<< Instance of F >>*/ this->fun( std::forward<Args>(args)... )
             );
         }
@@ -170,12 +169,12 @@
 
         protected:
 
-		template<typename T>
-        struct ptr_enabler : boost::enable_if< 
-        	container_traits::is_ptr_container<C> 
+        template<typename T>
+        struct ptr_enabler : boost::enable_if<
+            container_traits::is_ptr_container<C>
         >{};
-        
-		template<typename T>
+
+        template<typename T>
         result_type modify(T* t,typename ptr_enabler<T>::type* = 0)const
         {
             typedef put_concept::Modifier<Tag, C, T*> concept_;

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -10,9 +10,11 @@
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_ER_2010_HPP
 
+#include <boost/assign/v2/put/modulo/ext.hpp>
 #include <boost/assign/v2/put/modulo/fun.hpp>
 #include <boost/assign/v2/put/modulo/fun_modifier.hpp>
 #include <boost/assign/v2/put/modulo/generic.hpp>
 #include <boost/assign/v2/put/modulo/modifier.hpp>
+#include <boost/assign/v2/put/modulo/std.hpp>
 
 #endif

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/ext.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/ext.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/ext.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -9,106 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_EXT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_EXT_ER_2010_HPP
-#include <boost/concept_check.hpp>
-#include <boost/concept/assert.hpp>
-#include <boost/mpl/apply.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/eval_if.hpp>
-#include <boost/type_traits/is_same.hpp>
 
-#include <boost/assign/v2/put/frame/modifier.hpp>
-#include <boost/assign/v2/put/modulo/modifier.hpp>
-#include <boost/assign/v2/put/modulo/fun_modifier.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace put_parameter{
-
-    template<typename F, typename Tag>
-    struct traits{
-        typedef F fun_type;
-        typedef Tag modifier_tag;
-        typedef traits<F, Tag> type;
-    };
-
-}// put_parameter
-namespace put_concept{
-
-    // P models Parameter with respect to modifier M
-    template<typename P, typename M>
-    struct ExtParam
-    {
-        BOOST_CONCEPT_USAGE(ExtParam)
-        {
-            M m( p.arg() );
-        }
-
-        private:
-        static P & p;
-    };
-
-}// put_concept
-namespace result_of_modulo{
-
-    template<typename T>
-    struct ext{
-
-        template<typename FParameter>
-        struct apply{
-
-            typedef typename T::fun_type old_fun_;
-            typedef typename T::modifier_tag old_tag;
-            typedef typename ::boost::mpl::apply2<
-                FParameter, old_fun_, old_tag
-            >::type traits_;
-            typedef typename traits_::fun_type fun_;
-            typedef typename traits_::modifier_tag tag;
-
-            typedef result_of_modulo::modifier<T> meta1_;
-            typedef result_of_modulo::fun_modifier<T> meta2_;
-
-            typedef boost::is_same<fun_, old_fun_> is_same_fun_;
-            typedef typename ::boost::mpl::eval_if<
-                is_same_fun_,
-                ::boost::mpl::apply1< meta1_, tag >,
-                ::boost::mpl::apply2< meta2_, fun_, tag>
-            >::type type;
-
-            typedef put_aux::modifier<tag> m_;
-
-            template<typename C, typename F>
-            static type call(C& v, F const& f, m_ const& m)
-            {
-                return type( v, f, m );
-            }
-            static fun_ make_fun(const T& t, ::boost::mpl::false_)
-            {
-                return fun_();
-            }
-            static fun_ make_fun(const T& t, ::boost::mpl::true_)
-            {
-                return t.fun;
-            }
-            template<typename P>
-            static type call(const T& t, P const& p)
-            {
-                typedef put_concept::ExtParam<P, m_> concept_;
-                BOOST_CONCEPT_ASSERT(( concept_ ));
-                return call(
-                    t.container(),
-                    make_fun( t, is_same_fun_() ),
-                    m_( p.arg() )
-                );
-            }
-
-        };
-
-    };
-
-}// result_of_modulo
-}// v2
-}// assign
-}// boost
+#include <boost/assign/v2/put/modulo/ext/frame.hpp>
+#include <boost/assign/v2/put/modulo/ext/xxx.hpp>
 
 #endif

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/fun.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/fun.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/fun.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -10,6 +10,7 @@
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_FUN_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_FUN_ER_2010_HPP
 #include <boost/mpl/apply.hpp>
+#include <boost/assign/v2/put/frame/fwd.hpp>
 
 namespace boost{
 namespace assign{
@@ -21,37 +22,40 @@
     };
 
 }// result_of_modulo
-namespace put_modulo_aux{
+namespace put_aux{
 
     template<typename F>
-    struct fun
+    struct modulo_fun
     {
-        fun(const F& f) : value(f){}
+        modulo_fun(const F& f) : value(f){}
         F value;
     };
 
-    template<typename T, typename F1>
-    typename ::boost::mpl::apply1<result_of_modulo::fun<T>, F1>::type
-    operator%(T const& t, put_modulo_aux::fun<F1> const& h)
+    template<typename C, typename F, typename Tag, typename D, typename F1>
+    typename ::boost::mpl::apply1<result_of_modulo::fun<D>, F1>::type
+    operator%(
+        crtp<C, F, Tag, D> const& lhs,
+        modulo_fun<F1> const& rhs
+    )
     {
-        typedef result_of_modulo::fun<T> meta_;
+        typedef result_of_modulo::fun<D> meta_;
         typedef typename ::boost::mpl::apply1<meta_, F1>::type result_;
-        return result_( t.container(), h.value, t.modifier );
+        return result_( lhs.container(), rhs.value, lhs.modifier );
     }
 
     struct kwd_fun{
 
         template<typename F>
-        put_modulo_aux::fun<F> operator=(F const& f)const
+        modulo_fun<F> operator=(F const& f)const
         {
-            return put_modulo_aux::fun<F>( f );
+            return put_aux::modulo_fun<F>( f );
         }
 
     };
 
-}// put_modulo_aux
+}// put_aux
 namespace{
-    const put_modulo_aux::kwd_fun _fun = put_modulo_aux::kwd_fun();
+    const put_aux::kwd_fun _fun = put_aux::kwd_fun();
 }
 }// v2
 }// assign

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/fun_modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/fun_modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/fun_modifier.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -36,4 +36,3 @@
 }// boost
 
 #endif
-

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/modifier.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -9,55 +9,19 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_ER_2010_HPP
-#include <boost/mpl/apply.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/assign/v2/put/frame/modifier.hpp>
 
 namespace boost{
 namespace assign{
 namespace v2{
+//[result_of_modulo_modifier
 namespace result_of_modulo{
 
-    template<typename D> struct modifier /* Specialize on D(erived) */{
+    template<typename /*<<Inherits from put_aux::crtp\<\>>>*/D> struct /*<<Specialize on D>>*/modifier{
         template<typename Tag> struct apply{};
     };
 
 }// result_of_modulo
-namespace put_modulo_aux{
-
-    template<typename Tag> struct modifier
-    {
-        modifier(){}
-        modifier(Tag const& t) : modifier_tag( t ){}
-        Tag modifier_tag;
-    };
-
-    template<typename T, typename NewTag>
-    typename ::boost::mpl::apply1<result_of_modulo::modifier<T>, NewTag>::type
-    operator%(T const& t, put_modulo_aux::modifier<NewTag> const& h )
-    {
-        typedef result_of_modulo::modifier<T> meta_;
-
-        typedef typename ::boost::mpl::apply1<meta_, NewTag>::type result_;
-        typedef put_aux::modifier<NewTag> modifier_;
-        return result_( t.container(), t.fun, modifier_( h.modifier_tag ) );
-    }
-
-    struct kwd_modifier
-    {
-        template<typename Tag>
-        modifier<Tag> operator=( Tag const& t)const
-        {
-            return modifier<Tag>( t );
-        }
-    };
-
-}// put_modulo_aux
-namespace{
-    put_modulo_aux::kwd_modifier const _modifier
-        = put_modulo_aux::kwd_modifier();
-}
+//]
 }// v2
 }// assign
 }// boost

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -9,8 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_PIPE_CSV_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_PIPE_CSV_ER_2010_HPP
-#include <boost/assign/v2/put/pipe/csv/operator.hpp> 
-#include <boost/assign/v2/put/pipe/csv/generator.hpp> 
-#include <boost/assign/v2/put/pipe/csv/keyword.hpp> 
+#include <boost/assign/v2/put/pipe/csv/forward.hpp>
+#include <boost/assign/v2/put/pipe/csv/generator.hpp>
+#include <boost/assign/v2/put/pipe/csv/keyword.hpp>
+#include <boost/assign/v2/put/pipe/csv/operator.hpp>
+#include <boost/assign/v2/put/pipe/csv/rhs.hpp>
+#include <boost/assign/v2/put/pipe/csv/size_type.hpp>
 
-#endif
\ No newline at end of file
+#endif

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/functor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/functor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/functor.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -10,8 +10,9 @@
 #ifndef BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_ER_2010_HPP
 
-#include <boost/assign/v2/put/pipe/functor/rhs.hpp>
 #include <boost/assign/v2/put/pipe/functor/forward.hpp>
 #include <boost/assign/v2/put/pipe/functor/operator.hpp>
+#include <boost/assign/v2/put/pipe/functor/rhs.hpp>
+#include <boost/assign/v2/put/pipe/functor/size_type.hpp>
 
 #endif // BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -37,7 +37,7 @@
 namespace v2{
 namespace put_pipe_aux{
 
-	typedef ::boost::mpl::vector0<> empty_seq_args_;
+    typedef ::boost::mpl::vector0<> empty_seq_args_;
 
     template<
         typename Pars = empty_pars_,
@@ -269,7 +269,7 @@
 
     };
 
-	// For testing purposes
+    // For testing purposes
     template<int i, int j, typename T, typename P, typename U>
     void check_rhs(T const& rhs, P const& pred, U const& u)
     {

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/traits.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/traits.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/traits.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -24,7 +24,7 @@
 namespace v2{
 namespace put_pipe_aux{
 
-	typedef ::boost::mpl::vector0<> empty_pars_;
+    typedef ::boost::mpl::vector0<> empty_pars_;
 
     template<typename Pars>
     struct modulo_traits

Modified: sandbox/assign_v2/boost/assign/v2/put/std/insert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/std/insert.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/std/insert.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_STD_INSERT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_STD_INSERT_ER_2010_HPP
-#include <boost/assign/v2/put/std/xxx.hpp>
+#include <boost/assign/v2/put/modulo/std/xxx.hpp>
 
-BOOST_ASSIGN_V2_PUT_STD_XXX(insert)
+BOOST_ASSIGN_V2_PUT_MODULO_STD_XXX(insert)
 
 #endif

Modified: sandbox/assign_v2/boost/assign/v2/put/std/push.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/std/push.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/std/push.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_STD_PUSH_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_STD_PUSH_ER_2010_HPP
-#include <boost/assign/v2/put/std/xxx.hpp>
+#include <boost/assign/v2/put/modulo/std/xxx.hpp>
 
-BOOST_ASSIGN_V2_PUT_STD_XXX(push)
+BOOST_ASSIGN_V2_PUT_MODULO_STD_XXX(push)
 
 #endif

Modified: sandbox/assign_v2/boost/assign/v2/put/std/push_back.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/std/push_back.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/std/push_back.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_STD_PUSH_BACK_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_STD_PUSH_BACK_ER_2010_HPP
-#include <boost/assign/v2/put/std/xxx.hpp>
+#include <boost/assign/v2/put/modulo/std/xxx.hpp>
 
-BOOST_ASSIGN_V2_PUT_STD_XXX(push_back)
+BOOST_ASSIGN_V2_PUT_MODULO_STD_XXX(push_back)
 
 #endif

Modified: sandbox/assign_v2/boost/assign/v2/put/std/push_front.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/std/push_front.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/std/push_front.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_STD_PUSH_FRONT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_STD_PUSH_FRONT_ER_2010_HPP
-#include <boost/assign/v2/put/std/xxx.hpp>
+#include <boost/assign/v2/put/modulo/std/xxx.hpp>
 
-BOOST_ASSIGN_V2_PUT_STD_XXX(push_front)
+BOOST_ASSIGN_V2_PUT_MODULO_STD_XXX(push_front)
 
 #endif

Modified: sandbox/assign_v2/boost/assign/v2/put/std/xxx.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/std/xxx.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/std/xxx.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,88 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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)        //
-//////////////////////////////////////////////////////////////////////////////
-#include <iostream> // TODO remove
-
-#ifndef BOOST_ASSIGN_V2_PUT_STD_XXX
-#include <boost/preprocessor/cat.hpp>
-#include <boost/accumulators/framework/accumulator_base.hpp>
-#include <boost/assign/v2/put/frame/modifier.hpp>
-#include <boost/assign/v2/put/modulo/modifier.hpp>
-
-#define BOOST_ASSIGN_V2_PUT_STD_IMPL_PTR(FUN)\
-    template<typename C, typename T>\
-    void impl(C& cont, T* t)const{\
-        cont.FUN( t );\
-    }\
-/**/
-#define BOOST_ASSIGN_V2_PUT_STD_IMPL_LVALUE(FUN)\
-    template<typename C, typename T>\
-    void impl(C& cont, T& t)const{\
-        cont.FUN( t );\
-    }\
-/**/
-
-#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-#include <utility>
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_reference.hpp>
-// disable_if necessary to avoid ambiguity resolution with GCC4.4
-#define BOOST_ASSIGN_V2_PUT_STD_IMPL_RVALUE(FUN)\
-    template<typename C, typename T>\
-    typename boost::disable_if<\
-        boost::is_reference<T>,\
-        void\
-    >::type\
-    impl(C& cont, T&& t)const{\
-        cont.FUN( std::move( t ) );\
-    }\
-/**/
-#define BOOST_ASSIGN_V2_PUT_STD_IMPL(FUN)\
-        BOOST_ASSIGN_V2_PUT_STD_IMPL_LVALUE(FUN)\
-        BOOST_ASSIGN_V2_PUT_STD_IMPL_RVALUE(FUN)\
-/**/
-#else
-#define BOOST_ASSIGN_V2_PUT_STD_IMPL(FUN)\
-        BOOST_ASSIGN_V2_PUT_STD_IMPL_LVALUE(FUN)\
-/**/
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-
-#define BOOST_ASSIGN_V2_PUT_STD_XXX(FUN)\
-namespace boost{\
-namespace assign{\
-namespace v2{\
-namespace modifier_tag{ struct FUN{}; }\
-namespace put_aux{\
-\
-    template<>\
-    class modifier<v2::modifier_tag::FUN>\
-    {\
-        typedef boost::accumulators::dont_care dont_care_;\
-        public:\
-        modifier(){}\
-        modifier( dont_care_ ){}\
-        BOOST_ASSIGN_V2_PUT_STD_IMPL(FUN)\
-    };\
-\
-}\
-namespace{\
-\
-    put_modulo_aux::modifier<v2::modifier_tag::FUN> const\
-        BOOST_PP_CAT(_,FUN) = ( \
-            _modifier = v2::modifier_tag::FUN() \
-        );\
-\
-}\
-}\
-}\
-}\
-/**/
-
-#endif
+// TODO remove file

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-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -94,7 +94,6 @@
 }// range_aux
 namespace result_of{
 
-
     template<typename R>
     struct range_get : boost::lazy_enable_if<
         boost::is_reference_wrapper<

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/use_const.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/use_const.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/use_const.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -45,7 +45,7 @@
 
     template<typename R1, typename R2, typename Tag = use_default>
     struct use_const : ::boost::mpl::bool_<
-    	!dont_use_const<R1, R2, Tag>::value
+        !dont_use_const<R1, R2, Tag>::value
     >{};
 
 }// chain_aux

Modified: sandbox/assign_v2/boost/assign/v2/utility/convert/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/convert/check.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/convert/check.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -21,13 +21,11 @@
 #include <boost/array.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/assign/v2/utility/convert/converter.hpp>
-#include <boost/assign/v2/utility/convert/deduce.hpp>
+#include <boost/assign/v2/utility/convert/deduce_tag.hpp>
 #include <boost/assign/v2/utility/convert/predicate.hpp>
 #include <boost/assign/v2/detail/check/fwd_equal_container.hpp>
 
 // Don't include this file in v2/utility/convert.hpp
-// To use it, precede by
-// #include <boost/assign/v2/detail/checking/container.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/utility/convert/converter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/convert/converter.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/convert/converter.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -25,7 +25,7 @@
     class adapter
     {
 
-		typedef typename boost::add_const<R>::type const_;
+        typedef typename boost::add_const<R>::type const_;
 
          typedef typename ref::copy_wrapper<
             const_
@@ -55,10 +55,10 @@
 }// convert_aux
 namespace result_of{
 
-	template<typename R>
+    template<typename R>
     struct converter
     {
-    	typedef convert_aux::adapter<R> type;
+        typedef convert_aux::adapter<R> type;
     };
 
 }//result_of

Modified: sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -35,7 +35,7 @@
         return C( boost::begin( r ), boost::end( r ) );
     }
 
-	template<typename C, typename R>
+    template<typename C, typename R>
     C dispatch(R const& r)
     {
         typedef typename convert_aux::deduce_tag<C, R>::type tag_;

Modified: sandbox/assign_v2/boost/assign/v2/utility/csv/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/csv/make.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/csv/make.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -28,54 +28,54 @@
 
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 
-	// TODO
+    // TODO
 
-	template<typename F, typename T>
-    typename result_of::csv<F const&, 
-    	::boost::mpl::vector<T>
+    template<typename F, typename T>
+    typename result_of::csv<F const&,
+        ::boost::mpl::vector<T>
     >::type
     csv( F const& functor, T&& t )
     {
-    	return functor( t );
+        return functor( t );
     }
 
-	template<typename F, typename T, typename Args>
-    typename result_of::csv<F const&, 
+    template<typename F, typename T, typename... Args>
+    typename result_of::csv<F const&,
         typename ::boost::mpl::detail::variadic_vector<T, Args...>::type
     >::type
     csv( F const& functor, T&& t, Args&&... args )
     {
-    	return csv( functor( t ), std::forward<Args>( args )... );
-	}
+        return csv( functor( t ), std::forward<Args>( args )... );
+    }
 
 #else
 #define BOOST_ASSIGN_V2_MACRO1(z, i, data) BOOST_PP_CAT(T, i) data
 #define BOOST_ASSIGN_V2_MACRO2(z, i, data) ( BOOST_PP_CAT(_, i) )
 #define BOOST_ASSIGN_V2_MACRO3(z, N, data)\
 \
-	template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)>\
+    template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)>\
     typename result_of::csv<F const&, \
-    	::boost::mpl::vector<BOOST_PP_ENUM(N, BOOST_ASSIGN_V2_MACRO1, &)>\
+        ::boost::mpl::vector<BOOST_PP_ENUM(N, BOOST_ASSIGN_V2_MACRO1, &)>\
     >::type\
     csv( \
-    	F const& functor\
-    	BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, T, & _)\
+        F const& functor\
+        BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, T, & _)\
     )\
     {\
-    	return functor BOOST_PP_REPEAT(N, BOOST_ASSIGN_V2_MACRO2, ~ );\
-	}\
+        return functor BOOST_PP_REPEAT(N, BOOST_ASSIGN_V2_MACRO2, ~ );\
+    }\
 \
-	template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)>\
+    template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)>\
     typename result_of::csv<F const&,\
-    	::boost::mpl::vector<BOOST_PP_ENUM(N, BOOST_ASSIGN_V2_MACRO1, const &)>\
+        ::boost::mpl::vector<BOOST_PP_ENUM(N, BOOST_ASSIGN_V2_MACRO1, const &)>\
     >::type\
     csv( \
-    	F const& functor\
-    	BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, T, const & _)\
+        F const& functor\
+        BOOST_PP_ENUM_TRAILING_BINARY_PARAMS(N, T, const & _)\
     )\
     {\
-    	return functor BOOST_PP_REPEAT(N, BOOST_ASSIGN_V2_MACRO2, ~ );\
-	}\
+        return functor BOOST_PP_REPEAT(N, BOOST_ASSIGN_V2_MACRO2, ~ );\
+    }\
 \
 /**/
 BOOST_PP_REPEAT_FROM_TO(
@@ -87,7 +87,7 @@
 #undef BOOST_ASSIGN_V2_MACRO1
 #undef BOOST_ASSIGN_V2_MACRO2
 #undef BOOST_ASSIGN_V2_MACRO3
-#endif BOOST_ASSIGN_V2_ENABLE_CPP0X
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
 }// v2
 }// assign

Modified: sandbox/assign_v2/boost/assign/v2/utility/csv/result.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/csv/result.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/csv/result.hpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -47,7 +47,7 @@
 
     template<typename F, typename V>
     struct csv : ::boost::mpl::apply1<
-    	csv_aux::result<F>,
+        csv_aux::result<F>,
         V
     >{};
 

Modified: sandbox/assign_v2/libs/assign/v2/src/main.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/src/main.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/src/main.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -14,7 +14,7 @@
 
 int main (int argc, char * const argv[])
 {
-    
+
     // Do not put libs/assign/v2/test/unit_testing in this project
     {
         using namespace test_assign_v2;
@@ -24,7 +24,7 @@
         xxx_utility::test();
         xxx_other::test();
     }
-    
+
     /*
      {
      using namespace speed_assign_v2;
@@ -32,7 +32,7 @@
      xxx_put_ref::run(ofs);
      }
      */
-    
+
     return 0;
-    
+
 }

Modified: sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -46,21 +46,25 @@
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
         {
-            typedef int& x_ref_;
-            typedef int const& y_ref_;
-            typedef int z_;
+            // value-type   // var-type  // tuple_param
+            typedef int val_;
+            typedef int const cval_;
+
+            typedef val_& x_;
+            typedef cval_& y_;
+            typedef val_ z_;
 
 #define BOOST_ASSIGN_V2_MACRO(Z, n, data) data
 
             typedef boost::tuple<
                 BOOST_PP_EXPR_IF(
                     BOOST_ASSIGN_V2_n,
-                    x_ref_
+                    x_
                 )
                 BOOST_PP_ENUM_TRAILING(
                     BOOST_PP_IF(BOOST_PP_DEC(BOOST_ASSIGN_V2_n),1,0),
                     BOOST_ASSIGN_V2_MACRO,
-                    y_ref_
+                    y_
                 )
                 BOOST_PP_ENUM_TRAILING(
                     BOOST_PP_SUB(BOOST_ASSIGN_V2_n,2),
@@ -73,8 +77,8 @@
             typedef functor_aux::constructor<t_> f_;
             f_ f;
 
-            int x = -1;
-            int const y = 0;
+            val_ x = -1;
+            cval_ y = 0;
 
 #define BOOST_ASSIGN_V2_MACRO(z, n, data) data
 

Modified: sandbox/assign_v2/libs/assign/v2/test/other.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/other.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/other.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -48,71 +48,71 @@
     void test(){
 
         namespace as2 = boost::assign::v2;
-		namespace lambda = boost::lambda;
+        namespace lambda = boost::lambda;
 
 
-		// INTRODUCTION
+        // INTRODUCTION
         {
-        	// suggested by JB:
-            
+            // suggested by JB:
+
             //[other_put_pipe_csv
             std::deque<int> cont;
             boost::range::stable_partition(
                 /*<< Calls `cont.push_back( t )` for [^t=0,...,5], and returns `cont` >>*/
-                cont | as2::_csv_put( 0, 1, 2, 3, 4, 5 ), 
+                cont | as2::_csv_put( 0, 1, 2, 3, 4, 5 ),
                 lambda::_1 % 2
             );
             //]
             //[other_ref_csv_array
             BOOST_ASSIGN_V2_CHECK(boost::range::equal(
-                cont, 
+                cont,
                 /*<< The input [^1, 3, ..., 4] is held by reference (not copies) >>*/
                 as2::ref::csv_array(1, 3, 5, 0, 2, 4)
             ));
             //]
         }
-		// REF + CONVERTER
+        // REF + CONVERTER
         {
             //[other_convert_ref_array
-            typedef std::pair<std::string, int> T;
+            typedef std::pair<std::string, double> T;
             typedef std::vector<T> C;
-            C cont = converter( // name lookup
-                as2::ref::array( T("jan", 31) )( T("feb", 28) )( T("mar", 31) )
+            C cont = /*<< Name lookup >>*/ converter(
+                as2::ref::array( T("pi", 3.14) )( T("e", 2.71) )( T("log2", 0.69) )
             );
-            
-            BOOST_ASSIGN_V2_CHECK( cont[1].first == "feb" );
-            BOOST_ASSIGN_V2_CHECK( cont[1].second == 28 );
-            //]
-            BOOST_ASSIGN_V2_CHECK( cont[0].first == "jan" );
-            BOOST_ASSIGN_V2_CHECK( cont[0].second == 31 );
-            BOOST_ASSIGN_V2_CHECK( cont[2].first == "mar" );
-            BOOST_ASSIGN_V2_CHECK( cont[2].second == 31 );
+
+            BOOST_ASSIGN_V2_CHECK( cont[1].first == "e" );
+            BOOST_ASSIGN_V2_CHECK( cont[1].second == 2.71 );
+            //]
+            BOOST_ASSIGN_V2_CHECK( cont[0].first == "pi" );
+            BOOST_ASSIGN_V2_CHECK( cont[0].second == 3.14 );
+            BOOST_ASSIGN_V2_CHECK( cont[2].first == "log2" );
+            BOOST_ASSIGN_V2_CHECK( cont[2].second == 0.69 );
         }
-		// CHAIN + REF
+        // CHAIN + REF
         {
             //[other_chain_write
             /*<< Needed to bring && into scope >>*/ using namespace boost::assign::v2;
             std::vector<int> r( 3 ); r[0] = 1; r[1] = 2; r[2] = 0;
-            /*<< lvalue >>*/boost::array<int, 2> cont; /*<< lvalue >>*/ int z; 
+            /*<< lvalue >>*/boost::array<int, 2> cont; /*<< lvalue >>*/ int z;
             boost::copy(
                 r,
                 boost::begin(
                     cont && (/*<< rvalue >>*/ as2::ref::csv_array( z ) | as2::ref::_get )
                 )
             );
-            
+
             BOOST_ASSIGN_V2_CHECK( cont[0] == r[0] );
             BOOST_ASSIGN_V2_CHECK( cont[1] == r[1] );
             BOOST_ASSIGN_V2_CHECK( z == r[2] );
             //]
         }
-		// PUT + CSV
+        // PUT + CSV
         // container.hpp
         {
             //[other_csv_put
-            typedef int T; T x = 1, y = 2, z = 0; std::list<T> cont; 
+            typedef int T; T x = 1, y = 2, z = 0; std::list<T> cont;
             as2::csv( as2::put( cont ) , x, y, z );
-            
+
             BOOST_ASSIGN_V2_CHECK( cont.front() == x );
             BOOST_ASSIGN_V2_CHECK( cont.back() == z );
             //]
@@ -121,12 +121,12 @@
         // modulo.hpp
         {
             //[other_put_modulo
-            typedef int T; std::list<T> cont; 
-            as2::csv( 
-            	as2::put( cont ) % ( as2::_fun = as2::_identity ), 
-                1, 2, 0 
+            typedef int T; std::list<T> cont;
+            as2::csv(
+                as2::put( cont ) % ( as2::_fun = as2::_identity ),
+                1, 2, 0
             );
-            
+
             BOOST_ASSIGN_V2_CHECK( cont.front() == 1 );
             BOOST_ASSIGN_V2_CHECK( cont.back() == 0 );
             //]

Modified: sandbox/assign_v2/libs/assign/v2/test/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -7,14 +7,14 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#include <libs/assign/v2/test/put/deduce.h>
 #include <libs/assign/v2/test/put/container.h>
+#include <libs/assign/v2/test/put/deduce.h>
 #include <libs/assign/v2/test/put/deque.h>
-#include <libs/assign/v2/test/put/modulo.h>
-#include <libs/assign/v2/test/put/std.h>
 #include <libs/assign/v2/test/put/ext.h>
-#include <libs/assign/v2/test/put/ptr.h>
+#include <libs/assign/v2/test/put/modulo.h>
 #include <libs/assign/v2/test/put/pipe.h>
+#include <libs/assign/v2/test/put/ptr.h>
+#include <libs/assign/v2/test/put/std.h>
 #include <libs/assign/v2/test/put.h>
 
 namespace test_assign_v2{
@@ -22,14 +22,12 @@
 
     void test()
     {
-        xxx_deduce::test();
         xxx_container::test();
-        xxx_modulo::test();
+        xxx_deduce::test();
         xxx_deque::test();
-        xxx_std::test();
-        xxx_ext::test();
-        xxx_ptr::test();
+        xxx_modulo::test();
         xxx_pipe::test();
+        xxx_ptr::test();
     }
 
 }// xxx_put

Modified: sandbox/assign_v2/libs/assign/v2/test/put/container/functor.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/container/functor.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/container/functor.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -20,6 +20,8 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/put/container/functor.hpp>
 
+#include <boost/assign/v2/detail/functor/identity.hpp>
+
 #include <libs/assign/v2/test/put/container/functor.h>
 
 namespace test_assign_v2{
@@ -42,19 +44,20 @@
             // comparator
             //[put_cont_functor_map
             typedef std::map<std::string, int> C; C cont;
-            as2::put( cont )( "jan", 31 )( "feb", 28 )( "mar", 31 );
-            
+            as2::put( cont )( "jan", 31 )( "feb", 28 )( "mar", 31 )("apr", 30);
+
             BOOST_ASSIGN_V2_CHECK( cont["feb"] == 28 );
+            BOOST_ASSIGN_V2_CHECK( cont["apr"] == 30 );
             //]
             BOOST_ASSIGN_V2_CHECK( cont["jan"] == 31 );
             BOOST_ASSIGN_V2_CHECK( cont["mar"] == 31 );
         }
         {
-        	// Used in intro (same as above but different naming)
+            // Used in intro (same as above but different naming)
             //[put_cont_functor_cal
             typedef std::map<std::string, int> C; C cal;
-            /*<< Calls `cal.insert( C::value_type(x, y) )` for [^(x,y)=( "jan", 31 ),( "feb", 28 ),( "mar", 31 )] >>*/
-            as2::put( cal )( "jan", 31 )( "feb", 28 )( "mar", 31 );
+            /*<< Calls `cal.insert( C::value_type(x, y) )` for [^(x,y)=( "jan", 31 ),( "feb", 28 ),( "mar", 31 ),("apr", 30)] >>*/
+            as2::put( cal )( "jan", 31 )( "feb", 28 )( "mar", 31 )("apr", 30);
 
             BOOST_ASSIGN_V2_CHECK( cal["feb"] == 28 );
             //]
@@ -80,8 +83,9 @@
             //]
         }
         {
+            //http://science.nasa.gov/science-news/science-at-nasa/2010/17dec_solsticeeclipse/
             //[put_cont_functor_list
-            typedef int T; T x = 1, y = 2, z = 0;
+            typedef int T; /*<<Lunar eclipse years falling on winter solstice>>*/T x = 1638, y = 2010, z = 2094;
             std::list<T> cont; ( as2::put( cont ) )( x )( y )( z );
 
             BOOST_ASSIGN_V2_CHECK( cont.front() == x );
@@ -118,18 +122,22 @@
         }
         {
             using namespace boost;
+            //Reminder : cont cannot be say a std::vector<> as
+            // cont.push_back( T( pi, "pi" ) );
+            // causes assignment read only error.
             //[put_cont_functor_tuple
-            typedef int i_; typedef double d_;
-            typedef boost::tuple</*<< Notice this is a reference >>*/ d_&, i_> T;
-            d_ w = 2.7,  x = 2.71, y = 2.718, z = 0.0; std::vector<T> cont;
-            as2::put( cont )/*<< Notice the binary calls >>*/( w, 1 )( x, 2 )( y, 3 )/*<< Notice the unary call >>*/( z );
-
-            BOOST_ASSIGN_V2_CHECK( &get<0>( cont[1] ) == &x );
-            BOOST_ASSIGN_V2_CHECK( get<1>( cont[1] ) == 2 );
-            T t3( z );
-            BOOST_ASSIGN_V2_CHECK( &get<0>( cont[3] ) == &z );
-            BOOST_ASSIGN_V2_CHECK( get<1>( cont[3] ) == get<1>( t3 ) );
+            typedef double const ct_;
+            typedef boost::tuple<ct_/*<<Notice>>*/&, std::string> T;
+            ct_ const pi = 3.14,  e = 2.71, log2 = 0.69, na = 0.0;
+            std::deque<T> cont; as2::put( cont )/*<< Notice the binary calls >>*/( pi, "pi" )( e, "e" )( log2, "log2" )/*<< Notice the unary call >>*/( na );
+
+            BOOST_ASSIGN_V2_CHECK( &get<0>( cont[0] ) == &pi );
+            BOOST_ASSIGN_V2_CHECK(  get<1>( cont[0] ) == "pi" );
+            BOOST_ASSIGN_V2_CHECK( &get<0>( cont[3] ) == &na );
+            T t3 = T( na ); BOOST_ASSIGN_V2_CHECK( get<1>( cont[3] ) == get<1>( t3 ) );
             //]
+            BOOST_ASSIGN_V2_CHECK( &get<0>( cont[1] ) == &e );
+            BOOST_ASSIGN_V2_CHECK( &get<0>( cont[2] ) == &log2 );
         }
     }// test()
 

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-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -7,11 +7,7 @@
 //  Boost Software License, Version 1.0. (See accompanying file           //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)      //
 ////////////////////////////////////////////////////////////////////////////
-#include <libs/assign/v2/test/put/deque/csv.h>
 #include <libs/assign/v2/test/put/deque/functor.h>
-#include <libs/assign/v2/test/put/deque/modulo.h>
-#include <libs/assign/v2/test/put/deque/std.h>
-#include <libs/assign/v2/test/put/deque/ext.h>
 #include <libs/assign/v2/test/put/deque.h>
 
 namespace test_assign_v2{
@@ -20,11 +16,7 @@
 
     void test()
     {
-        xxx_csv::test();
         xxx_functor::test();
-        xxx_modulo::test();
-        xxx_std::test();
-        xxx_ext::test();
     }
 
 }// xxx_deque

Modified: sandbox/assign_v2/libs/assign/v2/test/put/deque/ext.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/deque/ext.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/deque/ext.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,46 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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)        //
-//////////////////////////////////////////////////////////////////////////////
-#include <boost/typeof/typeof.hpp>
-#include <boost/range/size.hpp>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/deque.hpp>
-#include <boost/assign/v2/put/ext.hpp>
-
-#include <libs/assign/v2/test/put/deque/ext.h>
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_deque{
-namespace xxx_ext{
-
-    // Tests interaction between different functionalities
-
-    void test(){
-
-        namespace as2 = boost::assign::v2;
-
-        {
-            //[put_deque_modulo_repeat
-            BOOST_AUTO(
-                cont,  (
-                    as2::deque<int>( as2::_nil ) % ( as2::_repeat = 2 )
-                )( -1 )( 0 )( 1 )
-            );
-            BOOST_ASSIGN_V2_CHECK( boost::size( cont ) == 6 );
-            //]
-            BOOST_ASSIGN_V2_CHECK( cont.front() == -1 );
-            BOOST_ASSIGN_V2_CHECK( cont.back() == 1 );
-        }
-    }
-
-}// xxx_ext
-}// xxx_deque
-}// xxx_put
-}// test_assign_v2
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/deque/ext.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/deque/ext.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/deque/ext.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,25 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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 LIBS_ASSIGN_V2_TEST_PUT_DEQUE_EXT_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_DEQUE_EXT_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_deque{
-namespace xxx_ext{
-
-    void test();
-
-}// xxx_ext
-}// xxx_deque
-}// xxx_put
-}// test_assign_v2
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/deque/functor.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/deque/functor.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/deque/functor.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -20,13 +20,14 @@
 
     void test()
     {
-        namespace as2 = boost::assign::v2;
+        namespace as2 = boost::assign::v2;    
         {
             //[put_deque_functor
             typedef int T; T x = 1, z = 0;
-            as2::result_of::deque<T>::type cont = as2::deque<T>/*<<k = 1, 0, 1, respectively>>*/( x )()( z );
-            BOOST_ASSIGN_V2_CHECK( cont.front() == x );
-            BOOST_ASSIGN_V2_CHECK( cont[1] == T() );
+            as2::result_of::deque<T>::type cont = as2::deque<T>/*<<T( x ), T(), T( z )>>*/( x )()( z );
+
+            BOOST_ASSIGN_V2_CHECK( cont.front() == x ); T t1 = T();
+            BOOST_ASSIGN_V2_CHECK( cont[1] == t1 );
             BOOST_ASSIGN_V2_CHECK( cont.back() == z );
             //]
         }

Modified: sandbox/assign_v2/libs/assign/v2/test/put/deque/modulo.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/deque/modulo.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/deque/modulo.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,48 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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)        //
-//////////////////////////////////////////////////////////////////////////////
-#include <string>
-#include <boost/typeof/typeof.hpp>
-#include <boost/lambda/lambda.hpp>
-#include <boost/range/size.hpp>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/deque.hpp>
-#include <boost/assign/v2/put/modulo/fun.hpp>
-
-#include <libs/assign/v2/test/put/deque/modulo.h>
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_deque{
-namespace xxx_modulo{
-
-    void test(){
-
-        namespace as2 = boost::assign::v2;
-		namespace lambda = boost::lambda;
-
-        {
-            //[put_deque_modulo
-            typedef int T; T x = 1, y = 2, z = 0;
-            BOOST_AUTO(
-            	cont,
-                (
-                	as2::deque<T>( as2::_nil ) % ( as2::_fun = ( lambda::_1 + 1 ) )
-                )( x )( y )( z )
-            );
-            BOOST_ASSIGN_V2_CHECK( cont.front() == ( x + 1 ) );
-            BOOST_ASSIGN_V2_CHECK( cont.back() == ( z + 1 ) );
-            //]
-        }
-    }
-
-}// xxx_modulo
-}// xxx_deque
-}// xxx_put
-}// test_assign_v2
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/deque/modulo.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/deque/modulo.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/deque/modulo.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,25 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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 LIBS_ASSIGN_V2_TEST_PUT_DEQUE_MODULO_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_DEQUE_MODULO_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_deque{
-namespace xxx_modulo{
-
-    void test();
-
-}// xxx_modulo
-}// xxx_deque
-}// xxx_put
-}// test_assign_v2
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/deque/std.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/deque/std.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/deque/std.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,42 +1 @@
-////////////////////////////////////////////////////////////////////////////
-//  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)      //
-////////////////////////////////////////////////////////////////////////////
-#include <boost/typeof/typeof.hpp>
-#include <boost/assign/v2/put/std/push_front.hpp>
-#include <boost/assign/v2/put/deque/functor.hpp>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <libs/assign/v2/test/put/deque/std.h>
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_deque{
-namespace xxx_std{
-
-    void test()
-    {
-        namespace as2 = boost::assign::v2;
-        {
-            typedef int T; T x = 1, y = 2, z = 0;
-            //[put_deque_std_front
-            BOOST_AUTO(
-                cont,
-                (
-                    as2::deque<T>( as2::_nil ) % as2::_push_front
-                )( x )( y )( z )
-            );
-            BOOST_ASSIGN_V2_CHECK( cont[0] == z );
-            BOOST_ASSIGN_V2_CHECK( cont[2] == x );
-            //]
-        }
-    }
-
-}// xxx_std
-}// xxx_deque
-}// xxx_put
-}// test_assign_v2
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/deque/std.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/deque/std.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/deque/std.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,25 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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 LIBS_ASSIGN_V2_TEST_PUT_DEQUE_STD_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_DEQUE_STD_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_deque{
-namespace xxx_std{
-
-    void test();
-
-}// xxx_std
-}// xxx_deque
-}// xxx_put
-}// test_assign_v2
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/ext.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/ext.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/ext.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,64 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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)        //
-//////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <map>
-#include <stack>
-#include <boost/lambda/lambda.hpp>
-#include <boost/array.hpp>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/ext.hpp>
-#include <boost/assign/v2/put/container/functor.hpp>
-#include <libs/assign/v2/test/put/ext.h>
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_ext{
-
-    void test()
-    {
-        namespace as2 = boost::assign::v2;
-        namespace lambda = boost::lambda;
-        {
-            //[put_ext_iterate
-            typedef int T; boost::array<T, 3> cont;
-            ( as2::put( cont ) % ( as2::_iterate = 1 ) )( 1 )( 2 );
-            
-            BOOST_ASSIGN_V2_CHECK( cont[0] == T() );
-            BOOST_ASSIGN_V2_CHECK( cont[1] == 1 );
-            BOOST_ASSIGN_V2_CHECK( cont[2] == 2 );
-            //]
-        }
-        {
-            //[put_ext_lookup
-            std::map<std::string, int> cont;
-            cont["jan"] = 31; cont["feb"] = 29; cont["mar"] = 32;
-            (
-                as2::put( cont ) % ( as2::_lookup = ( lambda::_1 -= 1 ) )
-            )( "feb" )( "mar" );
-            
-            BOOST_ASSIGN_V2_CHECK( cont["feb"] == 28 );
-            BOOST_ASSIGN_V2_CHECK( cont["mar"] == 31 );
-            //]
-        }
-        {
-            //[put_ext_repeat
-            std::vector<int> cont;
-            ( as2::put( cont ) % ( as2::_repeat = 2  ) )( -1 )( 0 )( 1 );
-
-            BOOST_ASSIGN_V2_CHECK( cont.size() == 6 );
-            BOOST_ASSIGN_V2_CHECK( cont.front() == -1 );
-            BOOST_ASSIGN_V2_CHECK( cont.back() == 1 );
-            //]
-        }
-    }
-
-}// xxx_ext
-}// xxx_put
-}// test_assign_v2
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/ext.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/ext.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/ext.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,23 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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 LIBS_ASSIGN_V2_TEST_PUT_EXT_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_EXT_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_ext{
-
-    void test();
-
-}// xxx_ext
-}// xxx_put
-}// xxx_test_assign
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -7,14 +7,9 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <deque>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/container.hpp>
-#include <boost/assign/v2/put/std/push_front.hpp>
-#include <boost/assign/v2/put/modulo/fun.hpp>
-#include <boost/lambda/lambda.hpp>
-#include <libs/assign/v2/test/put/modulo.h>
+#include <libs/assign/v2/test/put/modulo/fun.h>
+#include <libs/assign/v2/test/put/modulo/std.h>
+#include <libs/assign/v2/test/put/modulo/ext.h>
 
 namespace test_assign_v2{
 namespace xxx_put{
@@ -22,31 +17,9 @@
 
     void test()
     {
-        namespace as2 = boost::assign::v2;
-        namespace lambda = boost::lambda;
-        {
-            //[put_modulo_fun
-            typedef int T; T x = 1, y = 2, z = 0;
-            std::vector<int> cont;
-            (
-                as2::put( cont ) % ( as2::_fun = ( lambda::_1 + 1 ) )
-            )( x )( y )( z );
-            
-            BOOST_ASSIGN_V2_CHECK( cont.front() == ( x + 1 ) );
-            BOOST_ASSIGN_V2_CHECK( cont.back() == ( z + 1 ) );
-            //]
-        }
-        {
-            //[put_modulo_modifier
-            typedef int T; T x = 1, y = 2, z = 0;
-            std::deque<int> cont;
-            ( as2::put( cont ) % ( as2::_modifier
-                = as2::modifier_tag::push_front() ) )( x )( y )( z );
-                
-            BOOST_ASSIGN_V2_CHECK( cont.front() == z );
-            BOOST_ASSIGN_V2_CHECK( cont.back() == x );
-            //]
-        }
+        xxx_fun::test();
+        xxx_std::test();
+        xxx_ext::test();
     }
 
 }// xxx_modulo

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -7,8 +7,9 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#include <libs/assign/v2/test/put/pipe/modulo.h>
 #include <libs/assign/v2/test/put/pipe/functor.h>
+#include <libs/assign/v2/test/put/pipe/container.h>
+#include <libs/assign/v2/test/put/pipe/modulo.h>
 #include <libs/assign/v2/test/put/pipe/range.h>
 #include <libs/assign/v2/test/put/pipe.h>
 
@@ -17,8 +18,9 @@
 namespace xxx_pipe{
 
     void test(){
-        xxx_modulo::test();
         xxx_functor::test();
+        xxx_container::test();
+        xxx_modulo::test();
         xxx_range::test();
     }
 

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -7,11 +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)        //
 //////////////////////////////////////////////////////////////////////////////
-#include <libs/assign/v2/test/put/pipe/functor/container.h>
 #include <libs/assign/v2/test/put/pipe/functor/forward.h>
 #include <libs/assign/v2/test/put/pipe/functor/rhs.h>
-#include <libs/assign/v2/test/put/pipe/functor/fun.h>
-#include <libs/assign/v2/test/put/pipe/functor/std.h>
 #include <libs/assign/v2/test/put/pipe/functor/str_literal.h>
 #include <libs/assign/v2/test/put/pipe/functor.h>
 
@@ -21,11 +18,8 @@
 namespace xxx_functor{
 
     void test(){
-        xxx_container::test();
         xxx_forward::test();
         xxx_rhs::test();
-        xxx_fun::test();
-        xxx_std::test();
         xxx_str_literal::test();
     }
 

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/container.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/container.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/container.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -35,8 +35,8 @@
             typedef int T;
             T x = 1, y = 2, z = 3;
             boost::array<T, 3> cont;
-            BOOST_ASSIGN_V2_CHECK( 
-            	( cont | as2::_put( x )( y )( z ) )[0] == x 
+            BOOST_ASSIGN_V2_CHECK(
+                ( cont | as2::_put( x )( y )( z ) )[0] == x
             );
             BOOST_ASSIGN_V2_CHECK( cont[2] == z );
             //]
@@ -46,8 +46,8 @@
             typedef int T;
             T x = 1, y = 2, z = 3;
             boost::array<T, 3> cont;
-            BOOST_ASSIGN_V2_CHECK( 
-            	( cont | as2::_csv_put( x, y, z ) )[0] == x 
+            BOOST_ASSIGN_V2_CHECK(
+                ( cont | as2::_csv_put( x, y, z ) )[0] == x
             );
             BOOST_ASSIGN_V2_CHECK( cont[2] == z );
             //]
@@ -55,10 +55,10 @@
         {
             //[put_pipe_functor_map
             std::map<std::string, int> assoc;
-            BOOST_ASSIGN_V2_CHECK( 
-            	( 
-                	assoc | as2::_put( "jan", 31 )( "feb", 28 )( "mar", 31 ) 
-                )["feb"] == 28 
+            BOOST_ASSIGN_V2_CHECK(
+                (
+                    assoc | as2::_put( "jan", 31 )( "feb", 28 )( "mar", 31 )( "apr", 30)
+                )["feb"] == 28
             );
             //]
         }
@@ -67,8 +67,8 @@
             typedef std::string T;
             std::set<T> assoc;
             T x = "isomer", y = "ephemeral", z = "prosaic";
-            BOOST_ASSIGN_V2_CHECK( 
-            	( assoc | as2::_put( x )( y )( z ) ).count( x ) == 1 
+            BOOST_ASSIGN_V2_CHECK(
+                ( assoc | as2::_put( x )( y )( z ) ).count( x ) == 1
             );
             BOOST_ASSIGN_V2_CHECK( assoc.count( z ) == 1 );
             //]
@@ -77,8 +77,8 @@
             //[put_pipe_functor_deque
             typedef int T; T x = 1, y = 2, z = 0;
             std::deque<T> cont;
-            BOOST_ASSIGN_V2_CHECK(( 
-                	cont | as2::_put( x )( y )( z ) 
+            BOOST_ASSIGN_V2_CHECK((
+                    cont | as2::_put( x )( y )( z )
                 ).front() == x );
             BOOST_ASSIGN_V2_CHECK( cont.back() == z );
             //]
@@ -87,9 +87,9 @@
             //[put_pipe_functor_list
             typedef int T; T x = 1, y = 2, z = 0;
             std::list<T> cont;
-            BOOST_ASSIGN_V2_CHECK( 
-            	( 
-                	cont | as2::_put( x )( y )( z ) 
+            BOOST_ASSIGN_V2_CHECK(
+                (
+                    cont | as2::_put( x )( y )( z )
                 ).front() == x );
             BOOST_ASSIGN_V2_CHECK( cont.back() == z );
             //]
@@ -98,10 +98,10 @@
             //[put_pipe_functor_vector
             typedef int T; T x = 1, y = 2, z = 0;
             std::vector<T> cont;
-            BOOST_ASSIGN_V2_CHECK( 
-            	( 
-                	cont | as2::_put( x )( y )( z ) 
-                ).front() == x 
+            BOOST_ASSIGN_V2_CHECK(
+                (
+                    cont | as2::_put( x )( y )( z )
+                ).front() == x
             );
             BOOST_ASSIGN_V2_CHECK( cont.back() == z );
             //]
@@ -110,10 +110,10 @@
             //[put_pipe_functor_queue
             typedef int T; T x = 8, y = 7, z = 6;
             std::queue<T> fifo;
-            BOOST_ASSIGN_V2_CHECK( 
-            	(
-            		fifo | as2::_put( x )( y )( z )
-            	).front() == x 
+            BOOST_ASSIGN_V2_CHECK(
+                (
+                    fifo | as2::_put( x )( y )( z )
+                ).front() == x
             );
             BOOST_ASSIGN_V2_CHECK( fifo.back() == z );
             //]
@@ -122,9 +122,9 @@
             //[put_pipe_functor_stack
             typedef int T; T x = 8, y = 7, z = 4;
             std::stack<T> lifo;
-            BOOST_ASSIGN_V2_CHECK( 
-            	( 
-                	lifo | as2::_put( x )( y )( z ) 
+            BOOST_ASSIGN_V2_CHECK(
+                (
+                    lifo | as2::_put( x )( y )( z )
                 ).top() == z ); lifo.pop();
             BOOST_ASSIGN_V2_CHECK( lifo.top() == y );
             //]

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/container.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/container.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/container.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,24 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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)        //
-//////////////////////////////////////////////////////////////////////////////
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_pipe{
-namespace xxx_functor{
-namespace xxx_container{
-
-    void test();
-
-}// xxx_container
-}// xxx_functor
-}// xxx_pipe
-}// xxx_put
-}// xxx_test_assign
-
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/forward.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/forward.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/forward.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 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 LIBS_ASSIGN_V2_PUT_PIPE_FUNCTOR_FORWARD_H
-#define LIBS_ASSIGN_V2_PUT_PIPE_FUNCTOR_FORWARD_H
+#ifndef LIBS_ASSIGN_V2_PUT_PIPE_FUNCTOR_FORWARD_ER_2010_H
+#define LIBS_ASSIGN_V2_PUT_PIPE_FUNCTOR_FORWARD_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_put{

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/fun.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/fun.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/fun.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,57 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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)        //
-//////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <boost/lambda/lambda.hpp>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/modulo/fun.hpp>
-#include <boost/assign/v2/put/pipe/functor.hpp>
-#include <boost/assign/v2/put/pipe/csv.hpp>
-#include <libs/assign/v2/test/put/pipe/functor/fun.h>
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_pipe{
-namespace xxx_functor{
-namespace xxx_fun{
-
-    void test()
-    {
-        namespace as2 = boost::assign::v2;
-        namespace lambda = boost::lambda;
-        {
-            //[put_pipe_functor_fun
-            typedef int T; T x = 1, y = 2, z = 0; std::vector<T> cont;
-            BOOST_ASSIGN_V2_CHECK( 
-            	( 
-                	cont | (
-                		as2::_put % ( as2::_fun = ( lambda::_1 + 1 ) )
-            		)( x )( y )( z ) 
-                ).front() == ( x + 1 ) );
-            BOOST_ASSIGN_V2_CHECK( cont.back() == ( z + 1 ) );
-            //]
-        }
-        {
-            //[put_pipe_csv_fun
-            typedef int T; T x = 1, y = 2, z = 0; std::vector<T> cont;
-            BOOST_ASSIGN_V2_CHECK( 
-            	( 
-                	cont | ( as2::_csv_put % ( as2::_fun = ( lambda::_1 + 1 ) )
-            	)( x, y, z ) ).front() == ( x + 1 )
-            );
-            BOOST_ASSIGN_V2_CHECK( cont.back() == ( z + 1 ) );
-            //]
-        }
-    }
-
-}// xxx_fun
-}// xxx_functor
-}// xxx_pipe
-}// xxx_put
-}// test_assign_v2
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/fun.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/fun.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/fun.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,27 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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 LIBS_ASSIGN_V2_TEST_PUT_PIPE_FUNCTOR_FUN_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_FUNCTOR_FUN_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_pipe{
-namespace xxx_functor{
-namespace xxx_fun{
-
-    void test();
-
-}// xxx_fun
-}// xxx_functor
-}// xxx_pipe
-}// xxx_put
-}// xxx_test_assign
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/rhs.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/rhs.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/rhs.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -80,7 +80,7 @@
 #undef B
         }
         {
-        	// str_literal
+            // str_literal
             BOOST_AUTO(rhs, as2::_put( "x" ) );
             typedef boost::mpl::int_<0> int_;
             typedef std::string str_;

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/std.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/std.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/std.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,54 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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)        //
-//////////////////////////////////////////////////////////////////////////////
-#include <deque>
-#include <boost/lambda/lambda.hpp>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/std/push_front.hpp>
-#include <boost/assign/v2/put/pipe/functor.hpp>
-#include <boost/assign/v2/put/pipe/csv.hpp>
-#include <libs/assign/v2/test/put/pipe/functor/std.h>
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_pipe{
-namespace xxx_functor{
-namespace xxx_std{
-
-    void test()
-    {
-        namespace as2 = boost::assign::v2;
-        namespace lambda = boost::lambda;
-        {
-            //[put_pipe_functor_push_front
-            typedef int T; T x = 1, y = 2, z = 0; std::deque<int> cont;
-            BOOST_ASSIGN_V2_CHECK( 
-            	( 
-                	cont | ( as2::_put %  as2::_push_front )( x )( y )( z ) 
-                ).front() == z 
-            );
-            BOOST_ASSIGN_V2_CHECK( cont.back() == x );
-            //]
-        }
-        {
-            //[put_pipe_csv_push_front
-            typedef int T; T x = 1, y = 2, z = 0; std::deque<int> cont;
-            BOOST_ASSIGN_V2_CHECK( 
-            	( cont | ( as2::_csv_put %  as2::_push_front )( x, y, z ) 
-            ).front() == z );
-            BOOST_ASSIGN_V2_CHECK( cont.back() == x );
-            //]
-        }
-    }
-
-}// xxx_std
-}// xxx_functor
-}// xxx_pipe
-}// xxx_put
-}// test_assign_v2
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/std.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/std.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/std.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,27 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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 LIBS_ASSIGN_V2_TEST_PUT_PIPE_FUNCTOR_STD_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_FUNCTOR_STD_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_pipe{
-namespace xxx_functor{
-namespace xxx_std{
-
-    void test();
-
-}// xxx_std
-}// xxx_functor
-}// xxx_pipe
-}// xxx_put
-}// xxx_test_assign
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/str_literal.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/str_literal.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/str_literal.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -26,7 +26,7 @@
         typedef const char* T;
         std::deque<T> cont; typedef std::string str_;
         BOOST_ASSIGN_V2_CHECK( str_( 
-        	( cont | as2::_put( "x" )( "y" )( "z" ) )[0] 
+            ( cont | as2::_put( "x" )( "y" )( "z" ) )[0] 
         ) == "x" );
         BOOST_ASSIGN_V2_CHECK( str_( cont[1] ) == "y" );
         BOOST_ASSIGN_V2_CHECK( str_( cont[2] ) == "z" );

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/str_literal.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/str_literal.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/str_literal.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -8,7 +8,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
 #ifndef LIBS_ASSIGN_V2_TEST_PUT_PIPE_FUNCTOR_STR_LITERAL_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_FUNCTOR_STD_LITERAL_2010_H
+#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_FUNCTOR_STD_LITERAL_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_put{

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/modulo.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/modulo.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/modulo.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -14,7 +14,7 @@
 #include <boost/assign/v2/put/std/push_front.hpp>
 #include <boost/assign/v2/put/container.hpp>
 #include <boost/assign/v2/put/modulo/fun.hpp>
-#include <boost/assign/v2/put/modulo/modifier.hpp>
+#include <boost/assign/v2/put/modulo/std.hpp>
 #include <boost/assign/v2/put/pipe/functor.hpp>
 #include <boost/assign/v2/put/pipe/modulo/forward.hpp>
 
@@ -31,8 +31,8 @@
         typedef std::list<int> C; C cont;
         typedef modifier_tag::push_front modifier_tag_;
         typedef functor_aux::identity identity_;
-        typedef put_modulo_aux::fun<identity_> fun_;
-        typedef put_modulo_aux::modifier<modifier_tag_> modifier_;
+        typedef put_aux::modulo_fun<identity_> fun_;
+        typedef put_aux::modulo_std<modifier_tag_> modifier_;
         typedef boost::mpl::vector2<fun_, modifier_> pars_;
         typedef int T;
         T x = 1, y = 2, z = 3;
@@ -41,7 +41,7 @@
             (
                 _put %  (
                     _fun = _identity
-                ) % ( _modifier = modifier_tag_() )
+                ) % ( _std = modifier_tag_() )
             ).pars()
         )( x )( y )( z );
         BOOST_ASSIGN_V2_CHECK( cont.size() == 3 );

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/modulo.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/modulo.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/modulo.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -8,7 +8,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
 #ifndef LIBS_ASSIGN_V2_TEST_PUT_PIPE_MODULO_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_MODULO__ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_MODULO_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_put{

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/range.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/range.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/range.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -33,7 +33,7 @@
             std::vector<T> r( 3 ); r[0] = x; r[1] = y; r[2] = z;
             boost::array<T, 3> cont; 
             BOOST_ASSIGN_V2_CHECK( ( 
-            	cont | as2::_put_range( r ) 
+                cont | as2::_put_range( r ) 
             ).front() == x );
             BOOST_ASSIGN_V2_CHECK( cont.back() == z );
             //]

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-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -36,7 +36,7 @@
             
         }
 /*
-		// These are not yet available (TODO)
+        // These are not yet available (TODO)
         {
             //[put_ptr_map
             boost::ptr_map<std::string, int> assoc;

Modified: sandbox/assign_v2/libs/assign/v2/test/put/std.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/std.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/std.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,39 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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)        //
-//////////////////////////////////////////////////////////////////////////////
-#include <deque>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/std/push_front.hpp>
-#include <boost/assign/v2/put/container/functor.hpp>
-#include <libs/assign/v2/test/put/std.h>
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_std{
-
-    void test()
-    {
-        namespace as2 = boost::assign::v2;
-
-        /* Only have to check those that are in /std which are not in
-        /deduce/dependee.hpp */
-
-        {
-            //[put_std_push_front
-            typedef int T; T x = 0, y = 2, z = 1; std::deque<T> cont;
-            ( as2::put( cont ) % as2::_push_front )( x )( y )( z );
-            BOOST_ASSIGN_V2_CHECK( cont[0] == z );
-            BOOST_ASSIGN_V2_CHECK( cont[2] == x );
-            //]
-        }
-    }
-
-}// xxx_std
-}// xxx_put
-}// test_assign_v2
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/put/std.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/std.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/std.h	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -1,23 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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 LIBS_ASSIGN_V2_TEST_PUT_STD_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_STD_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_std{
-
-    void test();
-
-}// xxx_std
-}// xxx_put
-}// xxx_test_assign
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/ref.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -19,7 +19,6 @@
 
     void test(){
 
-        xxx_array::test();
         xxx_convert_traits::test();
         xxx_array::test();
         xxx_list::test();

Modified: sandbox/assign_v2/libs/assign/v2/test/ref/list_tuple.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/list_tuple.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/list_tuple.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -89,7 +89,7 @@
             BOOST_ASSIGN_V2_CHECK( &get<0>( list.get( i2_() ) ) == &b );
             BOOST_ASSIGN_V2_CHECK(  get<0>( list.get( i3_() ) ) == B );
 
-			result_ list2 = list;
+            result_ list2 = list;
             BOOST_ASSIGN_V2_CHECK( &get<0>( list2.get( i0_() ) ) == &a );
             BOOST_ASSIGN_V2_CHECK(  get<0>( list2.get( i1_() ) ) == A );
             BOOST_ASSIGN_V2_CHECK( &get<0>( list2.get( i2_() ) ) == &b );

Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -16,27 +16,24 @@
 #define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
 
 #include <libs/assign/v2/test/put/deduce.cpp>
-#include <libs/assign/v2/test/put/modulo.cpp>
 
 #include <libs/assign/v2/test/put/container/functor.cpp>
 #include <libs/assign/v2/test/put/container/range.cpp>
+#include <libs/assign/v2/test/put/deque/functor.cpp>
 
-#include <libs/assign/v2/test/put/std.cpp>
-#include <libs/assign/v2/test/put/ext.cpp>
-#include <libs/assign/v2/test/put/ptr.cpp>
+#include <libs/assign/v2/test/put/modulo/fun.cpp>
+#include <libs/assign/v2/test/put/modulo/std.cpp>
+#include <libs/assign/v2/test/put/modulo/ext.cpp>
 
-#include <libs/assign/v2/test/put/deque/modulo.cpp>
-#include <libs/assign/v2/test/put/deque/functor.cpp>
-#include <libs/assign/v2/test/put/deque/std.cpp>
+#include <libs/assign/v2/test/put/ptr.cpp>
 
-#include <libs/assign/v2/test/put/pipe/functor/container.cpp>
 #include <libs/assign/v2/test/put/pipe/functor/forward.cpp>
 #include <libs/assign/v2/test/put/pipe/functor/rhs.cpp>
-#include <libs/assign/v2/test/put/pipe/functor/fun.cpp>
-#include <libs/assign/v2/test/put/pipe/functor/std.cpp>
 #include <libs/assign/v2/test/put/pipe/functor/str_literal.cpp>
-
-#include <libs/assign/v2/test/put/pipe/modulo.cpp>
+#include <libs/assign/v2/test/put/pipe/container.cpp>
+#include <libs/assign/v2/test/put/pipe/modulo/forward.cpp>
+#include <libs/assign/v2/test/put/pipe/modulo/fun.cpp>
+#include <libs/assign/v2/test/put/pipe/modulo/std.cpp>
 #include <libs/assign/v2/test/put/pipe/range.cpp>
 
 #include <boost/test/unit_test.hpp>
@@ -46,28 +43,23 @@
     test_suite* test = BOOST_TEST_SUITE( "BOOST_ASSIGN_V2" );
     using namespace test_assign_v2;
     {
+
             namespace ns = xxx_put;
                 test->add( BOOST_TEST_CASE( &ns::xxx_deduce::test ) );
-		test->add( BOOST_TEST_CASE( &ns::xxx_modulo::test ) );
-
-
                 test->add( BOOST_TEST_CASE( &ns::xxx_container::xxx_functor::test ) );
                 test->add( BOOST_TEST_CASE( &ns::xxx_container::xxx_range::test ) );
-
-		test->add( BOOST_TEST_CASE( &ns::xxx_std::test ) );
-		test->add( BOOST_TEST_CASE( &ns::xxx_ext::test ) );
-		test->add( BOOST_TEST_CASE( &ns::xxx_ptr::test ) );
-
-		test->add( BOOST_TEST_CASE( &ns::xxx_deque::xxx_modulo::test ) );
                 test->add( BOOST_TEST_CASE( &ns::xxx_deque::xxx_functor::test ) );
-		test->add( BOOST_TEST_CASE( &ns::xxx_deque::xxx_std::test ) );
+		test->add( BOOST_TEST_CASE( &ns::xxx_modulo::xxx_fun::test ) );
+		test->add( BOOST_TEST_CASE( &ns::xxx_modulo::xxx_std::test ) );
+		test->add( BOOST_TEST_CASE( &ns::xxx_modulo::xxx_ext::test ) );
 
-		test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_functor::xxx_container::test ) );
                 test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_functor::xxx_forward::test ) );
                 test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_functor::xxx_rhs::test ) );
-		test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_functor::xxx_fun::test ) );
-		test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_functor::xxx_std::test ) );
                 test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_functor::xxx_str_literal::test ) );
+		test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_container::test ) );
+		test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_modulo::xxx_fun::test ) );
+		test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_modulo::xxx_std::test ) );
+		test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_range::test ) );
 
     }
     return test;

Modified: sandbox/assign_v2/libs/assign/v2/test/utility/convert.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/convert.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/convert.cpp	2011-03-04 15:52:09 EST (Fri, 04 Mar 2011)
@@ -22,10 +22,10 @@
 namespace xxx_convert{
 
     // suggested by JB:
-	template<typename C, typename R>
+    template<typename C, typename R>
     void f(C cont, R const& r){
-    	namespace as2 = boost::assign::v2;
-    	as2::check_aux::equal_container( cont, r );
+        namespace as2 = boost::assign::v2;
+        as2::check_aux::equal_container( cont, r );
     }
 
     void test()
@@ -60,23 +60,23 @@
             //]
         }
         {
-        	typedef int T;
-        	typedef std::vector<int> R; R r( 3 ); r[0] = 1; r[1] = 2; r[2] = 0; 
+            typedef int T;
+            typedef std::vector<int> R; R r( 3 ); r[0] = 1; r[1] = 2; r[2] = 0; 
                         
             {
-        		typedef std::vector<T> C; f<C>( as2::converter( r ), r );
+                typedef std::vector<T> C; f<C>( as2::converter( r ), r );
             }
             {
-        		typedef std::deque<T> C; f<C>( as2::converter( r ), r );
+                typedef std::deque<T> C; f<C>( as2::converter( r ), r );
             }
             {
-        		typedef std::list<T> C; f<C>( as2::converter( r ), r );
+                typedef std::list<T> C; f<C>( as2::converter( r ), r );
             }
             {
-        		typedef std::stack<T> C; f<C>( as2::converter( r ), r );
+                typedef std::stack<T> C; f<C>( as2::converter( r ), r );
             }
             {
-        		typedef std::queue<T> C; f<C>( as2::converter( r ), r );
+                typedef std::queue<T> C; f<C>( as2::converter( r ), r );
             }
         }
     }