[Boost-commit] svn:boost r69736 - in sandbox/assign_v2/boost/assign/v2: . detail detail/check/equal_container detail/config detail/functor detail/pp detail/traits detail/traits/container detail/traits/type put put/container put/container/functor put/deduce put/deduce/modifier put/deque put/frame put/modifier put/modifier/iterate put/modifier/lookup put/modulo put/modulo/fun put/modulo/modifier put/pipe put/pipe/csv put/pipe/functor put/pipe/modulo ref ref/array ref/array/alloc ref/array/csv ref/array/functor ref/convert_traits ref/list ref/list/array ref/list/holder ref/list_tuple ref/list_tuple/cpp03 ref/list_tuple/cpp0x ref/tuple ref/tuple/cpp03 ref/tuple/cpp0x ref/wrapper temporary utility utility/chain utility/conversion utility/csv

Subject: [Boost-commit] svn:boost r69736 - in sandbox/assign_v2/boost/assign/v2: . detail detail/check/equal_container detail/config detail/functor detail/pp detail/traits detail/traits/container detail/traits/type put put/container put/container/functor put/deduce put/deduce/modifier put/deque put/frame put/modifier put/modifier/iterate put/modifier/lookup put/modulo put/modulo/fun put/modulo/modifier put/pipe put/pipe/csv put/pipe/functor put/pipe/modulo ref ref/array ref/array/alloc ref/array/csv ref/array/functor ref/convert_traits ref/list ref/list/array ref/list/holder ref/list_tuple ref/list_tuple/cpp03 ref/list_tuple/cpp0x ref/tuple ref/tuple/cpp03 ref/tuple/cpp0x ref/wrapper temporary utility utility/chain utility/conversion utility/csv
From: erwann.rogard_at_[hidden]
Date: 2011-03-08 22:09:27

Author: e_r
Date: 2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
New Revision: 69736
URL: http://svn.boost.org/trac/boost/changeset/69736

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/detail.hpp                                   |     3                                         
   sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/array.hpp       |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/deduce.hpp      |     4                                         
   sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/fifo.hpp        |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/lifo.hpp        |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/pp.hpp          |     3                                         
   sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/range.hpp       |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/sorted.hpp      |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp                      |    16 +++-                                    
   sandbox/assign_v2/boost/assign/v2/detail/config/enable_cpp0x.hpp               |    27 +-----                                  
   sandbox/assign_v2/boost/assign/v2/detail/config/limit_arity.hpp                |    27 ++++--                                  
   sandbox/assign_v2/boost/assign/v2/detail/config/limit_csv_arity.hpp            |    12 ++                                      
   sandbox/assign_v2/boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp   |    20 ++--                                    
   sandbox/assign_v2/boost/assign/v2/detail/functor.hpp                           |     5                                         
   sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp               |    31 +------                                 
   sandbox/assign_v2/boost/assign/v2/detail/functor/crtp_unary_and_up.hpp         |    30 ++-----                                 
   sandbox/assign_v2/boost/assign/v2/detail/functor/new.hpp                       |    25 +----                                   
   sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp                           |     3                                         
   sandbox/assign_v2/boost/assign/v2/detail/pp/forward.hpp                        |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/pp/parameter_list.hpp                 |     8 +-                                      
   sandbox/assign_v2/boost/assign/v2/detail/traits.hpp                            |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container.hpp                  |     5                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/forward_to_value.hpp |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/fwd.hpp              |    14 +-                                      
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/has_push.hpp         |     6                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/is.hpp               |    11 +-                                      
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_associative.hpp   |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_fifo.hpp          |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_lifo.hpp          |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_map.hpp           |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_ptr_container.hpp |     4                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_range.hpp         |     1                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_set.hpp           |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_sorted.hpp        |     8 +-                                      
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/ptr_fwd.hpp          |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/ptr_to_value.hpp     |    12 +-                                      
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/static_size.hpp      |     6                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/value.hpp            |    12 +--                                     
   sandbox/assign_v2/boost/assign/v2/detail/traits/container/value_container.hpp  |     4                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/switch.hpp                     |     5 -                                       
   sandbox/assign_v2/boost/assign/v2/detail/traits/type.hpp                       |     7 -                                       
   sandbox/assign_v2/boost/assign/v2/detail/traits/type/meta_convert.hpp          |     2                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp              |     1                                         
   sandbox/assign_v2/boost/assign/v2/detail/traits/type/value.hpp                 |     2                                         
   sandbox/assign_v2/boost/assign/v2/put.hpp                                      |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/container.hpp                            |     1                                         
   sandbox/assign_v2/boost/assign/v2/put/container/functor.hpp                    |     1                                         
   sandbox/assign_v2/boost/assign/v2/put/container/functor/adapter.hpp            |    24 +++--                                   
   sandbox/assign_v2/boost/assign/v2/put/container/functor/fwd.hpp                |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/container/functor/make.hpp               |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/container/functor/replace_parameter.hpp  |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/container/functor/result_of.hpp          |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/container/range.hpp                      |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/deduce.hpp                               |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/deduce/fun.hpp                           |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/deduce/modifier.hpp                      |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/deduce/modifier/dependee.hpp             |     1                                         
   sandbox/assign_v2/boost/assign/v2/put/deduce/modifier/tag.hpp                  |    14 +--                                     
   sandbox/assign_v2/boost/assign/v2/put/deque.hpp                                |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/deque/cont.hpp                           |     7 -                                       
   sandbox/assign_v2/boost/assign/v2/put/deque/conversion.hpp                     |     8 +                                       
   sandbox/assign_v2/boost/assign/v2/put/deque/csv.hpp                            |    12 +-                                      
   sandbox/assign_v2/boost/assign/v2/put/deque/functor.hpp                        |    16 +--                                     
   sandbox/assign_v2/boost/assign/v2/put/frame.hpp                                |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp                           |    53 ++++---------                           
   sandbox/assign_v2/boost/assign/v2/put/frame/fwd.hpp                            |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/frame/modifier.hpp                       |     6                                         
   sandbox/assign_v2/boost/assign/v2/put/frame/replace_parameter.hpp              |     6 +                                       
   sandbox/assign_v2/boost/assign/v2/put/frame/sub.hpp                            |     6                                         
   sandbox/assign_v2/boost/assign/v2/put/fun.hpp                                  |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/modifier.hpp                             |     7 -                                       
   sandbox/assign_v2/boost/assign/v2/put/modifier/iterate.hpp                     |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/impl.hpp                |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/modifier/lookup.hpp                      |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/impl.hpp                 |     6                                         
   sandbox/assign_v2/boost/assign/v2/put/modifier/repeat.hpp                      |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/modifier/standard.hpp                    |     1                                         
   sandbox/assign_v2/boost/assign/v2/put/modulo.hpp                               |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/modulo/fun.hpp                           |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/modulo/fun/keyword.hpp                   |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/modulo/fun/make.hpp                      |     4                                         
   sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp                      |     6 +                                       
   sandbox/assign_v2/boost/assign/v2/put/modulo/generic.hpp                       |    39 ---------                               
   sandbox/assign_v2/boost/assign/v2/put/modulo/modifier.hpp                      |     3                                         
   sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/keyword.hpp              |     5                                         
   sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/make.hpp                 |     8 +                                       
   sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp                 |    10 +-                                      
   sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/standard.hpp             |     5                                         
   sandbox/assign_v2/boost/assign/v2/put/pipe.hpp                                 |     1                                         
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv.hpp                             |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp                   |    75 ++++++++----------                      
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp                    |    19 ++--                                    
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp                         |    33 ++++----                                
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv/size_type.hpp                   |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/pipe/functor.hpp                         |     1                                         
   sandbox/assign_v2/boost/assign/v2/put/pipe/functor/operator.hpp                |    27 ++----                                  
   sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp                     |   160 ++++++++++++++++----------------------- 
   sandbox/assign_v2/boost/assign/v2/put/pipe/functor/size_type.hpp               |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/forward.hpp                  |    87 ---------------------                   
   sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/size_type.hpp                |    27 ------                                  
   sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/traits.hpp                   |    47 -----------                             
   sandbox/assign_v2/boost/assign/v2/put/pipe/range.hpp                           |     6                                         
   sandbox/assign_v2/boost/assign/v2/ref.hpp                                      |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/array.hpp                                |     6                                         
   sandbox/assign_v2/boost/assign/v2/ref/array/alloc.hpp                          |     1                                         
   sandbox/assign_v2/boost/assign/v2/ref/array/alloc/instant.hpp                  |     8 -                                       
   sandbox/assign_v2/boost/assign/v2/ref/array/alloc/instant_fwd.hpp              |     5 +                                       
   sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy.hpp                     |    12 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy_fwd.hpp                 |     7 +                                       
   sandbox/assign_v2/boost/assign/v2/ref/array/as_arglist.hpp                     |    64 ---------------                         
   sandbox/assign_v2/boost/assign/v2/ref/array/conversion.hpp                     |     6 +                                       
   sandbox/assign_v2/boost/assign/v2/ref/array/csv.hpp                            |     5                                         
   sandbox/assign_v2/boost/assign/v2/ref/array/csv/make.hpp                       |    25 +++---                                  
   sandbox/assign_v2/boost/assign/v2/ref/array/csv/nth_result_of.hpp              |     7 -                                       
   sandbox/assign_v2/boost/assign/v2/ref/array/functor.hpp                        |     4 -                                       
   sandbox/assign_v2/boost/assign/v2/ref/array/functor/make.hpp                   |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/array/functor/nth_result_of.hpp          |     6                                         
   sandbox/assign_v2/boost/assign/v2/ref/array/impl_traits.hpp                    |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/array/interface.hpp                      |    24 +----                                   
   sandbox/assign_v2/boost/assign/v2/ref/array/tag1.hpp                           |    10 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/convert_traits/checking.hpp              |    11 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/convert_traits/const.hpp                 |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/convert_traits/reference.hpp             |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/convert_traits/value.hpp                 |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/list.hpp                                 |    10 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/list/array.hpp                           |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/list/array/policy.hpp                    |    18 ++--                                    
   sandbox/assign_v2/boost/assign/v2/ref/list/array/rebind.hpp                    |    14 +--                                     
   sandbox/assign_v2/boost/assign/v2/ref/list/at.hpp                              |    13 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/list/container.hpp                       |    22 +++--                                   
   sandbox/assign_v2/boost/assign/v2/ref/list/fwd.hpp                             |     5                                         
   sandbox/assign_v2/boost/assign/v2/ref/list/holder.hpp                          |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/list/holder/head.hpp                     |    11 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/list/holder/tail.hpp                     |     7 +                                       
   sandbox/assign_v2/boost/assign/v2/ref/list/make.hpp                            |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/list/nth_result_of.hpp                   |    12 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/list/policy.hpp                          |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/list/size_type.hpp                       |     3                                         
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple.hpp                           |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple/container.hpp                 |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/as_arglist.hpp          |    92 ----------------------                  
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/container.hpp           |    30 +++----                                 
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/as_arglist.hpp          |    86 ---------------------                   
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp           |    19 ++--                                    
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple/extraction.hpp                |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple/nth_result_of.hpp             |     6                                         
   sandbox/assign_v2/boost/assign/v2/ref/list_tuple/size_type.hpp                 |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/tuple/as_arglist.hpp                     |    19 ----                                    
   sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp03/as_arglist.hpp               |    47 -----------                             
   sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/as_arglist.hpp               |    54 -------------                           
   sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/data.hpp                     |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/tuple/data.hpp                           |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp                              |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp                         |    14 +--                                     
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/cpp0x.hpp                        |     5 -                                       
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp                         |    13 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/framework.hpp                    |     6                                         
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/get.hpp                          |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/range_get.hpp                    |     2                                         
   sandbox/assign_v2/boost/assign/v2/temporary/variadic_args_to_indices.hpp       |     4                                         
   sandbox/assign_v2/boost/assign/v2/temporary/variadic_sequence.hpp              |     2                                         
   sandbox/assign_v2/boost/assign/v2/temporary/variadic_vector.hpp                |     2                                         
   sandbox/assign_v2/boost/assign/v2/utility.hpp                                  |     2                                         
   sandbox/assign_v2/boost/assign/v2/utility/chain.hpp                            |     6                                         
   sandbox/assign_v2/boost/assign/v2/utility/chain/adaptor.hpp                    |     2                                         
   sandbox/assign_v2/boost/assign/v2/utility/chain/alias.hpp                      |     4                                         
   sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp                      |    18 ++--                                    
   sandbox/assign_v2/boost/assign/v2/utility/chain/iterator.hpp                   |    10 +-                                      
   sandbox/assign_v2/boost/assign/v2/utility/chain/pipe.hpp                       |     6                                         
   sandbox/assign_v2/boost/assign/v2/utility/chain/range.hpp                      |     4                                         
   sandbox/assign_v2/boost/assign/v2/utility/chain/result.hpp                     |     8 +-                                      
   sandbox/assign_v2/boost/assign/v2/utility/chain/use_const.hpp                  |     9 +-                                      
   sandbox/assign_v2/boost/assign/v2/utility/conversion.hpp                       |     2                                         
   sandbox/assign_v2/boost/assign/v2/utility/conversion/check.hpp                 |     8 +-                                      
   sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp               |    29 +++----                                 
   sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp             |    18 ++--                                    
   sandbox/assign_v2/boost/assign/v2/utility/conversion/deduce_tag.hpp            |     2                                         
   sandbox/assign_v2/boost/assign/v2/utility/conversion/dispatch.hpp              |    44 ----------                              
   sandbox/assign_v2/boost/assign/v2/utility/conversion/helper.hpp                |     2                                         
   sandbox/assign_v2/boost/assign/v2/utility/conversion/name_lookup.hpp           |    28 ------                                  
   sandbox/assign_v2/boost/assign/v2/utility/conversion/predicate.hpp             |     4                                         
   sandbox/assign_v2/boost/assign/v2/utility/csv.hpp                              |     4                                         
   sandbox/assign_v2/boost/assign/v2/utility/csv/make.hpp                         |     9 +-                                      
   sandbox/assign_v2/boost/assign/v2/utility/csv/result.hpp                       |     2                                         
   184 files changed, 682 insertions(+), 1449 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/detail.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_ER_2010_HPP
-
 #include <boost/assign/v2/detail/checking.hpp>
 #include <boost/assign/v2/detail/functor.hpp>
 #include <boost/assign/v2/detail/fwd.hpp>
@@ -17,6 +16,6 @@
 #include <boost/assign/v2/detail/traits.hpp>
 
 // /config.hpp is not to be defined
-// Don't include /checking/checking.hpp
+// /checking/checking.hpp has to be explicitly included
 
 #endif // BOOST_ASSIGN_V2_DETAIL_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/array.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,8 +10,8 @@
 #ifndef BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_ARRAY_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_ARRAY_ER_2010_HPP
 #include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/detail/traits/container/is_array.hpp>
 #include <boost/assign/v2/detail/check/equal_container/pp.hpp>
+#include <boost/assign/v2/detail/traits/container/is_array.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/deduce.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/deduce.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/deduce.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,12 +9,12 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_DEDUCE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_DEDUCE_ER_2010_HPP
+#include <boost/assign/v2/detail/traits/container/is_array.hpp>
 #include <boost/assign/v2/detail/traits/container/is_fifo.hpp>
 #include <boost/assign/v2/detail/traits/container/is_lifo.hpp>
 #include <boost/assign/v2/detail/traits/container/is_map.hpp>
-#include <boost/assign/v2/detail/traits/container/is_sorted.hpp>
-#include <boost/assign/v2/detail/traits/container/is_array.hpp>
 #include <boost/assign/v2/detail/traits/container/is_range.hpp>
+#include <boost/assign/v2/detail/traits/container/is_sorted.hpp>
 #include <boost/assign/v2/detail/traits/switch.hpp>
 
 namespace boost{

Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/fifo.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/fifo.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/fifo.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_FIFO_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_FIFO_ER_2010_HPP
+#include <boost/assign/v2/detail/check/equal_container/pp.hpp>
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/detail/traits/container/is_fifo.hpp>
-#include <boost/assign/v2/detail/check/equal_container/pp.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/lifo.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/lifo.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/lifo.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_LIFO_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_LIFO_ER_2010_HPP
+#include <boost/assign/v2/detail/check/equal_container/pp.hpp>
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/detail/traits/container/is_lifo.hpp>
-#include <boost/assign/v2/detail/check/equal_container/pp.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/pp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/pp.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/pp.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,7 +10,6 @@
 #ifndef BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_PP_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_PP_ER_2010_HPP
 #include <boost/assign/v2/detail/config/check.hpp>
-
 #include <boost/range/size.hpp>
 #include <boost/range/size_type.hpp>
 #define BOOST_ASSIGN_V2_CHECK_AUX_CONTAINER_SIZE\
@@ -19,7 +18,6 @@
         size_type n2 = boost::size( r );\
         BOOST_ASSIGN_V2_CHECK( n2 >= n1 );\
 /**/
-
 #include <boost/range/iterator_range.hpp>
 #define BOOST_ASSIGN_V2_CHECK_AUX_CONTAINER_ELEM_AT\
         typedef typename boost::iterator_range<\
@@ -27,5 +25,4 @@
         >::type elem_at_;\
         elem_at_ elem_at = boost::make_iterator_range( r );\
 /**/
-
 #endif // BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_PP_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/range.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/range.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/range.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_RANGE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_RANGE_ER_2010_HPP
-#include <boost/range/algorithm/equal.hpp>
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/detail/traits/container/is_range.hpp>
+#include <boost/range/algorithm/equal.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/sorted.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/sorted.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/sorted.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_SORTED_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_SORTED_ER_2010_HPP
-#include <boost/range/algorithm/sort.hpp>
 #include <boost/assign/v2/detail/check/equal_container/range.hpp>
+#include <boost/range/algorithm/sort.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -7,11 +7,19 @@
 //  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_CHECK_ER_2010_HPP
+#define BOOST_ASSIGN_V2_CHECK_ER_2010_HPP
 #ifndef BOOST_ASSIGN_V2_CHECK
 #include <boost/assert.hpp>
+//[check
+/*<<
+For unit-testing, do, instead,
+``
+	#include <boost/test/test_tools.hpp>
+	#define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
+``
+<<*/
 #define BOOST_ASSIGN_V2_CHECK( p ) BOOST_ASSERT( p )
+//]
 #endif // BOOST_ASSIGN_V2_CHECK
-
-// In the test suite, use, instead:
-//    #include <boost/test/test_tools.hpp>
-//    #define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
+#endif // BOOST_ASSIGN_V2_CHECK_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/config/enable_cpp0x.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/enable_cpp0x.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/enable_cpp0x.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -7,6 +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)        //
 //////////////////////////////////////////////////////////////////////////////
+#ifndef BOOST_ASSIGN_V2_ENABLE_CPP0X_ER_2010_HPP
+#define BOOST_ASSIGN_V2_ENABLE_CPP0X_ER_2010_HPP
+
 #ifndef BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <boost/preprocessor/logical/or.hpp>
 #include <boost/config.hpp>
@@ -16,26 +19,6 @@
 #else
 #define BOOST_ASSIGN_V2_ENABLE_CPP0X 1
 #endif
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 //]
-
-/*
- -- Previously,
-//#if __GNUC__ && __GXX_EXPERIMENTAL_CXX0X__
-//#define BOOST_ASSIGN_V2_ENABLE_CPP0X 1
-//#else
-//#define BOOST_ASSIGN_V2_ENABLE_CPP0X 0
-//#endif
-
- -- Alternatively,
-
-//#include <boost/preprocessor/logical/bool.hpp>
-//#define BOOST_ASSIGN_V2_ENABLE_CPP0X BOOST_PP_BOOL(__cplusplus > 199711L)
-
-(but GCC non-conformant.)
-
- -- Sources:
- http:gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html#Common-Predefined-Macros
- http:www2.research.att.com/~bs/C++0xFAQ.html
- http:msdn.microsoft.com/en-us/library/dd465215.aspx
-*/
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/config/limit_arity.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/limit_arity.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/limit_arity.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -7,13 +7,19 @@
 //  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/mpl/limits/arity.hpp>
+#ifndef BOOST_ASSIGN_V2_LIMIT_ARITY_ER_2010_HPP
+#define BOOST_ASSIGN_V2_LIMIT_ARITY_ER_2010_HPP
 #include <boost/assign/v2/detail/pp/parameter_list.hpp>
-
+#include <boost/mpl/limits/arity.hpp>
+#include <boost/preprocessor/comparison/greater.hpp>
+#include <boost/preprocessor/selection/min.hpp>
+#ifndef BOOST_ASSIGN_V2_PARAMETER_LIST_SIZE
+#error
+#endif
 #ifndef BOOST_ASSIGN_V2_LIMIT_ARITY
 //[limit_arity
 /*<< n = BOOST_ASSIGN_V2_LIMIT_ARITY
-   Overload                     | Arity
+   Overload                           | Arity
    -------------------------------------
    functor()                          |    0
    functor(x[0])                      |    1
@@ -21,14 +27,13 @@
    ...
    functor(x[0], ...., x[n-1])        |    n
 >>*/
-#define BOOST_ASSIGN_V2_LIMIT_ARITY BOOST_MPL_LIMIT_METAFUNCTION_ARITY < BOOST_ASSIGN_V2_PARAMETER_LIST_SIZE ? BOOST_ASSIGN_V2_PARAMETER_LIST_SIZE : BOOST_MPL_LIMIT_METAFUNCTION_ARITY
+#define BOOST_ASSIGN_V2_LIMIT_ARITY BOOST_PP_MIN( BOOST_MPL_LIMIT_METAFUNCTION_ARITY, BOOST_ASSIGN_V2_PARAMETER_LIST_SIZE )
 //]
-
-#else
-// Meta-function classes associated with functor
-#if BOOST_ASSIGN_V2_LIMIT_ARITY >  BOOST_MPL_LIMIT_METAFUNCTION_ARITY
+#endif // BOOST_ASSIGN_V2_LIMIT_ARITY
+//[limit_arity_requirement
+/*<<Required for some meta-function classes yielding result type of invoking a functor>>*/  
+#if BOOST_PP_GREATER( BOOST_MPL_LIMIT_METAFUNCTION_ARITY, BOOST_ASSIGN_V2_LIMIT_ARITY )
 #error
 #endif
-
-#endif // BOOST_ASSIGN_V2_LIMIT_ARITY
-
+//]
+#endif // BOOST_ASSIGN_V2_LIMIT_ARITY_ER_2010_HPP
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/detail/config/limit_csv_arity.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/limit_csv_arity.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/limit_csv_arity.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -7,9 +7,19 @@
 //  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_LIMIT_CSV_ARITY_ER_2010_HPP
+#define BOOST_ASSIGN_V2_LIMIT_CSV_ARITY_ER_2010_HPP
 #ifndef BOOST_ASSIGN_V2_LIMIT_CSV_ARITY
 //[limit_csv_arity
+/*<< n = BOOST_ASSIGN_V2_CSV_LIMIT_ARITY
+   Overload                           | Arity
+   -------------------------------------
+   csv_fun(t[0])                      |    1
+   csv_fun(t[0], t[1])                |    2
+   ...
+   csv_fun(t[0], ...., t[n-1])        |    n
+>>*/
 #define BOOST_ASSIGN_V2_LIMIT_CSV_ARITY 20
 //]
 #endif // BOOST_ASSIGN_V2_LIMIT_CSV_ARITY
+#endif // BOOST_ASSIGN_V2_LIMIT_CSV_ARITY_ER_2010_HPP
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -7,21 +7,23 @@
 //  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/preprocessor/arithmetic/inc.hpp>
-#include <boost/mpl/limits/arity.hpp>
-
-#ifndef BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY
+#ifndef BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY_ER_2010_HPP
+#define BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY_ER_2010_HPP
+#include <boost/assign/v2/detail/config/limit_arity.hpp>
+#include <boost/preprocessor/comparison/greater.hpp>
 //[limit_lvalue_const_arity
 /*<<
    Maximum arity for which functors are overloaded for any combination of const 
    and non-const lvalues under C++03. Be warned that the number of function
    overloads increases geometrically with this number.
-*>>/
+>>*/
+#ifndef BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY
 #define BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY 2
+#endif
 //]
-#endif // BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY
-
-#include <boost/assign/v2/detail/config/limit_arity.hpp>
-#if BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY >  BOOST_ASSIGN_V2_LIMIT_ARITY
+//[limit_lvalue_const_arity_requirement
+#if BOOST_PP_GREATER( BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY,  BOOST_ASSIGN_V2_LIMIT_ARITY )
 #error
 #endif
+//]
+#endif // BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY_ER_2010_HPP
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/detail/functor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/functor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/functor.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_FUNCTOR_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_FUNCTOR_ER_2010_HPP
-
-#include <boost/assign/v2/detail/functor/identity.hpp>
-#include <boost/assign/v2/detail/functor/constructor.hpp>
 #include <boost/assign/v2/detail/functor/crtp_unary_and_up.hpp>
+#include <boost/assign/v2/detail/functor/constructor.hpp>
+#include <boost/assign/v2/detail/functor/identity.hpp>
 #include <boost/assign/v2/detail/functor/new.hpp>
 #include <boost/assign/v2/detail/functor/post_increment.hpp>
 

Modified: sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,18 +10,14 @@
 #ifndef BOOST_ASSIGN_V2_DETAIL_FUNCTOR_CONSTRUCTOR_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_FUNCTOR_CONSTRUCTOR_ER_2010_HPP
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-//#include <boost/assign/v2/detail/traits/container/value.hpp>// TODO remove
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <utility>
 #else
-#include <boost/preprocessor/repetition/repeat_from_to.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/range/reference.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/mpl/always.hpp>
 #include <boost/assign/v2/detail/config/limit_arity.hpp>
 #include <boost/assign/v2/detail/functor/crtp_unary_and_up.hpp>
+#include <boost/mpl/always.hpp>
+#include <boost/preprocessor/arithmetic.hpp>
+#include <boost/preprocessor/repetition.hpp>
 #endif
 
 namespace boost{
@@ -31,9 +27,7 @@
 
     template<typename T>
     class constructor
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-// do nothing
-#else
+#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
     : public functor_aux::crtp_unary_and_up<
         functor_aux::constructor<T>,
         ::boost::mpl::always<T>
@@ -63,8 +57,8 @@
         using super_::operator();
         T operator()()const{ return T(); }
 
-#define BOOST_ASSIGN_V2_MACRO(z,N,data) \
-    template<BOOST_PP_ENUM_PARAMS(N,typename T)> \
+#define BOOST_ASSIGN_V2_MACRO(z, N,data) \
+    template<BOOST_PP_ENUM_PARAMS(N, typename T)> \
     T impl( BOOST_PP_ENUM_BINARY_PARAMS(N, T, &_) )const{ \
         return T( BOOST_PP_ENUM_PARAMS(N, _) ); \
     } \
@@ -77,19 +71,8 @@
 )
 #undef BOOST_ASSIGN_V2_MACRO
 
-#endif
-    };
-
-/*
-    TODO remove
-    template<typename V>
-    struct deduce_constructor
-    {
-        typedef typename container_traits::value<V>::type value_;
-        typedef functor_aux::constructor<value_> type;
-        static type call(){ return functor_aux::constructor<value_>(); }
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
     };
-*/
 
 }// functor_aux
 namespace result_of{

Modified: sandbox/assign_v2/boost/assign/v2/detail/functor/crtp_unary_and_up.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/functor/crtp_unary_and_up.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/functor/crtp_unary_and_up.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,19 +9,13 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_FUNCTOR_CRTP_UNARY_AND_UP_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_FUNCTOR_CRTP_UNARY_AND_UP_ER_2010_HPP
-#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-
-#include <iostream> // TODO remove
 
+#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
 #ifndef BOOST_ASSIGN_V2_ENABLE_CPP0X
 #error
 #endif
 
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-
-// There should be no use for this file under CPP0x
-
-#else
+#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
 
 // The crtp defined below makes it easy to overload on the number of
 // arguments, while allowing within a certain limit, any mixture of
@@ -65,7 +59,7 @@
 namespace v2{
 namespace functor_aux{
 
-    template<typename D,typename F>
+    template<typename D, typename F>
     class crtp_unary_and_up
     {
         protected:
@@ -75,11 +69,7 @@
 
         public:
 
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-
-// do nothing
-
-#else
+// Non-const/const overloads :
 
 #define BOOST_ASSIGN_V2_MACRO1(r, SeqU) \
     template<BOOST_ASSIGN_V2_TPL_PARAMETER_LIST(SeqU)> \
@@ -99,6 +89,7 @@
     BOOST_PP_SEQ_FIRST_N(BOOST_PP_INC(n), BOOST_ASSIGN_V2_SEQ_TPL_BINARY_ARG_LIST)\
 ) \
 /**/
+
 BOOST_PP_REPEAT(
     BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY,
     BOOST_ASSIGN_V2_MACRO2,
@@ -108,11 +99,13 @@
 #undef BOOST_ASSIGN_V2_MACRO1
 #undef BOOST_ASSIGN_V2_MACRO2
 
+// Non-const only / const-only overloads :
+
 #define BOOST_ASSIGN_V2_MACRO(z, N, data) \
     template<BOOST_PP_ENUM_PARAMS(N, typename T)> \
     typename ::boost::mpl::apply1< \
         F, \
-        BOOST_PP_CAT(boost::mpl::vector,N)<BOOST_PP_ENUM_PARAMS(N, T)> \
+        BOOST_PP_CAT(::boost::mpl::vector, N)<BOOST_PP_ENUM_PARAMS(N, T)> \
     >::type \
     operator()( BOOST_PP_ENUM_BINARY_PARAMS(N, T, &_) )const{ \
         return this->derived().template impl< \
@@ -138,9 +131,8 @@
     BOOST_ASSIGN_V2_MACRO,
     ~
 )
-#undef BOOST_ASSIGN_V2_MACRO
 
-#endif // #if BOOST_ASSIGN_V2_ENABLE_CPP0X
+#undef BOOST_ASSIGN_V2_MACRO
 
     };
 
@@ -149,7 +141,5 @@
 }// assign
 }// boost
 
-
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-
+#endif // !BOOST_ASSIGN_V2_ENABLE_CPP0X
 #endif // BOOST_ASSIGN_V2_DETAIL_FUNCTOR_CRTP_UNARY_AND_UP_ER_2010_HPP

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,19 +10,16 @@
 #ifndef BOOST_ASSIGN_V2_DETAIL_FUNCTOR_NEW_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_FUNCTOR_NEW_ER_2010_HPP
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-//#include <boost/assign/v2/detail/traits/container/value.hpp>//TODO remove
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <utility>
 #else
-#include <boost/preprocessor/repetition/repeat_from_to.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
+#include <boost/assign/v2/detail/config/limit_arity.hpp>
+#include <boost/assign/v2/detail/functor/crtp_unary_and_up.hpp>
 #include <boost/mpl/always.hpp>
+#include <boost/preprocessor/repetition.hpp>
 #include <boost/range/reference.hpp>
 #include <boost/type_traits/remove_cv.hpp>
-#include <boost/assign/v2/detail/config/limit_arity.hpp>
-#include <boost/assign/v2/detail/functor/crtp_unary_and_up.hpp>
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
 namespace boost{
 namespace assign{
@@ -38,7 +35,7 @@
         functor_aux::new_<T>,
         ::boost::mpl::always<T*>
     >
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
     {
         typedef T* ptr_;
         typedef functor_aux::new_<T> this_;
@@ -78,20 +75,10 @@
     ~
 )
 #undef BOOST_ASSIGN_V2_MACRO
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
     };
 
-/*
-    TODO remove
-    template<typename V>
-    struct deduce_new_
-    {
-        typedef typename container_traits::value<V>::type value_;
-        typedef functor_aux::new_<value_> type;
-        static type call(){ return functor_aux::new_<value_>(); }
-    };
-*/
 }// functor_aux
 namespace result_of{
 

Modified: sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_KEYWORD_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_KEYWORD_ER_2010_HPP
-
-#include <boost/assign/v2/detail/keyword/nil.hpp>
 #include <boost/assign/v2/detail/keyword/ignore.hpp>
+#include <boost/assign/v2/detail/keyword/nil.hpp>
 
 #endif // BOOST_ASSIGN_V2_DETAIL_KEYWORD_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/pp/forward.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/pp/forward.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/pp/forward.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -17,5 +17,5 @@
 #else
 #define BOOST_ASSIGN_V2_FORWARD_PARAM(T, t) T& t
 #define BOOST_ASSIGN_V2_FORWARD_ARG(T, t) t
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 #endif // BOOST_ASSIGN_V2_DETAIL_PP_FORWARD_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/pp/parameter_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/pp/parameter_list.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/pp/parameter_list.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -13,6 +13,7 @@
 #include <boost/preprocessor/comma_if.hpp>
 #include <boost/preprocessor/repetition.hpp>
 #include <boost/preprocessor/seq.hpp>
+#include <boost/preprocessor/tuple/to_seq.hpp>
 #define BOOST_ASSIGN_V2_BOOST_ASSIGN_V2_PARAMETER_LIST_iter(r, data, i, U) \
     BOOST_PP_COMMA_IF(i) \
     U & \
@@ -24,12 +25,11 @@
 #define BOOST_ASSIGN_V2_ARG_LIST(SeqU, data) \
     BOOST_PP_ENUM_PARAMS(BOOST_PP_SEQ_SIZE(SeqU), data)
 /**/
-
 #define BOOST_ASSIGN_V2_TPL_PARAMETER_LIST(SeqU) BOOST_PP_ENUM_PARAMS(BOOST_PP_SEQ_SIZE(SeqU), typename T)
 #define BOOST_ASSIGN_V2_TPL_ARG_LIST(SeqU) BOOST_PP_SEQ_ENUM(SeqU)
-
-#include <boost/preprocessor/tuple/to_seq.hpp>
+//[parameter_list_size
+/*<<Non-override-able constant supporting the definition of functor overloads>>*/
 #define BOOST_ASSIGN_V2_PARAMETER_LIST_SIZE 10
+//]
 #define BOOST_ASSIGN_V2_SEQ_TPL_BINARY_ARG_LIST BOOST_PP_TUPLE_TO_SEQ(BOOST_ASSIGN_V2_PARAMETER_LIST_SIZE,((T0 const)(T0),(T1 const)(T1),(T2 const)(T2),(T3 const)(T3),(T4 const)(T4),(T5 const)(T5),(T6 const)(T6),(T7 const)(T7),(T8 const)(T8),(T9 const)(T9)))
-
 #endif // BOOST_ASSIGN_V2_PAREMETER_LIST_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_TRAITS_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_TRAITS_ER_2010_HPP
-
 #include <boost/assign/v2/detail/traits/type.hpp>
 #include <boost/assign/v2/detail/traits/container.hpp>
-#include <bosot/assign/v2/detail/traits/type/or_const.hpp>
 
 #endif // BOOST_ASSIGN_V2_DETAIL_TRAITS_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_TRAITS_CONTAINER_ER_2010_HPP
-
-#include <boost/assign/v2/detail/traits/container/has_push.hpp>
 #include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
+#include <boost/assign/v2/detail/traits/container/has_push.hpp>
+#include <boost/assign/v2/detail/traits/container/is_array.hpp>
 #include <boost/assign/v2/detail/traits/container/is_associative.hpp>
 #include <boost/assign/v2/detail/traits/container/is_fifo.hpp>
 #include <boost/assign/v2/detail/traits/container/is_lifo.hpp>
@@ -20,7 +20,6 @@
 #include <boost/assign/v2/detail/traits/container/is_range.hpp>
 #include <boost/assign/v2/detail/traits/container/is_set.hpp>
 #include <boost/assign/v2/detail/traits/container/is_sorted.hpp>
-#include <boost/assign/v2/detail/traits/container/is_array.hpp>
 #include <boost/assign/v2/detail/traits/container/ptr_to_value.hpp>
 #include <boost/assign/v2/detail/traits/container/ptr_to_value_container.hpp>
 #include <boost/assign/v2/detail/traits/container/static_size.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/forward_to_value.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/forward_to_value.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/forward_to_value.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -16,7 +16,7 @@
 namespace v2{
 namespace container_traits{
 
-    template<template<typename T> class F,typename V>
+    template<template<typename T> class F, typename V>
     struct forward_to_value: F<
         typename value_container<V>::type
     >{};

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/fwd.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/fwd.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -14,25 +14,25 @@
 namespace std{
 
     // www.sgi.com/tech/stl/Deque.html
-    template<typename T,typename A> class deque;
+    template<typename T, typename A> class deque;
 
     // http://www.sgi.com/tech/stl/List.html
-    template<typename T,typename A> class list;
+    template<typename T, typename A> class list;
 
     // http://www.sgi.com/tech/stl/Map.html
-    template<typename K,typename T,typename C,typename A> class map;
+    template<typename K, typename T, typename C, typename A> class map;
 
     // http://www.sgi.com/tech/stl/queue.html
-    template<typename T,typename S> class queue;
+    template<typename T, typename S> class queue;
 
     // http://www.sgi.com/tech/stl/set.html
-    template<typename T,typename C,typename A> class set;
+    template<typename T, typename C, typename A> class set;
 
     // http://www.sgi.com/tech/stl/stack.html
-    template<typename T,typename S> class stack;
+    template<typename T, typename S> class stack;
 
     // http://www.sgi.com/tech/stl/Vector.html
-    template<typename T,typename A> class vector;
+    template<typename T, typename A> class vector;
 
 }// std
 namespace boost{

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/has_push.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/has_push.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/has_push.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,18 +9,18 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_HAS_PUSH_ER_2010_HPP
 #define BOOST_ASSIGN_V2_TRAITS_CONTAINER_HAS_PUSH_ER_2010_HPP
+#include <boost/assign/v2/detail/traits/container/value.hpp>
+#include <boost/config.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/type_traits/add_const.hpp>
-#include <boost/config.hpp>
 #include <boost/type_traits/detail/yes_no_type.hpp>
-#include <boost/assign/v2/detail/traits/container/value.hpp>
 
 namespace boost{
 namespace assign{
 namespace v2{
 namespace container_traits{
 
-    template<typename V,typename T
+    template<typename V, typename T
         = typename container_traits::value<V>::type>
     struct has_push{
 

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/is.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/is.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/is.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -7,12 +7,12 @@
 //  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_TRAITS_CONTAINER_IS
-#include <boost/preprocessor/cat.hpp>
-#include <boost/type_traits/remove_cv.hpp>
+#ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_ER_2010_HPP
+#define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_ER_2010_HPP
 #include <boost/assign/v2/detail/traits/container/fwd.hpp>
 #include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
-
+#include <boost/preprocessor/cat.hpp>
+#include <boost/type_traits/remove_cv.hpp>
 #define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS(name)\
 namespace container_traits{\
     template<typename V>\
@@ -22,5 +22,4 @@
     >{};\
 }\
 /**/
-
-#endif // BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS
+#endif // BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_associative.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_associative.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_associative.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_ASSOCIATIVE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_ASSOCIATIVE_ER_2010_HPP
-#include <boost/mpl/or.hpp>
 #include <boost/assign/v2/detail/traits/container/is_map.hpp>
 #include <boost/assign/v2/detail/traits/container/is_set.hpp>
+#include <boost/mpl/or.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_fifo.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_fifo.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_fifo.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -22,7 +22,7 @@
     template<typename V>
     struct is_fifo : ::boost::mpl::false_{};
 
-    template<typename T,typename A>
+    template<typename T, typename A>
     struct is_fifo< std::queue<T,A> > : ::boost::mpl::true_{};
 
 }// container_traits_aux

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_lifo.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_lifo.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_lifo.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -22,7 +22,7 @@
     template<typename V>
     struct is_lifo : ::boost::mpl::false_{};
 
-    template<typename T,typename A>
+    template<typename T, typename A>
     struct is_lifo< std::stack<T,A> > : ::boost::mpl::true_{};
 
 }// container_traits_aux

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_map.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_map.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_map.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -22,7 +22,7 @@
     template<typename V>
     struct is_map : ::boost::mpl::false_{};
 
-    template<typename K,typename D,typename C,typename A>
+    template<typename K, typename D, typename C, typename A>
     struct is_map<
         std::map<K,D,C,A>
     > : ::boost::mpl::true_{};

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_ptr_container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_ptr_container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_ptr_container.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_PTR_CONTAINER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_PTR_CONTAINER_ER_2010_HPP
-#include <boost/mpl/identity.hpp>
-#include <boost/mpl/eval_if.hpp>
 #include <boost/assign/v2/detail/traits/container/ptr_to_value.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_range.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_range.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_range.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_RANGE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_RANGE_ER_2010_HPP
-#include <boost/mpl/bool.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_set.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_set.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_set.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -22,7 +22,7 @@
     template<typename V>
     struct is_set : ::boost::mpl::false_{};
 
-    template<typename K,typename C,typename A>
+    template<typename K, typename C, typename A>
     struct is_set<
         std::set<K,C,A>
     > : ::boost::mpl::true_{};

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_sorted.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_sorted.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/is_sorted.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -22,11 +22,11 @@
     template<typename V>
     struct is_sorted : ::boost::mpl::false_{};
 
-    template<typename T,typename C,typename A>
-    struct is_sorted< std::set<T,C,A> > : ::boost::mpl::true_{};
+    template<typename T, typename C, typename A>
+    struct is_sorted< std::set<T, C, A> > : ::boost::mpl::true_{};
 
-    template<typename K,typename T,typename C,typename A>
-    struct is_sorted< std::map<K,T,C,A> > : ::boost::mpl::true_{};
+    template<typename K, typename T, typename C, typename A>
+    struct is_sorted< std::map<K, T, C, A> > : ::boost::mpl::true_{};
 
 }// container_traits_aux
 

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/ptr_fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/ptr_fwd.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/ptr_fwd.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -16,7 +16,7 @@
     template
     <
         class T,
-        std::size_t N, // TODO verify
+        std::size_t N, 
         class CloneAllocator
     >
     class ptr_array;

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/ptr_to_value.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/ptr_to_value.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/ptr_to_value.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -31,7 +31,7 @@
 
 namespace ptr_to_value_aux{
 
-    template<typename A,typename T> struct allocator{};
+    template<typename A, typename T> struct allocator{};
 
     template<typename T>
     struct allocator<std::allocator<void*>, T>
@@ -73,7 +73,7 @@
 
     };
 
-    template<typename V,template<typename,typename> class F>
+    template<typename V,template<typename, typename> class F>
     struct seq_like : ptr_to_value_aux::common<V>{
 
         typedef F<
@@ -83,7 +83,7 @@
 
     };
 
-    template<typename V,template<typename,typename,typename,typename> class F>
+    template<typename V,template<typename, typename, typename, typename> class F>
     struct map_like : ptr_to_value_aux::common<V>{
 
         typedef F<
@@ -95,7 +95,7 @@
 
     };
 
-    template<typename V,template<typename,typename,typename> class F>
+    template<typename V,template<typename, typename, typename> class F>
     struct set_like : ptr_to_value_aux::common<V>{
 
         typedef F<
@@ -107,7 +107,7 @@
     };
 
     template<typename V,
-        template<typename,typename,typename,typename,typename> class F>
+        template<typename, typename, typename, typename, typename> class F>
     class unordered_map_like : ptr_to_value_aux::common<V>{
 
         typedef F<
@@ -121,7 +121,7 @@
     };
 
     template<typename V,
-        template<typename,typename,typename,typename> class F>
+        template<typename, typename, typename, typename> class F>
     class unordered_set_like : ptr_to_value_aux::common<V>{
 
         typedef F<

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/static_size.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/static_size.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/static_size.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_STATIC_SIZE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_TRAITS_CONTAINER_STATIC_SIZE_ER_2010_HPP
-#include <boost/mpl/size_t.hpp>
 #include <boost/assign/v2/detail/traits/container/fwd.hpp>
 #include <boost/assign/v2/detail/traits/container/ptr_fwd.hpp>
+#include <boost/mpl/size_t.hpp>
 
 namespace boost{
 namespace assign{
@@ -26,13 +26,13 @@
 
     };
 
-    template<typename T,std::size_t N>
+    template<typename T, std::size_t N>
     struct static_size< boost::array<T,N> >
         : ::boost::mpl::size_t<
             boost::array<T,N>::static_size
         >{};
 
-    template<typename T,std::size_t N,typename C>
+    template<typename T, std::size_t N, typename C>
     struct static_size< boost::ptr_array<T, N, C> >
         : ::boost::mpl::size_t<
             N

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/value.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/value.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/value.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_VALUE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_TRAITS_CONTAINER_VALUE_ER_2010_HPP
+#include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
+#include <boost/assign/v2/detail/traits/type/value.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/type_traits/remove_pointer.hpp>
-#include <boost/assign/v2/detail/traits/type/value.hpp>
-#include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
 
 namespace boost{
 namespace assign{
@@ -21,12 +21,8 @@
 namespace container_traits
 {
 
-    // TODO
-    // maybe this should be
-    //     remove_reference<V::reference>::type
-    // or
-    //     range_value<V>, is available.
-    // Think about ptr_container in making this change.
+    // TODO think about range_value<V>, remove_reference<V::reference>::type
+    // as alternative, taking into account (ptr_container)s.
     template<typename V>
     struct value : container_traits::forward_to_value<
         type_traits::value,

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/container/value_container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/container/value_container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/container/value_container.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,10 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_VALUE_CONTAINER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_TRAITS_CONTAINER_VALUE_CONTAINER_ER_2010_HPP
-#include <boost/mpl/identity.hpp>
-#include <boost/mpl/eval_if.hpp>
 #include <boost/assign/v2/detail/traits/container/is_ptr_container.hpp>
 #include <boost/assign/v2/detail/traits/container/ptr_to_value_container.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/switch.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/switch.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/switch.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,12 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_DETAIL_TRAITS_SWITCH_ER_2010_HPP
 #define BOOST_ASSIGN_V2_DETAIL_TRAITS_SWITCH_ER_2010_HPP
+#include <boost/mpl/apply.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/identity.hpp>
-#include <boost/mpl/apply.hpp>
-//#include <boost/mpl/always.hpp>
-#include <boost/mpl/placeholders.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/type.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/type.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/type.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -7,11 +7,10 @@
 //  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_TRAITS_TYPE_ER_2010_HPP
-#define BOOST_ASSIGN_V2_TRAITS_TYPE_ER_2010_HPP
-
+#ifndef BOOST_ASSIGN_V2_DETAIL_TRAITS_TYPE_ER_2010_HPP
+#define BOOST_ASSIGN_V2_DETAIL_TRAITS_TYPE_ER_2010_HPP
 #include <boost/assign/v2/detail/traits/type/has_value_type.hpp>
 #include <boost/assign/v2/detail/traits/type/meta_convert.hpp>
 #include <boost/assign/v2/detail/traits/type/value.hpp>
 
-#endif // BOOST_ASSIGN_V2_TRAITS_TYPE_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_DETAIL_TRAITS_TYPE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/type/meta_convert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/type/meta_convert.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/type/meta_convert.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -19,7 +19,7 @@
     template<typename Tag = boost::use_default>
     struct meta_convert{
 
-        template<typename T1,typename T2>
+        template<typename T1, typename T2>
         struct apply : ref::convert_traits::reference<T1, T2>{};
 
     };

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/type/or_const.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -37,5 +37,4 @@
 }// boost
 
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-
 #endif // BOOST_ASSIGN_V2_DETAIL_TYPE_TRAITS_OR_CONST_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/detail/traits/type/value.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/traits/type/value.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/traits/type/value.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_TRAITS_TYPE_VALUE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_TRAITS_TYPE_VALUE_ER_2010_HPP
-#include <boost/type_traits/remove_cv.hpp>
 #include <boost/mpl/identity.hpp>
+#include <boost/type_traits/remove_cv.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_ER_2010_HPP
-
 #include <boost/assign/v2/put/container.hpp>
 #include <boost/assign/v2/put/deduce.hpp>
 #include <boost/assign/v2/put/deque.hpp>
@@ -18,4 +17,4 @@
 #include <boost/assign/v2/put/modulo.hpp>
 #include <boost/assign/v2/put/pipe.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/container.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_CONTAINER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_CONTAINER_ER_2010_HPP
-
 #include <boost/assign/v2/put/container/functor.hpp>
 #include <boost/assign/v2/put/container/range.hpp>
 

Modified: sandbox/assign_v2/boost/assign/v2/put/container/functor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/functor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/functor.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_ER_2010_HPP
-
 #include <boost/assign/v2/put/container/functor/adapter.hpp>
 #include <boost/assign/v2/put/container/functor/make.hpp>
 #include <boost/assign/v2/put/container/functor/replace_parameter.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/put/container/functor/adapter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/functor/adapter.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/functor/adapter.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,16 +10,16 @@
 #ifndef BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_ADAPTER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_ADAPTER_ER_2010_HPP
 #include <boost/assign/v2/ref/wrapper/copy.hpp>
+#include <boost/assign/v2/put/container/functor/fwd.hpp> // consistency
 #include <boost/assign/v2/put/frame/crtp.hpp>
 #include <boost/assign/v2/put/frame/modifier.hpp>
-#include <boost/assign/v2/put/container/functor/fwd.hpp> // consistency
 
 namespace boost{
 namespace assign{
 namespace v2{
 namespace put_aux{
 
-    template<typename C,typename F, typename Tag>
+    template<typename C, typename F, typename Tag>
     class adapter
         : protected ref::wrapper< ref::assign_tag::copy, C >
         , public put_aux::crtp< C, F, Tag, adapter<C, F, Tag> >
@@ -39,16 +39,18 @@
         public:
 
         adapter(){}
-        explicit adapter( C& v ) : super1_t( v ) {}
-        explicit adapter( C& v, F const& f )
-            : super1_t( v ), super2_t( f )
-            {
-                // This constructor is required by crtp
-                // when Tag or F is modified.
-            }
+        explicit adapter( C& cont ) : super1_t( cont ) {}
+
+		// TODO remove un-necessary constructor
+//        explicit adapter( C& cont, F const& f )
+//            : super1_t( cont ), super2_t( f )
+//            {
+//                // This constructor is required by crtp
+//                // when Tag or F is modified.
+//            }
 
-        explicit adapter( C& v, F const& f, modifier_ const& m )
-            : super1_t( v ), super2_t( f, m )
+        explicit adapter( C& cont, F const& f, modifier_ const& m )
+            : super1_t( cont ), super2_t( f, m )
             {
                 // This constructor is required by crtp
                 // when Tag or F is modified.

Modified: sandbox/assign_v2/boost/assign/v2/put/container/functor/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/functor/fwd.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/functor/fwd.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -15,7 +15,7 @@
 namespace v2{
 namespace put_aux{
 
-    template<typename C,typename F, typename Tag> class adapter;
+    template<typename C, typename F, typename Tag> class adapter;
 
 }// put_aux
 }// v2

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_MAKE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_MAKE_ER_2010_HPP
-#include <boost/assign/v2/put/deduce/modifier/dependee.hpp>
 #include <boost/assign/v2/put/container/functor/adapter.hpp>
 #include <boost/assign/v2/put/container/functor/result_of.hpp>
+#include <boost/assign/v2/put/deduce/modifier/dependee.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/put/container/functor/replace_parameter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/functor/replace_parameter.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/functor/replace_parameter.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,15 +9,15 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_REPLACE_PARAMETER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_REPLACE_PARAMETER_ER_2010_HPP
-#include <boost/assign/v2/put/frame/replace_parameter.hpp>
 #include <boost/assign/v2/put/container/functor/fwd.hpp>
+#include <boost/assign/v2/put/frame/replace_parameter.hpp>
 
 namespace boost{
 namespace assign{
 namespace v2{
 namespace put_aux{
 
-    template<typename C,typename F, typename Tag>
+    template<typename C, typename F, typename Tag>
     struct replace_fun< put_aux::adapter<C, F, Tag> >
     {
         template<typename F1>

Modified: sandbox/assign_v2/boost/assign/v2/put/container/functor/result_of.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/functor/result_of.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/functor/result_of.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_RESULT_OF_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_RESULT_OF_ER_2010_HPP
+#include <boost/assign/v2/put/container/functor/fwd.hpp>
 #include <boost/assign/v2/put/deduce/fun.hpp>
 #include <boost/assign/v2/put/deduce/modifier/tag.hpp>
-#include <boost/assign/v2/put/container/functor/fwd.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/put/container/range.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/range.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/range.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_RANGE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_RANGE_ER_2010_HPP
-#include <boost/range/algorithm/for_each.hpp>
 #include <boost/assign/v2/put/container/functor.hpp>
+#include <boost/range/algorithm/for_each.hpp>
 
 namespace boost{
 namespace assign{

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_DEDUCE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_DEDUCE_ER_2010_HPP
-
 #include <boost/assign/v2/put/deduce/fun.hpp>
 #include <boost/assign/v2/put/deduce/modifier/tag.hpp>
-
 // Derived of crtp<> have to include this file:
 // #include <boost/assign/v2/put/deduce/modifier/dependee.hpp>
 

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_DEDUCE_FUN_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_DEDUCE_FUN_ER_2010_HPP
-#include <boost/mpl/eval_if.hpp>
-#include <boost/assign/v2/detail/traits/container/value.hpp>
 #include <boost/assign/v2/detail/traits/container/is_ptr_container.hpp>
+#include <boost/assign/v2/detail/traits/container/value.hpp>
 #include <boost/assign/v2/detail/functor/constructor.hpp>
 #include <boost/assign/v2/detail/functor/new.hpp>
+#include <boost/mpl/eval_if.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/put/deduce/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deduce/modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deduce/modifier.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_DEDUCE_MODIFIER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_DEDUCE_MODIFIER_ER_2010_HPP
-
-#include <boost/assign/v2/put/modifier/tag.hpp>
 #include <boost/assign/v2/put/modifier/dependee.hpp>
+#include <boost/assign/v2/put/modifier/tag.hpp>
 
 #endif // BOOST_ASSIGN_V2_PUT_DEDUCE_MODIFIER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/deduce/modifier/dependee.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deduce/modifier/dependee.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deduce/modifier/dependee.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_DEDUCE_MODIFIER_DEPENDEE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_DEDUCE_MODIFIER_DEPENDEE_ER_2010_HPP
-
 #include <boost/assign/v2/put/modifier/insert.hpp>
 #include <boost/assign/v2/put/modifier/iterate.hpp>
 #include <boost/assign/v2/put/modifier/push.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/put/deduce/modifier/tag.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deduce/modifier/tag.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deduce/modifier/tag.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,18 +9,16 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_DEDUCE_MODIFIER_TAG_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_DEDUCE_MODIFIER_TAG_ER_2010_HPP
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-#include <boost/assign/v2/detail/traits/switch.hpp>
-#include <boost/assign/v2/detail/traits/container/is_array.hpp>
-#include <boost/assign/v2/detail/traits/container/has_push.hpp>
-#include <boost/assign/v2/detail/traits/container/is_associative.hpp>
-
 #include <boost/assign/v2/put/modifier/insert/tag.hpp>
 #include <boost/assign/v2/put/modifier/iterate/tag.hpp>
 #include <boost/assign/v2/put/modifier/push/tag.hpp>
 #include <boost/assign/v2/put/modifier/push_back/tag.hpp>
+#include <boost/assign/v2/detail/traits/container/has_push.hpp>
+#include <boost/assign/v2/detail/traits/container/is_associative.hpp>
+#include <boost/assign/v2/detail/traits/container/is_array.hpp>
+#include <boost/assign/v2/detail/traits/switch.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 namespace boost{
 namespace assign{

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,10 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_DEQUE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_DEQUE_ER_2010_HPP
-
 #include <boost/assign/v2/put/deque/cont.hpp>
 #include <boost/assign/v2/put/deque/conversion.hpp>
 #include <boost/assign/v2/put/deque/csv.hpp>
 #include <boost/assign/v2/put/deque/functor.hpp>
 #include <boost/assign/v2/put/deque/replace_parameter.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_DEQUE_ER_2010_HPP

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,16 +10,15 @@
 #ifndef BOOST_ASSIGN_V2_PUT_DEQUE_CONT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_DEQUE_CONT_ER_2010_HPP
 #include <deque>
+#include <boost/assign/v2/put/frame/crtp.hpp>
+#include <boost/assign/v2/put/frame/modifier.hpp>
+#include <boost/assign/v2/put/deque/fwd.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
 #include <boost/range/size.hpp>
 #include <boost/range/size_type.hpp>
 
-#include <boost/assign/v2/put/frame/crtp.hpp>
-#include <boost/assign/v2/put/frame/modifier.hpp>
-#include <boost/assign/v2/put/deque/fwd.hpp>
-
 namespace boost{
 namespace assign{
 namespace v2{

Modified: sandbox/assign_v2/boost/assign/v2/put/deque/conversion.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/conversion.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/conversion.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,7 +10,8 @@
 #ifndef BOOST_ASSIGN_V2_PUT_DEQUE_CONVERSION_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_DEQUE_CONVERSION_ER_2010_HPP
 #include <boost/assign/v2/put/deque/fwd.hpp>
-#include <boost/assign/v2/utility/conversion/name_lookup.hpp>
+#include <boost/assign/v2/utility/conversion/convert.hpp>
+#include <boost/assign/v2/utility/conversion/converter.hpp>
 
 namespace boost{
 namespace assign{
@@ -19,7 +20,8 @@
 
 #define BOOST_ASSIGN_V2_SEQ (T)(F)(Tag)
 #define BOOST_ASSIGN_V2_R deque_cont<T, F, Tag>
-BOOST_ASSIGN_V2_UTILITY_CONVERSION_NAME_LOOKUP(BOOST_ASSIGN_V2_SEQ, BOOST_ASSIGN_V2_R)
+BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_NAME_LOOKUP(BOOST_ASSIGN_V2_SEQ, BOOST_ASSIGN_V2_R)
+BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER_NAME_LOOKUP(BOOST_ASSIGN_V2_SEQ, BOOST_ASSIGN_V2_R)
 #undef BOOST_ASSIGN_V2_SEQ
 #undef BOOST_ASSIGN_V2_R
 
@@ -28,4 +30,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_DEQUE_CONVERSION_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/deque/csv.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/csv.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/csv.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,20 +9,18 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_DEQUE_CSV_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_DEQUE_CSV_ER_2010_HPP
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/remove_cv.hpp>
 #include <boost/assign/v2/detail/keyword/nil.hpp>
-#include <boost/assign/v2/put/deque/cont.hpp>
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
+#include <boost/assign/v2/put/deque/cont.hpp>
 #include <boost/assign/v2/put/deque/functor.hpp>
+#include <boost/type_traits/decay.hpp>
+#include <boost/type_traits/remove_cv.hpp>
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <utility>
 #else
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/repetition/repeat_from_to.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
 #include <boost/assign/v2/detail/config/limit_csv_arity.hpp>
+#include <boost/preprocessor/arithmetic/inc.hpp>
+#include <boost/preprocessor/repetition.hpp>
 #endif
 
 namespace boost{

Modified: sandbox/assign_v2/boost/assign/v2/put/deque/functor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/functor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/functor.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,24 +9,23 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_DEQUE_FUNCTOR_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_DEQUE_FUNCTOR_ER_2010_HPP
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/remove_cv.hpp>
 #include <boost/assign/v2/detail/keyword/nil.hpp>
 #include <boost/assign/v2/put/deque/cont.hpp>
 #include <boost/assign/v2/put/deduce/fun.hpp>
-#include <boost/assign/v2/put/deduce/modifier/tag.hpp>
 #include <boost/assign/v2/put/deduce/modifier/dependee.hpp>
-
+#include <boost/assign/v2/put/deduce/modifier/tag.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/bool.hpp>
+#include <boost/type_traits/remove_cv.hpp>
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <utility>
 #else
-#include <boost/preprocessor/arithmetic.hpp>
-#include <boost/preprocessor/repetition.hpp>
-#include <boost/preprocessor/seq.hpp>
 #include <boost/assign/v2/detail/config/limit_arity.hpp>
 #include <boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp>
 #include <boost/assign/v2/detail/pp/parameter_list.hpp>
+#include <boost/preprocessor/arithmetic.hpp>
+#include <boost/preprocessor/repetition.hpp>
+#include <boost/preprocessor/seq.hpp>
 #endif
 
 namespace boost{
@@ -118,7 +117,6 @@
 
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
-
 }// v2
 }// assign
 }// boost

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -12,7 +12,7 @@
 
 #include <boost/assign/v2/put/frame/crtp.hpp>
 #include <boost/assign/v2/put/frame/modifier.hpp>
-#include <boost/assign/v2/put/frame/sub.hpp>
 #include <boost/assign/v2/put/frame/replace_parameter.hpp>
+#include <boost/assign/v2/put/frame/sub.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_FRAME_ER_2010_HPP

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,29 +9,24 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_FRAME_CRTP_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_FRAME_CRTP_ER_2010_HPP
-#include <boost/mpl/always.hpp>
-#include <boost/mpl/apply.hpp>
-#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/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>
-
+#include <boost/mpl/always.hpp>
+#include <boost/mpl/apply.hpp>
+#include <boost/utility/enable_if.hpp>
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <utility>
 #else
+#include <boost/assign/v2/detail/config/limit_arity.hpp>
+#include <boost/assign/v2/detail/config/limit_csv_arity.hpp>
+#include <boost/assign/v2/detail/functor/crtp_unary_and_up.hpp>
 #include <boost/preprocessor/arithmetic.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/repetition.hpp>
-#include <boost/assign/v2/detail/functor/crtp_unary_and_up.hpp>
-#include <boost/assign/v2/detail/config/limit_csv_arity.hpp>
-#include <boost/assign/v2/detail/config/limit_arity.hpp>
-
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
 namespace boost{
 namespace assign{
@@ -71,14 +66,12 @@
     class crtp :
         public fun_holder<F>
         , public modifier_holder<Tag>
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-//do nothing
-#else
+#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
         , public functor_aux::crtp_unary_and_up<
             crtp<C, F, Tag, D>,
             ::boost::mpl::always< D const& >
         >
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
     {
 
         public:
@@ -95,8 +88,6 @@
         D & derived(){ return static_cast<D&>(*this); }
         D const& derived()const{ return static_cast<D const&>(*this); }
 
-        //public:
-
         crtp(){}
         explicit crtp( F const& f ) : fun_holder_( f ){}
         explicit crtp( F const& f, modifier_ const& m )
@@ -144,24 +135,11 @@
     ~
 )
 #undef BOOST_ASSIGN_V2_MACRO
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
+
                 // must be mutable
         C& container()const{ return this->derived().container(); }
 
-// TODO remove
-/*
-        struct result_of_modulo{
-
-            struct deduce
-            {
-                typedef typename put_aux::deduce_fun<C>::type f_;
-                typedef v2::result_of::modulo_fun<D> meta_;
-                typedef typename ::boost::mpl::apply1<meta_, f_>::type type;
-            };
-
-        };
-*/
-
         protected:
 
         template<typename T>
@@ -170,7 +148,7 @@
         >{};
 
         template<typename T>
-        result_type modify(T* t,typename ptr_enabler<T>::type* = 0)const
+        result_type modify(T* t, typename ptr_enabler<T>::type* = 0)const
         {
             typedef put_concept::Modifier<Tag, C, T*> concept_;
             BOOST_CONCEPT_ASSERT(( concept_ ));
@@ -186,7 +164,7 @@
                 T&&
 #else
                 T&
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
             > concept_;
             BOOST_CONCEPT_ASSERT(( concept_ ));
         }
@@ -222,7 +200,7 @@
             return this->derived();
         }
 
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
     };
 
@@ -231,4 +209,5 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_FRAME_CRTP_ER_2010_HPP
+

Modified: sandbox/assign_v2/boost/assign/v2/put/frame/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame/fwd.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame/fwd.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -15,7 +15,6 @@
 namespace v2{
 namespace put_aux{
 
-
     template<typename C, typename F, typename Tag, typename D> class crtp;
 
 }// put_aux
@@ -23,5 +22,5 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_FRAME_FWD_ER_2010_HPP
 

Modified: sandbox/assign_v2/boost/assign/v2/put/frame/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame/modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame/modifier.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -19,12 +19,12 @@
 namespace put_aux{
 
     template<typename Tag>
-    struct /*<< Specialize on Tag >>*/ modifier{};
+    struct /*<<Specialize on Tag>>*/ modifier{};
 
 }
 namespace put_concept{
 
-    template<typename Tag, /*<< Container >>*/ typename C, /*<< Input >>*/ typename T>
+    template<typename Tag, /*<<Container>>*/ typename C, /*<<Input>>*/ typename T>
     struct Modifier
     {
 
@@ -45,4 +45,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_FRAME_MODIFIER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/frame/replace_parameter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame/replace_parameter.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame/replace_parameter.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -14,21 +14,23 @@
 namespace boost{
 namespace assign{
 namespace v2{
+//[replace_parameter
 namespace put_aux{
                 
     template<typename /*<<Inherits crtp\<\> >>*/D> 
     struct /*<<Meta-function class to be specialized on D>>*/replace_fun{
         template<typename F> 
-        struct /*<<Transforms D by replacing F for D::fun_type>>*/apply{};
+        struct /*<<Transforms D by replacing D::fun_type with F>>*/apply{};
     };
 
     template<typename /*<<Inherits crtp\<\> >>*/ D> 
     struct /*<<Meta-function class to be specialized on D>>*/ replace_modifier_tag{
         template<typename Tag> 
-        struct /*<<Transforms D by replacing Tag for D::modifier_tag>>*/ apply{};
+        struct /*<<Transforms D by replacing Tag D::modifier_tag with Tag>>*/ apply{};
     };
     
 }// put_aux
+//]
 }// v2
 }// assign
 }// boost

Modified: sandbox/assign_v2/boost/assign/v2/put/frame/sub.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame/sub.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame/sub.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_FRAME_SUB_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_FRAME_SUB_ER_2010_HPP
-#include <boost/concept_check.hpp>
 #include <boost/assign/v2/put/frame/modifier.hpp>
+#include <boost/concept_check.hpp>
 
 namespace boost{
 namespace assign{
@@ -47,7 +47,7 @@
 
     };
 
-    template<typename C, typename F, typename Tag,typename X>
+    template<typename C, typename F, typename Tag, typename X>
     struct Pre3 : Pre2<C, F, X>{
 
         typedef put_aux::modifier<Tag> modifier_;
@@ -91,4 +91,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_FRAME_SUB_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/fun.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/fun.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/fun.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_FUN_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_FUN_ER_2010_HPP
-
 #include <boost/assign/v2/put/fun/constructor.hpp>
 #include <boost/assign/v2/put/fun/identity.hpp>
 #include <boost/assign/v2/put/fun/new.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_FUN_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODIFIER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODIFIER_ER_2010_HPP
-
-#include <boost/assign/v2/put/modifier/standard.hpp>
 #include <boost/assign/v2/put/modifier/iterate.hpp>
 #include <boost/assign/v2/put/modifier/lookup.hpp>
-// TODO repeat
+#include <boost/assign/v2/put/modifier/repeat.hpp>
+#include <boost/assign/v2/put/modifier/standard.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_MODIFIER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/iterate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/iterate.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/iterate.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODIFIER_ITERATE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODIFIER_ITERATE_ER_2010_HPP
-#include <boost/assign/v2/put/modifier/iterate/tag.hpp>
 #include <boost/assign/v2/put/modifier/iterate/impl.hpp>
-
+#include <boost/assign/v2/put/modifier/iterate/tag.hpp>
 #include <boost/assign/v2/put/modulo/modifier/keyword.hpp>
 BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_KEYWORD(iterate)
 

Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/impl.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/impl.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/impl.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -16,8 +16,8 @@
 #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>
+#include <boost/utility/enable_if.hpp>
 #endif
 
 namespace boost{

Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/lookup.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/lookup.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/lookup.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODIFIER_LOOKUP_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODIFIER_LOOKUP_ER_2010_HPP
-#include <boost/assign/v2/put/modifier/lookup/tag.hpp>
 #include <boost/assign/v2/put/modifier/lookup/impl.hpp>
-
+#include <boost/assign/v2/put/modifier/lookup/tag.hpp>
 #include <boost/assign/v2/put/modulo/modifier/keyword.hpp>
 BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_KEYWORD(lookup)
 

Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/impl.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/impl.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/impl.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODIFIER_LOOKUP_IMPL_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODIFIER_LOOKUP_IMPL_ER_2010_HPP
-#include <boost/call_traits.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/assign/v2/detail/keyword/ignore.hpp>
 #include <boost/assign/v2/put/frame/modifier.hpp>
 #include <boost/assign/v2/put/modifier/lookup/tag.hpp>
+#include <boost/call_traits.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace boost{
 namespace assign{
@@ -46,7 +46,7 @@
 
 #else
 
-        template<typename C,typename T>
+        template<typename C, typename T>
         void impl(C& cont, T& key )const{
             cont[ key ] = (*this->ptr)( cont[ key ] );
         }

Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/repeat.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/repeat.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/repeat.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODIFIER_REPEAT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODIFIER_REPEAT_ER_2010_HPP
-#include <boost/assign/v2/put/modifier/repeat/tag.hpp>
 #include <boost/assign/v2/put/modifier/repeat/impl.hpp>
-
+#include <boost/assign/v2/put/modifier/repeat/tag.hpp>
 #include <boost/assign/v2/put/modulo/modifier/keyword.hpp>
 BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_KEYWORD(repeat)
 

Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/standard.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/standard.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/standard.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODIFIER_STANDARD_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODIFIER_STANDARD_ER_2010_HPP
-
 #include <boost/assign/v2/put/modifier/insert.hpp>
 #include <boost/assign/v2/put/modifier/push.hpp>
 #include <boost/assign/v2/put/modifier/push_back.hpp>

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_ER_2010_HPP
-
 #include <boost/assign/v2/put/modulo/fun.hpp>
-#include <boost/assign/v2/put/modulo/generic.hpp>
 #include <boost/assign/v2/put/modulo/modifier.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_MODULO_ER_2010_HPP

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -12,4 +12,5 @@
 #include <boost/assign/v2/put/modulo/fun/keyword.hpp>
 #include <boost/assign/v2/put/modulo/fun/make.hpp>
 #include <boost/assign/v2/put/modulo/fun/meta.hpp>
-#endif
+
+#endif // BOOST_ASSIGN_V2_PUT_MODULO_FUN_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/fun/keyword.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/fun/keyword.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/fun/keyword.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_FUN_KEYWORD_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_FUN_KEYWORD_ER_2010_HPP
-#include <boost/preprocessor/cat.hpp>
 #include <boost/assign/v2/put/modulo/fun/make.hpp>
+#include <boost/preprocessor/cat.hpp>
 
 #define BOOST_ASSIGN_V2_MODULO_FUN_KEYWORD(NAME, FUN)\
 namespace boost{\
@@ -43,4 +43,4 @@
 }\
 /**/
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_MODULO_FUN_KEYWORD_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/fun/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/fun/make.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/fun/make.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,10 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_FUN_MAKE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_FUN_MAKE_ER_2010_HPP
-#include <boost/mpl/apply.hpp>
 #include <boost/assign/v2/detail/keyword/ignore.hpp>
 #include <boost/assign/v2/put/frame/fwd.hpp>
 #include <boost/assign/v2/put/modulo/fun/meta.hpp>
+#include <boost/mpl/apply.hpp>
 
 namespace boost{
 namespace assign{
@@ -61,4 +61,4 @@
 }// assign
 }// boost
 
-#endif
\ No newline at end of file
+#endif // BOOST_ASSIGN_V2_PUT_MODULO_FUN_MAKE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,11 +10,12 @@
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_FUN_META_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_FUN_META_ER_2010_HPP
 #include <boost/mpl/apply.hpp>
-#include <boost/assign/v2/put/frame/replace.hpp>
+#include <boost/assign/v2/put/frame/replace_parameter.hpp>
 
 namespace boost{
 namespace assign{
 namespace v2{
+//[result_of_modulo_fun
 namespace result_of{
         
     template<typename /*<<Inherits crtp\<\> >>*/D>
@@ -28,8 +29,9 @@
     };
             
 }// result_of
+//]
 }// v2
 }// assign
 }// boost
 
-#endif
\ No newline at end of file
+#endif // BOOST_ASSIGN_V2_PUT_MODULO_FUN_META_ER_2010_HPP
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/generic.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/generic.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/generic.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -1,38 +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_MODULO_GENERIC_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_MODULO_GENERIC_ER_2010_HPP
-#include <boost/typeof/typeof.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace result_of_modulo{
-
-    // Is this needed?
-    template<typename T>
-    struct generic_
-    {
-        template<typename P>
-        struct apply
-        {
-            static T t;
-            static P p;
-            typedef BOOST_TYPEOF_TPL( t % p ) type;
-        };
-    };
-
-}// result_of_modulo
-}// v2
-}// assign
-}// boost
-
-#endif
-
+// TODO remove file
\ No newline at end of file

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_ER_2010_HPP
-
 #include <boost/assign/v2/put/modulo/modifier/keyword.hpp>
 #include <boost/assign/v2/put/modulo/modifier/meta.hpp>
 #include <boost/assign/v2/put/modulo/modifier/make.hpp>
 #include <boost/assign/v2/put/modulo/modifier/standard.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/keyword.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/keyword.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/keyword.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_KEYWORD_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_KEYWORD_ER_2010_HPP
-#include <boost/preprocessor/cat.hpp>
 #include <boost/assign/v2/put/modulo/modifier/make.hpp>
+#include <boost/preprocessor/cat.hpp>
 
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_PARAM
 #define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_PARAM(NAME)\
@@ -46,6 +46,5 @@
 BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_KEYWORD(modifier)    
 BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_MODIFIER_TAG(modifier, Arg)
 
-#endif
-
+#endif // BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_KEYWORD_ER_2010_HPP
 

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/make.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/make.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -19,9 +19,10 @@
 namespace boost{
 namespace assign{
 namespace v2{
+//[modulo_modifier
 namespace put_aux{
 
-	template<typename Keyword, typename Arg = keyword_aux::ignore>
+	template<typename /*<<A class of modifiers>>*/ Keyword, typename /*<<A part of the modifier's implementation>>*/Arg = keyword_aux::ignore>
         struct modulo_modifier
         {
         
@@ -39,6 +40,9 @@
         protected:
         Arg arg_;
         };
+}//put_aux
+//]
+namespace put_aux{
 
         template<typename C, typename F, typename Tag, typename D, 
                 typename Keyword, typename Arg>
@@ -72,4 +76,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_MAKE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,23 +9,25 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_ER_2010_HPP
-#include <boost/preprocessor/cat.hpp>
-#include <boost/mpl/apply.hpp>
 #include <boost/assign/v2/put/frame/replace_parameter.hpp>
+#include <boost/mpl/apply.hpp>
+#include <boost/preprocessor/cat.hpp>
 
 namespace boost{
 namespace assign{
 namespace v2{
+//[meta_modifier_tag
 namespace put_aux{
     
         template<typename Keyword, typename Arg>
         struct /*<<Meta-function class to be specialized on Keyword>>*/ meta_modifier_tag
         {
         template<typename /*<<Inherits crtp\<\> >>*/ D> 
-    	struct apply;
+    	struct /*<<Returns a modifier-tag>>*/ apply;
         };
         
 }// put_aux
+//]
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_MODIFIER_TAG
 #define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_MODIFIER_TAG(NAME, Result)\
 namespace boost{\
@@ -69,5 +71,5 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_META_ER_2010_HPP
 

Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/standard.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/standard.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/standard.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,10 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_ER_2010_HPP
-
-#include <boost/preprocessor/cat.hpp>
 #include <boost/assign/v2/detail/keyword/ignore.hpp>
 #include <boost/assign/v2/put/frame/modifier.hpp>
 #include <boost/assign/v2/put/modulo/modifier/keyword.hpp>
+#include <boost/preprocessor/cat.hpp>
 
 #define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_IMPL_PTR(FUN)\
         template<typename C, typename T>\
@@ -95,4 +94,4 @@
 }\
 /**/
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_PIPE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_PIPE_ER_2010_HPP
-
 #include <boost/assign/v2/put/pipe/functor.hpp>
 #include <boost/assign/v2/put/pipe/csv.hpp>
 #include <boost/assign/v2/put/pipe/range.hpp>

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -14,4 +14,4 @@
 #include <boost/assign/v2/put/pipe/csv/rhs.hpp>
 #include <boost/assign/v2/put/pipe/csv/size_type.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_PIPE_CSV_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,31 +9,19 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_PIPE_CSV_GENERATOR_HPP_ER_2010
 #define BOOST_ASSIGN_V2_PUT_PIPE_CSV_GENERATOR_HPP_ER_2010
-#include <boost/mpl/apply.hpp>
-#include <boost/mpl/size.hpp>
-#include <boost/mpl/vector/vector0.hpp>
-
 #include <boost/assign/v2/ref/array/csv.hpp>
 #include <boost/assign/v2/ref/wrapper/copy.hpp>
-
 #include <boost/assign/v2/put/pipe/csv/rhs.hpp>
-#include <boost/assign/v2/put/pipe/modulo/traits.hpp>
-
+#include <boost/assign/v2/put/pipe/modulo_traits.hpp>
+#include <boost/mpl/apply.hpp>
+#include <boost/mpl/vector/vector0.hpp>
+#include <boost/mpl/size.hpp>
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-
-// do nothing
-
-#else
-
-#include <boost/mpl/aux_/na.hpp>
+#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <boost/assign/v2/detail/config/limit_csv_arity.hpp>
+#include <boost/mpl/aux_/na.hpp>
 #include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/repetition/repeat_from_to.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
+#include <boost/preprocessor/repetition.hpp>
 #endif
 
 namespace boost{
@@ -42,40 +30,42 @@
 namespace v2{
 namespace put_pipe_aux{
 
-    template<typename Pars = ::boost::mpl::vector0<> >
+    template<typename ParList = ::boost::mpl::vector0<> >
     class csv_generator
     {
 
         typedef ::boost::mpl::na na_;
-        typedef modulo_traits<Pars> modulo_traits_;
+        typedef modulo_traits<ParList> modulo_traits_;
 
         public:
 
-        typedef typename modulo_traits_::size pars_size;
-        typedef typename modulo_traits_::cont_ pars_cont_type;
+        typedef typename modulo_traits_::size par_list_size;
+        typedef typename modulo_traits_::cont_ par_list_cont_type;
 
         csv_generator(){}
-        explicit csv_generator(pars_cont_type const& p)
-            : pars_cont( p ){}
+        explicit csv_generator(par_list_cont_type const& p)
+            : par_list_cont_( p ){}
 
-        template<typename T>
+        template<typename P>
         struct modulo_result
         {
-            typedef typename modulo_traits_:: template new_pars<T>::type new_;
-            typedef csv_generator<new_> type;
+            typedef typename modulo_traits_:: template next_par_list<
+            	P
+            >::type par_list_;
+            typedef csv_generator<par_list_> type;
         };
 
-        template<typename T>
-        typename modulo_result<T>::type
-        operator%(T const& t)const
+        template<typename P>
+        typename modulo_result<P>::type
+        operator%(P const& p)const
         {
-            typedef typename modulo_result<T>::type result_;
-            return result_( this->pars_cont( t ) );
+            typedef typename modulo_result<P>::type result_;
+            return result_( this->par_list_cont()( p ) );
         }
 
-        template<std::size_t N, typename U = na_>
+        template<std::size_t N, typename U = na_> // size?
         struct result{
-            typedef put_pipe_aux::csv_rhs<Pars, N, U> type;
+            typedef put_pipe_aux::csv_rhs<ParList, N, U> type;
         };
 
         typename result<0>::type
@@ -87,7 +77,7 @@
                 ref::csv_array<na_>( _nil )
             );
         }
-
+ 
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 
     protected:
@@ -98,7 +88,7 @@
         typedef typename result<sizeof...(Args)+1, T>::type result_;
         namespace ns = ref::assign_copy;
         return result_(
-            this->pars_cont,
+            this->par_list_cont(),
             ref::csv_array( t, args... )
         );
     }
@@ -126,7 +116,7 @@
 
 #define BOOST_ASSIGN_V2_MACRO1(N, U)\
     return result_( \
-        this->pars_cont, \
+        this->par_list_cont(), \
         ref::csv_array<U>( BOOST_PP_ENUM_PARAMS(N, _) ) \
     );\
 /**/
@@ -156,10 +146,15 @@
 #undef BOOST_ASSIGN_V2_MACRO1
 #undef BOOST_ASSIGN_V2_MACRO2
 
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
+
+		par_list_cont_type const& par_list_cont()const
+        {
+        	return this->par_list_cont_;
+        }
 
         protected:
-        pars_cont_type pars_cont;
+        par_list_cont_type par_list_cont_;
 
     };
 

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_PIPE_CSV_OPERATOR_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_PIPE_CSV_OPERATOR_ER_2010_HPP
-#include <boost/assign/v2/put/pipe/modulo/forward.hpp>
-#include <boost/assign/v2/ref/array/as_arglist.hpp>
+#include <boost/assign/v2/ref/array/as_arg_list.hpp>
+#include <boost/assign/v2/ref/list/as_modulo_list.hpp>
+#include <boost/assign/v2/put/container/functor.hpp>
 #include <boost/assign/v2/put/pipe/csv/rhs.hpp>
 #include <boost/assign/v2/put/pipe/csv/size_type.hpp>
-#include <boost/assign/v2/put/container/functor.hpp>
 
 namespace boost{
 namespace assign{
@@ -21,15 +21,12 @@
 namespace put_pipe_aux{
 
     template<typename C,
-        typename Pars, csv_size_type N, typename U>
-    C& operator|(C& cont, put_pipe_aux::csv_rhs<Pars, N, U> const& c){
+        typename ParList, csv_size_type N, typename U>
+    C& operator|(C& cont, put_pipe_aux::csv_rhs<ParList, N, U> const& rhs_){
 
-		v2::ref::as_arglist(
-            forward_pars<Pars>(
-                put( cont ),
-                c.pars()
-            ),
-            c.seq_args()
+		v2::ref::as_arg_list(
+            v2::ref::as_modulo_list<ParList>( put( cont ), rhs_.par_list_cont() ),
+            rhs_.arg_list_cont()
         );
         return cont;
 

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_PIPE_CSV_RHS_HPP_ER_2010
 #define BOOST_ASSIGN_V2_PUT_PIPE_CSV_RHS_HPP_ER_2010
-#include <boost/mpl/apply.hpp>
 #include <boost/assign/v2/ref/array/csv.hpp>
-#include <boost/assign/v2/put/pipe/modulo/size_type.hpp>
-#include <boost/assign/v2/put/pipe/modulo/traits.hpp>
 #include <boost/assign/v2/put/pipe/csv/size_type.hpp>
+#include <boost/assign/v2/put/pipe/modulo_traits.hpp>
 
 namespace boost{
     struct use_default;
@@ -26,34 +24,35 @@
     {
         typedef boost::use_default tag2_;
         typedef modulo_traits<Pars> modulo_traits_;
-        typedef typename modulo_traits_::size pars_size;
-        typedef typename modulo_traits_::cont_ pars_cont_type;
+        typedef typename modulo_traits_::size par_list_size; // TODO needed?
+        typedef typename modulo_traits_::cont_ par_list_cont_type;
         typedef typename v2::ref::nth_result_of::csv_array<
             N,
             U
-        >::type seq_arg_cont_type; //notice it's arg, not args
+        >::type arg_list_cont_type; //notice it's arg, not args
 
         csv_rhs(){}
-        csv_rhs(pars_cont_type const& p, seq_arg_cont_type const& s)
-            : pars_cont( p ), seq_arg( s ){}
+        csv_rhs(par_list_cont_type const& a, arg_list_cont_type const& b)
+            : par_list_cont_( a ), arg_list_cont_( b ){}
 
-        pars_cont_type const& pars()const
+        par_list_cont_type const& par_list_cont()const 
         {
-            return this->pars_cont;
+            return this->par_list_cont_;
         }
 
-        seq_arg_cont_type const& seq_args()const
+        arg_list_cont_type& arg_list_cont() // TODO needed (non-const)?
         {
-            return this->seq_arg;
+            return this->arg_list_cont_;
         }
-        seq_arg_cont_type& seq_args()
+
+        arg_list_cont_type const& arg_list_cont() const
         {
-            return this->seq_arg;
+            return this->arg_list_cont_;
         }
 
         protected:
-        pars_cont_type pars_cont;
-        seq_arg_cont_type seq_arg;
+        par_list_cont_type par_list_cont_;
+        arg_list_cont_type arg_list_cont_;
 
     };
 
@@ -62,4 +61,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_PIPE_CSV_RHS_HPP_ER_2010

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv/size_type.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv/size_type.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv/size_type.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -23,4 +23,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_PIPE_CSV_SIZE_TYPE_ER_2010_HPP

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #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/operator.hpp>
 #include <boost/assign/v2/put/pipe/functor/rhs.hpp>
 #include <boost/assign/v2/put/pipe/functor/size_type.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/functor/operator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/functor/operator.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/functor/operator.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,12 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_OPERATOR_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_OPERATOR_ER_2010_HPP
-#include <boost/assign/v2/put/pipe/modulo/forward.hpp>
-#include <boost/assign/v2/put/pipe/functor/rhs.hpp>
-//#include <boost/assign/v2/put/pipe/functor/forward.hpp>
-#include <boost/assign/v2/ref/tuple/cpp03/as_arglist.hpp> // ?
-#include <boost/assign/v2/ref/list_tuple/cpp03/as_arglist.hpp>
+#include <boost/assign/v2/ref/list/as_modulo_list.hpp>
+#include <boost/assign/v2/ref/list_tuple/as_args_list.hpp>
 #include <boost/assign/v2/put/container/functor.hpp>
+#include <boost/assign/v2/put/pipe/functor/rhs.hpp>
+#include <boost/assign/v2/put/pipe/modulo/forward.hpp>
 
 namespace boost{
 namespace assign{
@@ -23,21 +22,17 @@
 
     template<
         typename C,
-        typename Pars,
-        typename SeqArgs,
+        typename ParList,
+        typename ArgsList,
         bool enable_pars
     >
     C& operator|(
         C& cont,
-        put_pipe_aux::rhs<Pars, SeqArgs, enable_pars> const& c
+        put_pipe_aux::rhs<ParList, ArgsList, enable_pars> const& rhs_
     ){
-		v2::ref::as_arglist(
-        //forward(
-            forward_pars<Pars>(
-                put( cont ),
-                c.pars()
-            ),
-            c.seq_args()
+		ref::as_args_list(
+            ref::as_modulo_list<ParList>( put( cont ), rhs_.par_list_cont() ),
+            rhs_.args_list_cont()
         );
         return cont;
     }
@@ -52,4 +47,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_OPERATOR_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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,16 +9,13 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_RHS_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_RHS_ER_2010_HPP
-#include <iostream>
-#include <boost/mpl/vector/vector0.hpp>
+#include <boost/mpl/apply.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/size.hpp>
-#include <boost/mpl/apply.hpp>
-
-#include <boost/assign/v2/put/pipe/modulo/size_type.hpp>
-#include <boost/assign/v2/put/pipe/modulo/traits.hpp>
+#include <boost/mpl/vector/vector0.hpp>
 
 #include <boost/assign/v2/ref/list_tuple.hpp>
+#include <boost/assign/v2/put/pipe/modulo_traits.hpp>
 
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
@@ -37,51 +34,32 @@
 namespace v2{
 namespace put_pipe_aux{
 
-    typedef ::boost::mpl::vector0<> empty_seq_args_;
+    typedef ::boost::mpl::vector0<> empty_args_list_;
+
+#if! BOOST_ASSIGN_V2_ENABLE_CPP0X
+    typedef ref::list_tuple_aux::na_type na_type;
+#endif
 
-    template<
-        typename Pars = empty_pars_,
-        typename SeqArgs = empty_seq_args_,
-        bool enable_pars = (boost::mpl::size<SeqArgs>::value == 0)
-    >
+    template<typename ParList = empty_par_list_, typename ArgsList = empty_args_list_, bool enable_pars = ::boost::mpl::size<ArgsList>::value == 0>
     class rhs;
 
-    template<typename Pars, typename SeqArgs, bool enable_pars>
-    struct rhs_result_helper
+    template<typename ParList, typename ArgsList, bool enable_pars>
+    struct rhs_result
     {
 
         template<typename V>
-        struct apply
+        struct next_helper
         {
-            typedef typename ::boost::mpl::push_back<
-                SeqArgs,
-                V
-            >::type new_;
-            typedef put_pipe_aux::rhs<
-                Pars,
-                new_
-            > type;
+        	typedef typename ::boost::mpl::push_back<
+            	ArgsList, V
+            >::type next_args_list_;
+        	typedef rhs<ParList,  next_args_list_,  enable_pars> type;
         };
 
-    };
-
-#if! BOOST_ASSIGN_V2_ENABLE_CPP0X
-    typedef ref::list_tuple_aux::na_type na_type;
-#endif
-
-    template<typename Pars, typename SeqArgs, bool enable_pars>
-    struct rhs_result
-    {
-        typedef rhs_result_helper<
-            Pars,
-            SeqArgs,
-            enable_pars
-        > helper_;
-
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 
         template<typename...Args>
-        struct apply : helper_::template apply<
+        struct apply : next_helper<
             typename ::boost::mpl::detail::variadic_vector<
                 Args...
             >::type
@@ -91,71 +69,65 @@
 #else
 
         template<typename V>
-        struct apply : helper_::template apply<V>{};
+        struct apply : next_helper<V>{};
 
 #endif
 
     };
 
 
-    template<typename Pars, typename SeqArgs, bool enable_pars>
+    template<typename ParList, typename ArgsList, bool enable_pars>
     class rhs
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-//do nothing
-#else
+#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
         :    public functor_aux::crtp_unary_and_up<
-                rhs<Pars, SeqArgs, enable_pars>,
-                rhs_result<Pars, SeqArgs, enable_pars>
+                rhs<ParList, ArgsList, enable_pars>,
+                rhs_result<ParList, ArgsList, enable_pars>
             >
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
     {
         typedef boost::use_default list_tag_;
-        typedef modulo_traits<Pars> modulo_traits_;
-        typedef ref::nth_result_of::list_tuple meta2_;
+        typedef modulo_traits<ParList> modulo_traits_;
+        typedef ref::nth_result_of::list_tuple meta_;
 
         public:
 
-        typedef typename modulo_traits_::size pars_size;
-        typedef typename modulo_traits_::cont_ pars_cont_type;
+        typedef typename modulo_traits_::size par_list_size;
+        typedef typename modulo_traits_::cont_ par_list_cont_type;
 
         BOOST_STATIC_CONSTANT(
-            std::size_t,
-            seq_args_size = ::boost::mpl::size<SeqArgs>::value
-        );
-
+            std::size_t, // size_type?
+            args_list_size = ::boost::mpl::size<ArgsList>::value
+        ); 
+    
         typedef typename ::boost::mpl::apply1<
-            meta2_,
-            SeqArgs
-        >::type seq_args_cont_type;
+        	meta_, ArgsList
+        >::type args_list_cont_type;
 
         rhs(){}
-        explicit rhs(
-            pars_cont_type const& p,
-            seq_args_cont_type const& s
-        ) : pars_cont( p ),
-        seq_args_cont( s ){}
+        explicit rhs(par_list_cont_type const& a, args_list_cont_type const& b) 
+        	: par_list_cont_( a ), args_list_cont_( b ){}
 
         // operator%
 
-        template<typename T>
+        template<typename P>
         struct modulo_result
         {
-            typedef typename modulo_traits_::
-                template new_pars<T>::type new_;
-            typedef rhs<new_, SeqArgs> type;
+            typedef typename modulo_traits_::template 
+            	next_par_list<P>::type par_list_;
+            typedef rhs<par_list_, ArgsList> type;
         };
 
-        template<typename T>
+        template<typename P>
         typename boost::lazy_enable_if_c<
             enable_pars,
-            modulo_result<T>
+            modulo_result<P>
         >::type
-        operator%(T const& t)const
+        operator%(P const& p)const
         {
-            typedef typename modulo_result<T>::type result_;
+            typedef typename modulo_result<P>::type result_;
             return result_(
-                this->pars_cont( t ),
-                this->seq_args_cont
+                this->par_list_cont()( p ),
+                this->args_list_cont()
             );
         }
 
@@ -166,18 +138,18 @@
             typename...Args
 #else
             typename VArgs
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
         >
         struct result : rhs_result<
-            Pars,
-            SeqArgs,
+            ParList,
+            ArgsList,
             enable_pars
         >::template apply<
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
             Args...
 #else
             VArgs
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
         >{};
 
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
@@ -190,8 +162,8 @@
         {
             typedef typename result<Args...>::type result_;
             return result_(
-                this->pars_cont,
-                this->seq_args_cont(
+                this->par_list_cont(),
+                this->args_list_cont()(
                     std::forward<Args>( args )...
                 )
             );
@@ -202,25 +174,25 @@
 
         typedef functor_aux::crtp_unary_and_up<
             rhs,
-            rhs_result<Pars, SeqArgs, enable_pars>
+            rhs_result<ParList, ArgsList, enable_pars>
         > super_t;
 
         typedef ::boost::mpl::vector0<> v0_;
 
         public:
 
+        using super_t::operator();
+
         typename result<v0_>::type
         operator()()const
         {
             typedef typename result<v0_>::type result_;
             return result_(
-                this->pars_cont,
-                this->seq_args_cont()
+                this->par_list_cont(),
+                this->args_list_cont()()
             );
         }
 
-        using super_t::operator();
-
 #define BOOST_ASSIGN_V2_MACRO1( z, n, data )\
  ( BOOST_PP_CAT(_,n) )\
 /**/
@@ -237,8 +209,8 @@
         > v_;\
         typedef typename result<v_>::type result_;\
         return result_(\
-            this->pars_cont,\
-            this->seq_args_cont( BOOST_PP_ENUM_PARAMS(N1, _) )\
+            this->par_list_cont(),\
+            this->args_list_cont()( BOOST_PP_ENUM_PARAMS(N1, _) )\
         );\
     }\
 /**/
@@ -253,19 +225,19 @@
 
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
-        pars_cont_type const& pars()const
+        par_list_cont_type const& par_list_cont()const
         {
-            return this->pars_cont;
+            return this->par_list_cont_;
         }
-        seq_args_cont_type const& seq_args()const
+        args_list_cont_type const& args_list_cont()const
         {
-            return this->seq_args_cont;
+            return this->args_list_cont_;
         }
 
         protected:
 
-        pars_cont_type pars_cont;
-        seq_args_cont_type seq_args_cont;
+        par_list_cont_type par_list_cont_;
+        args_list_cont_type args_list_cont_;
 
     };
 
@@ -280,12 +252,12 @@
         #endif
         
         //std::cout << "(i,j)->" << get<j>(
-        //        rhs.seq_args().get( boost::mpl::int_<i>() )
+        //        rhs.args_list().get( boost::mpl::int_<i>() )
         //    ) << std::endl;
         
         pred(
             get<j>(
-                rhs.seq_args().get( boost::mpl::int_<i>() )
+                rhs.args_list_cont().get( boost::mpl::int_<i>() )
             ),
             u
         );

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/functor/size_type.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/functor/size_type.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/functor/size_type.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -23,4 +23,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_SIZE_TYPE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/forward.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/forward.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/forward.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -1,86 +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_PIPE_MODULO_FORWARD_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_PIPE_MODULO_FORWARD_ER_2010_HPP
-#include <boost/mpl/apply.hpp>
-#include <boost/mpl/at.hpp>
-#include <boost/mpl/int.hpp>
-#include <boost/mpl/size.hpp>
-#include <boost/assign/v2/put/modulo.hpp>
-#include <boost/assign/v2/put/pipe/modulo/size_type.hpp>
-#include <boost/assign/v2/ref/list/at.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace put_pipe_aux{
-namespace result_of{
-
-    template<modulo_size_type N, typename Pars, typename T,
-        bool exit = (N == ::boost::mpl::size<Pars>::value)>
-    struct forward_pars
-    {
-        typedef typename ::boost::mpl::at_c<Pars, N>::type at_;
-        typedef result_of_modulo::generic_<T> meta_;
-        typedef typename ::boost::mpl::apply1<meta_, at_>::type new_t_;
-
-        typedef forward_pars<N+1, Pars, new_t_> next_;
-
-        typedef typename next_::type type;
-
-        template<typename H>
-        static type call(H const& h, T const& t)
-        {
-            typedef ::boost::mpl::int_<N> int_;
-            return next_::call(h, t % ref::at<N>( h ) );
-        }
-
-    };
-
-    template<modulo_size_type N,typename Pars, typename T>
-    struct forward_pars<N, Pars, T, true>
-    {
-
-        typedef T type;
-
-        template<typename H>
-        static type call(H const& h, T const& t)
-        {
-            return t;
-        }
-
-    };
-
-}// result_of
-
-    template<typename Pars, typename T,typename C>
-    typename result_of::forward_pars<0, Pars, T>::type
-    forward_pars( T const& object, C const& c )
-    {
-        typedef result_of::forward_pars<0, Pars, T> caller_;
-        return caller_::call( c, object );
-    }
-
-}// put_pipe_aux
-namespace result_of{
-
-    template<typename T,typename Pars>
-    struct forward_pars : put_pipe_aux::result_of::forward_pars<
-        0,
-        Pars,
-        T
-    >{};
-
-}// result_of
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/size_type.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/size_type.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/size_type.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -1,26 +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_MODULO_SIZE_TYPE_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_MODULO_SIZE_TYPE_ER_2010_HPP
-#include <boost/assign/v2/ref/list/size_type.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace put_pipe_aux{
-
-    typedef ref::list_aux::size_type modulo_size_type;
-
-}// put_pipe_aux
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file

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-08 22:09:11 EST (Tue, 08 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)        //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_PUT_PIPE_MODULO_TRAITS_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_PIPE_MODULO_TRAITS_ER_2010_HPP
-#include <boost/mpl/apply.hpp>
-#include <boost/mpl/size.hpp>
-#include <boost/mpl/push_back.hpp>
-#include <boost/mpl/vector/vector0.hpp>
-#include <boost/assign/v2/ref/list/at.hpp>
-#include <boost/assign/v2/ref/list/container.hpp>
-#include <boost/assign/v2/ref/list/nth_result_of.hpp>
-#include <boost/assign/v2/ref/list/make.hpp>
-
-namespace boost{
-    struct use_default;
-namespace assign{
-namespace v2{
-namespace put_pipe_aux{
-
-    typedef ::boost::mpl::vector0<> empty_pars_;
-
-    template<typename Pars>
-    struct modulo_traits
-    {
-        typedef ref::nth_result_of::list<use_default> meta_;
-        typedef typename ::boost::mpl::apply1<meta_, Pars>::type cont_;
-        typedef typename ::boost::mpl::size<Pars>::type size;
-
-        template<typename T>
-        struct new_pars : ::boost::mpl::push_back<Pars, T const&>{};
-
-    };
-
-}// put_pipe_aux
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/range.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/range.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/range.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_PUT_PIPE_RANGE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_PIPE_RANGE_ER_2010_HPP
-#include <boost/type.hpp>
 #include <boost/assign/v2/put/container/range.hpp>
 #include <boost/assign/v2/ref/wrapper/copy.hpp>
+#include <boost/type.hpp>
 
 namespace boost{
 namespace assign{
@@ -45,7 +45,7 @@
         }
     };
 
-    template<typename C,typename R>
+    template<typename C, typename R>
     C& operator|(C& cont, put_range_aux::helper1<R> const& h)
     {
         return put_range( cont, h.range() );
@@ -65,4 +65,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_PUT_PIPE_RANGE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -13,4 +13,4 @@
 #include <boost/assign/v2/ref/wrapper.hpp>
 #include <boost/assign/v2/ref/array.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_ER_2010_HPP
-
+#include <boost/assign/v2/ref/array/as_arg_list.hpp>
+#include <boost/assign/v2/ref/array/conversion.hpp>
 #include <boost/assign/v2/ref/array/csv.hpp>
 #include <boost/assign/v2/ref/array/functor.hpp>
-#include <boost/assign/v2/ref/array/conversion.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_ARRAY_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/alloc.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/alloc.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/alloc.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_ALLOC_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_ALLOC_ER_2010_HPP
-
 #include <boost/assign/v2/ref/array/alloc/fast_alloc.hpp>
 #include <boost/assign/v2/ref/array/alloc/lazy_alloc.hpp>
 

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/alloc/instant.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/alloc/instant.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/alloc/instant.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,10 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_ALLOC_INSTANT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_ALLOC_INSTANT_ER_2010_HPP
-#include <boost/assign/v2/ref/wrapper.hpp>
-#include <boost/assign/v2/ref/array/interface.hpp>
 #include <boost/assign/v2/ref/array/alloc/instant_fwd.hpp>
 #include <boost/assign/v2/ref/array/impl_traits.hpp>
+#include <boost/assign/v2/ref/array/interface.hpp>
+#include <boost/assign/v2/ref/wrapper.hpp>
 
 namespace boost{
 namespace assign{
@@ -20,11 +20,9 @@
 namespace ref{
 namespace array_aux{
 
-//    template<size_type N, typename Tag, typename T>
     template<size_type N, typename T>
     class instant_alloc : public array_aux::interface<
         typename array_aux::impl_traits<N, T>::array_type,
-//        instant_alloc<N, Tag, T>
       instant_alloc<N, T>
     >
     {
@@ -61,4 +59,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_ARRAY_ALLOC_INSTANT_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/alloc/instant_fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/alloc/instant_fwd.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/alloc/instant_fwd.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -16,11 +16,14 @@
 namespace v2{
 namespace ref{
 namespace alloc_tag{
+
     struct instant_alloc{};
+
 }// alloc_tag
 namespace array_aux{
-   // template<size_type N, typename Tag, typename T> class instant_alloc;
+
    template<size_type N, typename T> class instant_alloc;
+
 }// array_aux
 }// ref
 }// v2

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_ALLOC_LAZY_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_ALLOC_LAZY_ER_2010_HPP
-#include <boost/shared_ptr.hpp>
-#include <boost/assign/v2/ref/wrapper.hpp>
 #include <boost/assign/v2/ref/array/alloc/lazy_fwd.hpp>
-#include <boost/assign/v2/ref/array/interface.hpp>
 #include <boost/assign/v2/ref/array/impl_traits.hpp>
+#include <boost/assign/v2/ref/array/interface.hpp>
+#include <boost/assign/v2/ref/wrapper.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace boost{
 namespace assign{
@@ -21,11 +21,9 @@
 namespace ref{
 namespace array_aux{
 
-//       template<std::size_t N,typename Tag, typename T, typename D>
-       template<std::size_t N,typename T, typename D>
+       template<std::size_t N, typename T, typename D>
        class lazy_alloc : public array_aux::interface<
            typename array_aux::impl_traits<N, T>::array_type,
-//        lazy_alloc<N,Tag,T,D>
         lazy_alloc<N, T, D>
     >
     {
@@ -76,4 +74,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_ARRAY_ALLOC_LAZY_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy_fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy_fwd.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy_fwd.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -16,16 +16,19 @@
 namespace v2{
 namespace ref{
 namespace alloc_tag{
+
     struct lazy_alloc{};
+
 }// alloc_tag
 namespace array_aux{
+
    template<size_type N, typename T, typename D>
-//   template<std::size_t N, typename Tag, typename T, typename D>
    class lazy_alloc;
+
 }// array_aux
 }// ref
 }// v2
 }// assign
 }// boost
 
-#endif
+#endif //  BOOST_ASSIGN_V2_REF_ARRAY_ALLOC_LAZY_FWD_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/as_arglist.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/as_arglist.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/as_arglist.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -1,63 +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_REF_ARRAY_AS_ARGLIST_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_ARRAY_AS_ARGLIST_ER_2010_HPP
-#include <boost/utility/enable_if.hpp>
-#include <boost/assign/v2/ref/array/interface.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace ref{
-namespace array_aux{
-
-	// --- Implementation --- //
-
-    template<size_type I, typename F, typename Impl, typename D>
-    typename boost::enable_if_c<
-        D::static_size == I
-    >::type
-    as_arglist(
-        F const& f ,
-    	interface<Impl, D> const& array
-    )
-    {}
-
-    template<size_type I, typename F, typename Impl, typename D>
-    typename boost::enable_if_c<
-        I < D::static_size
-    >::type
-    as_arglist(
-        F const& f ,
-    	interface<Impl, D> const& array
-    )
-    {
-        f( array[ I ].get() );
-        as_arglist<I + 1>( f, array );
-    }
-
-	// --- User interface --- //
-
-    template<typename F, typename Impl, typename D>
-    void as_arglist(
-        F const& f ,
-    	interface<Impl, D> const& array
-    ){
-        as_arglist<0>( f, array );
-    }
-
-}// array_aux
-using array_aux::as_arglist;
-}// ref
-}// v2
-}// assign
-}// boost
-
-#endif 
\ No newline at end of file
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/conversion.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/conversion.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/conversion.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,7 +10,8 @@
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_CONVERSION_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_CONVERSION_ER_2010_HPP
 #include <boost/assign/v2/ref/array/interface.hpp>
-#include <boost/assign/v2/utility/conversion/name_lookup.hpp>
+#include <boost/assign/v2/utility/conversion/convert.hpp>
+#include <boost/assign/v2/utility/conversion/converter.hpp>
 
 namespace boost{
 namespace assign{
@@ -20,7 +21,8 @@
 
 #define BOOST_ASSIGN_V2_SEQ (Impl)(D)
 #define BOOST_ASSIGN_V2_R interface<Impl, D>
-BOOST_ASSIGN_V2_UTILITY_CONVERSION_NAME_LOOKUP(BOOST_ASSIGN_V2_SEQ, BOOST_ASSIGN_V2_R)
+BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_NAME_LOOKUP(BOOST_ASSIGN_V2_SEQ, BOOST_ASSIGN_V2_R)
+BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER_NAME_LOOKUP(BOOST_ASSIGN_V2_SEQ, BOOST_ASSIGN_V2_R)
 #undef BOOST_ASSIGN_V2_SEQ
 #undef BOOST_ASSIGN_V2_R
 

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_CSV_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_CSV_ER_2010_HPP
-
-#include <boost/assign/v2/ref/array/csv/nth_result_of.hpp>
 #include <boost/assign/v2/ref/array/csv/make.hpp>
+#include <boost/assign/v2/ref/array/csv/nth_result_of.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_ARRAY_CSV_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv/make.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv/make.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -12,23 +12,20 @@
 #include <boost/assign/v2/detail/keyword/nil.hpp>
 #include <boost/assign/v2/ref/array/alloc/instant.hpp>
 #include <boost/assign/v2/ref/array/csv/nth_result_of.hpp>
-
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/is_same.hpp>
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <utility>
+#include <boost/assign/v2/detail/traits/type/or_const.hpp>
 #include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <boost/assign/v2/detail/traits/type/or_const.hpp>
 #else
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/repetition/repeat_from_to.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/assign/v2/detail/config/limit_csv_arity.hpp>
-#endif
-
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_same.hpp>
+#include <boost/preprocessor/arithmetic/inc.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/repetition.hpp>
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
 namespace boost{
 namespace assign{
@@ -53,7 +50,9 @@
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 namespace csv_array_aux{
 
-    template<std::size_t n,typename R>
+
+	// TODO size_type?
+    template<std::size_t n, typename R>
     void assign(R& r){}
 
     template<std::size_t n, typename U, typename R, typename... Args>
@@ -84,7 +83,7 @@
 
 }// csv_array_aux
 
-    template<typename T,typename...TArgs>
+    template<typename T, typename...TArgs>
     typename boost::lazy_disable_if<
         v2::type_traits::or_const<T, TArgs...>,
         csv_array_aux::result<T, TArgs...>
@@ -145,4 +144,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_ARRAY_CSV_MAKE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv/nth_result_of.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv/nth_result_of.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv/nth_result_of.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_CSV_NTH_RESULT_OF_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_CSV_NTH_RESULT_OF_ER_2010_HPP
-#include <boost/mpl/empty_base.hpp>
 #include <boost/assign/v2/ref/array/alloc/instant_fwd.hpp>
-#include <boost/assign/v2/ref/array/tag1.hpp>
-
 #include <boost/assign/v2/ref/array/impl_traits.hpp>
+#include <boost/assign/v2/ref/array/tag1.hpp>
 
 namespace boost{
     struct use_default;
@@ -21,7 +19,9 @@
 namespace v2{
 namespace ref{
 namespace array_aux{
+
     typedef boost::use_default csv_tag2_;
+
 }// array_aux
 namespace nth_result_of{
 
@@ -29,7 +29,6 @@
     struct csv_array
     {
         typedef ref::array_tag1_ tag1_;
-//        typedef array_aux::instant_alloc<N, tag1_, T> type;
         typedef array_aux::instant_alloc<N, T> type;
     };
 

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/functor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/functor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/functor.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,12 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_FUNCTOR_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_FUNCTOR_ER_2010_HPP
-
 #include <boost/assign/v2/ref/array/functor/make.hpp>
 #include <boost/assign/v2/ref/array/functor/nth_result_of.hpp>
 
-// Remains commented out
-// #include <boost/assign/v2/ref/array/functor/converter.hpp>
-
 #endif
 

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/functor/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/functor/make.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/functor/make.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_FUNCTOR_MAKE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_FUNCTOR_MAKE_ER_2010_HPP
-#include <boost/assign/v2/ref/array/functor/nth_result_of.hpp>
 #include <boost/assign/v2/ref/array/alloc/lazy.hpp>
+#include <boost/assign/v2/ref/array/functor/nth_result_of.hpp>
 
 namespace boost{
 namespace assign{
@@ -54,4 +54,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_ARRAY_FUNCTOR_MAKE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/functor/nth_result_of.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/functor/nth_result_of.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/functor/nth_result_of.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,10 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_FUNCTOR_NTH_RESULT_OF_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_FUNCTOR_NTH_RESULT_OF_ER_2010_HPP
-#include <boost/assign/v2/ref/list/make.hpp>
-#include <boost/assign/v2/ref/list/container.hpp>
-#include <boost/assign/v2/ref/list/array.hpp>
 #include <boost/assign/v2/ref/array/size_type.hpp>
+#include <boost/assign/v2/ref/list/array.hpp>
+#include <boost/assign/v2/ref/list/container.hpp>
+#include <boost/assign/v2/ref/list/make.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/impl_traits.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/impl_traits.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/impl_traits.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,8 +10,8 @@
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_IMPL_TRAITS_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_IMPL_TRAITS_ER_2010_HPP
 #include <boost/array.hpp>
-#include <boost/assign/v2/ref/wrapper.hpp>
 #include <boost/assign/v2/ref/array/size_type.hpp>
+#include <boost/assign/v2/ref/wrapper.hpp>
 
 namespace boost{
 namespace assign{
@@ -34,4 +34,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_ARRAY_IMPL_TRAITS_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/interface.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/interface.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/interface.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,25 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_INTERFACE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_INTERFACE_ER_2010_HPP
-#include <algorithm>
+#include <boost/assign/v2/ref/wrapper.hpp>
+#include <boost/call_traits.hpp>
 #include <boost/config.hpp>
-#include <boost/mpl/bool.hpp>
 #include <boost/mpl/int.hpp>
-
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_const.hpp>
-#include <boost/type_traits/add_const.hpp>
-#include <boost/call_traits.hpp>
-
 #include <boost/range.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/range/algorithm/for_each.hpp>
-#include <boost/range/iterator_range.hpp> //iterator_range_detail::
-
-#include <boost/assign/v2/ref/wrapper/framework.hpp>
-#include <boost/assign/v2/ref/wrapper/crtp.hpp>
-#include <boost/assign/v2/ref/wrapper/get.hpp>
 
 namespace boost{
 namespace assign{
@@ -171,12 +157,12 @@
         template<typename W>
         reference elem_impl(W& w)
         {
-            return w; // w.get()
+            return w; 
         }
         template<typename W>
         const_reference elem_impl(W & w)const
         {
-            return w; // w.get()
+            return w;
         }
 
         public:
@@ -197,4 +183,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_ARRAY_INTERFACE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/tag1.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/tag1.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/tag1.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -7,19 +7,21 @@
 //  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_REF_ANON_TAG1_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_ANON_TAG1_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_REF_ARRAY_TAG1_ER_2010_HPP
+#define BOOST_ASSIGN_V2_REF_ARRAY_TAG1_ER_2010_HPP
 #include <boost/assign/v2/ref/wrapper/copy.hpp>
 
 namespace boost{
-    struct use_default;
 namespace assign{
 namespace v2{
 namespace ref{
+
     typedef assign_tag::copy array_tag1_;
+
 }// ref
 }// v2
 }// assign
 }// boost
 
-#endif // BOOST_ASSIGN_V2_REF_ANON_TAG1_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_REF_ARRAY_TAG1_ER_2010_HPP
+

Modified: sandbox/assign_v2/boost/assign/v2/ref/convert_traits/checking.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/convert_traits/checking.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/convert_traits/checking.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_CONVERT_TRAITS_CHECKING_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_CONVERT_TRAITS_CHECKING_ER_2010_HPP
+#include <boost/assign/v2/ref/convert_traits/reference.hpp>
 #include <boost/mpl/assert.hpp>
-//#include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/assign/v2/ref/convert_traits/reference.hpp>
 
 namespace boost{
 namespace assign{
@@ -62,11 +61,12 @@
     }
 
 }// twin_values
-// TODO upgrade
+
+// TODO possible extension
 /*
 namespace distinct_value_type{
 
-    template<typename T1,typename T2,typename T3>
+    template<typename T1, typename T2, typename T3>
     void do_check_impl(const T1&, const T2& ,const T3&)
     {
 
@@ -104,6 +104,7 @@
     } \
 */
 /**/
+
 /*
 // don't try to guess the supertype, it may vary by compiler.
 namespace supertype_{
@@ -129,4 +130,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_CONVERT_TRAITS_CHECKING_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/convert_traits/const.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/convert_traits/const.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/convert_traits/const.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,10 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_CONVERT_TRAITS_CONST_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_CONVERT_TRAITS_CONST_ER_2010_HPP
-#include <boost/type_traits/is_const.hpp>
+#include <boost/assign/v2/ref/convert_traits/value.hpp>
 #include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/remove_cv.hpp>
-#include <boost/assign/v2/ref/convert_traits/value.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/ref/convert_traits/reference.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/convert_traits/reference.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/convert_traits/reference.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_CONVERT_TRAITS_REFERENCE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_CONVERT_TRAITS_REFERENCE_ER_2010_HPP
-#include <boost/type_traits/remove_reference.hpp>
 #include <boost/assign/v2/ref/convert_traits/const.hpp>
+#include <boost/type_traits/remove_reference.hpp>
 
 namespace boost{
 namespace assign{
@@ -39,5 +39,5 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_CONVERT_TRAITS_REFERENCE_ER_2010_HPP
 

Modified: sandbox/assign_v2/boost/assign/v2/ref/convert_traits/value.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/convert_traits/value.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/convert_traits/value.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -29,7 +29,7 @@
 
     template<typename V1, typename V2> struct value<V1, V2, false, false>{};
 
-    // TODO upgrade
+    // TODO possible extension
     //    #include <boost/type_traits/is_arithmetic.hpp>
     //  #include <boost/numeric/conversion/conversion_traits.hpp>
     //    struct value : ::boost::mpl::eval_if<
@@ -45,4 +45,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_CONVERT_TRAITS_VALUE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,14 +9,14 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_ER_2010_HPP
-
-#include <boost/assign/v2/ref/list/holder.hpp>
 #include <boost/assign/v2/ref/list/array.hpp>
-#include <boost/assign/v2/ref/list/policy.hpp>
+#include <boost/assign/v2/ref/list/as_modulo_list.hpp>
 #include <boost/assign/v2/ref/list/at.hpp>
 #include <boost/assign/v2/ref/list/container.hpp>
+#include <boost/assign/v2/ref/list/holder.hpp>
+#include <boost/assign/v2/ref/list/make.hpp>
 #include <boost/assign/v2/ref/list/nth_result_of.hpp>
+#include <boost/assign/v2/ref/list/policy.hpp>
 #include <boost/assign/v2/ref/list/size_type.hpp>
-#include <boost/assign/v2/ref/list/make.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/array.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -13,4 +13,4 @@
 #include <boost/assign/v2/ref/list/array/policy.hpp>
 #include <boost/assign/v2/ref/list/array/rebind.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_ARRAY_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/array/policy.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/array/policy.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/array/policy.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,16 +9,16 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_ARRAY_POLICY_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_ARRAY_POLICY_ER_2010_HPP
-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/identity.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/is_const.hpp>
 #include <boost/assign/v2/ref/array/alloc/lazy.hpp>
 #include <boost/assign/v2/ref/list/fwd.hpp>
 #include <boost/assign/v2/ref/list/holder.hpp>
 #include <boost/assign/v2/ref/list/size_type.hpp>
 #include <boost/assign/v2/ref/list/policy.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
+#include <boost/type_traits/is_const.hpp>
+#include <boost/type_traits/remove_reference.hpp>
+#include <boost/type_traits/remove_cv.hpp>
 
 namespace boost{
 namespace assign{
@@ -30,7 +30,7 @@
 
     typedef alloc_tag::lazy_alloc array_tag;
 
-    // policy_helperx<> extracts from the list the value-type for the array
+    // policy_helperX<> extracts from the list the value-type for the array
 
     template<
         typename U1 // old result
@@ -53,7 +53,7 @@
     };
 
     template<typename U1 // old result
-        ,typename U2, typename L // container<Tag, U2, L>
+        , typename U2, typename L // container<Tag, U2, L>
     >
     struct policy_helper2
     {
@@ -98,7 +98,7 @@
             typedef typename boost::remove_reference<H>::type u1_;
             typedef typename list_aux::policy_helper3<u1_, T>::type value_;
             typedef array_aux::lazy_alloc<
-                tail_holder<T>::size::value
+                tail_holder<T>::static_size::value
                 ,value_
                 ,derived_
             > type;
@@ -112,4 +112,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_ARRAY_POLICY_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/array/rebind.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/array/rebind.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/array/rebind.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,14 +9,12 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_ARRAY_REBIND_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_ARRAY_REBIND_ER_2010_HPP
-#include <boost/static_assert.hpp>
-#include <boost/config.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/int.hpp>
-#include <boost/mpl/equal_to.hpp>
 #include <boost/assign/v2/ref/list/fwd.hpp>
 #include <boost/assign/v2/ref/list/at.hpp>
 #include <boost/assign/v2/ref/list/size_type.hpp>
+#include <boost/mpl/bool.hpp>
+#include <boost/mpl/equal_to.hpp>
+#include <boost/mpl/int.hpp>
 
 namespace boost{
     struct use_default;
@@ -26,7 +24,7 @@
 namespace list_aux{
 
     template<
-        size_type K,typename A,
+        size_type K, typename A,
         typename Tag, typename H, typename T
     >
     void assign_array(
@@ -39,7 +37,7 @@
     }
 
     template<
-        size_type K,typename A,
+        size_type K, typename A,
         typename Tag, typename H, typename T
     >
     void assign_array(
@@ -65,7 +63,7 @@
     )
     {
         typedef list_aux::container<Tag, H, T> list_;
-        BOOST_STATIC_ASSERT( A::static_size <= list_::size::value );
+        BOOST_STATIC_ASSERT( A::static_size <= list_::static_size::value );
         typedef ::boost::mpl::int_<0> zero_;
         typedef ::boost::mpl::int_<A::static_size> size_;
         typedef typename ::boost::mpl::equal_to<size_, zero_>::type exit_;

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/at.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/at.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/at.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,14 +9,14 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_AT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_AT_ER_2010_HPP
+#include <boost/assign/v2/ref/list/fwd.hpp>
+#include <boost/assign/v2/ref/list/size_type.hpp>
+#include <boost/assign/v2/ref/list/holder.hpp>
+#include <boost/call_traits.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
-#include <boost/call_traits.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <boost/assign/v2/ref/list/fwd.hpp>
-#include <boost/assign/v2/ref/list/size_type.hpp>
-#include <boost/assign/v2/ref/list/holder.hpp>
 
 namespace boost{
 namespace assign{
@@ -26,7 +26,8 @@
 
     template<size_type I, typename T>
     struct is_head :
-        ::boost::mpl::bool_< I + 1 == T::size::value>{};
+        ::boost::mpl::bool_< I + 1 == T::static_size::value>{};
+//        ::boost::mpl::bool_< I + 1 == T::size::value>{};
 
 namespace result_of{
 
@@ -79,4 +80,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_AT_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/container.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,18 +9,19 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_CONTAINER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_CONTAINER_ER_2010_HPP
-#include <boost/mpl/apply.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-/* #ifndef BOOST_NO_RVALUE_REFERENCES
-#include <utility>
-#else*/
-#include <boost/call_traits.hpp>
-//#endif
 #include <boost/assign/v2/ref/list/fwd.hpp> // consistency
 #include <boost/assign/v2/ref/list/holder/tail.hpp>
 #include <boost/assign/v2/ref/list/holder/head.hpp>
 #include <boost/assign/v2/ref/list/policy.hpp>
+/* // TODO possible extension
+#include <boost/config.hpp>
+#ifndef BOOST_NO_RVALUE_REFERENCES
+#include <utility>
+#else */
+#include <boost/call_traits.hpp>
+//#endif
+#include <boost/mpl/apply.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 namespace boost{
 namespace assign{
@@ -48,7 +49,7 @@
             typedef container<Tag, H1, this_> type;
         };
 
-/* // TODO see head_holder
+/* // TODO possible extension
 #ifndef BOOST_NO_RVALUE_REFERENCES
         explicit container(
             H&& h,
@@ -88,6 +89,7 @@
             typedef typename result<H1 const&>::type result_;
             return result_( h, *this);
         }
+        
 // #endif
 
 
@@ -99,4 +101,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_CONTAINER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/fwd.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/fwd.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -11,7 +11,7 @@
 #define BOOST_ASSIGN_V2_REF_LIST_FWD_ER_2010_HPP
 
 namespace boost{
-    struct use_default;
+    struct use_default; // TODO ?
 namespace assign{
 namespace v2{
 namespace ref{
@@ -31,4 +31,5 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_FWD_ER_2010_HPP
+

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/holder.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/holder.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/holder.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -13,4 +13,4 @@
 #include <boost/assign/v2/ref/list/holder/head.hpp>
 #include <boost/assign/v2/ref/list/holder/tail.hpp>
 
-#endif
+#endif BOOST_ASSIGN_V2_REF_LIST_HOLDER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/holder/head.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/holder/head.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/holder/head.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,14 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_HOLDER_HEAD_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_HOLDER_HEAD_ER_2010_HPP
-#include <boost/config.hpp>
 #include <boost/assign/v2/ref/list/fwd.hpp>
+#include <boost/config.hpp>
 #include <boost/type_traits/add_reference.hpp>
 
-/* #ifndef BOOST_NO_RVALUE_REFERENCES
+/* 
+// TODO possible extension
+#include <boost/config.hpp>
+#ifndef BOOST_NO_RVALUE_REFERENCES
 #include <utility>
 #endif */
 
@@ -23,7 +26,7 @@
 namespace ref{
 namespace list_aux{
 
-/* // TODO as standalone ok, but unsure effects in relation with ref-arrays
+/* // TODO possible extension, but unsure effects in relation with ref-arrays
 
 #ifndef BOOST_NO_RVALUE_REFERENCES
     template<typename T>
@@ -81,4 +84,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_HOLDER_HEAD_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/holder/tail.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/holder/tail.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/holder/tail.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -25,7 +25,8 @@
     struct tail_holder
     {
         typedef T tail_type;
-        typedef ::boost::mpl::int_<T::size::value+1> size;
+        typedef ::boost::mpl::int_<T::static_size::value + 1> static_size;
+
         tail_holder(T const& t) : tail_( t ){}
 
         typedef T const& result_of_tail_type;
@@ -39,7 +40,7 @@
     struct tail_holder<nil>
     {
         typedef nil tail_type;
-        typedef ::boost::mpl::int_<0> size;
+        typedef ::boost::mpl::int_<0> static_size;
         tail_holder(){}
     };
 
@@ -53,4 +54,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_HOLDER_TAIL_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/make.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/make.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -34,4 +34,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_MAKE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/nth_result_of.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/nth_result_of.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/nth_result_of.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,12 +9,12 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_NTH_RESULT_OF_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_NTH_RESULT_OF_ER_2010_HPP
-#include <boost/mpl/fold.hpp>
-#include <boost/mpl/placeholders.hpp>
-#include <boost/mpl/apply.hpp>
-#include <boost/mpl/vector.hpp> //user
 #include <boost/assign/v2/ref/list/fwd.hpp>
 #include <boost/assign/v2/ref/list/make.hpp>
+#include <boost/mpl/apply.hpp>
+#include <boost/mpl/fold.hpp>
+#include <boost/mpl/placeholders.hpp>
+#include <boost/mpl/vector.hpp> // Convenience header for the client of nth_result
 
 namespace boost{
 namespace assign{
@@ -41,7 +41,7 @@
     };
 
 }// fusion_aux
-namespace nth_result_of{
+namespace nth_result_of{ // TODO this should be result_of
 
     template<typename Tag>
     struct list
@@ -59,4 +59,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_NTH_RESULT_OF_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/policy.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/policy.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/policy.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_POLICY_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_POLICY_ER_2010_HPP
-#include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/always.hpp>
+#include <boost/mpl/empty_base.hpp>
 
 namespace boost{
 namespace assign{
@@ -29,4 +29,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_POLICY_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list/size_type.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/size_type.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/size_type.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -24,4 +24,5 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_SIZE_TYPE_ER_2010_HPP
+

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_TUPLE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_TUPLE_ER_2010_HPP
-
 #include <boost/assign/v2/ref/list_tuple/container.hpp>
 #include <boost/assign/v2/ref/list_tuple/keyword.hpp>
 #include <boost/assign/v2/ref/list_tuple/nth_result_of.hpp>
+#include <boost/assign/v2/ref/list_tuple/as_args_list.hpp>
 
 #endif // BOOST_ASSIGN_V2_REF_LIST_TUPLE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/container.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -14,5 +14,5 @@
 #include <boost/assign/v2/ref/list_tuple/cpp0x/container.hpp>
 #else
 #include <boost/assign/v2/ref/list_tuple/cpp03/container.hpp>
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 #endif // BOOST_ASSIGN_V2_REF_LIST_TUPLE_CONTAINER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/as_arglist.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/as_arglist.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/as_arglist.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -1,91 +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_REF_LIST_TUPLE_CPP03_AS_ARGLIST_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP03_AS_ARGLIST_ER_2010_HPP
-#include <boost/preprocessor/repetition.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/mpl/int.hpp>
-#include <boost/assign/v2/ref/tuple/cpp03/as_arglist.hpp>
-#include <boost/assign/v2/ref/list_tuple/container.hpp>
-#include <boost/assign/v2/detail/config/limit_arity.hpp>
-#include <boost/assign/v2/ref/list_tuple/size_type.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace ref{
-namespace list_tuple_aux{
-
-#define BOOST_ASSIGN_V2_params(T) BOOST_PP_ENUM_PARAMS(BOOST_ASSIGN_V2_LIMIT_ARITY,T)
-
-	// --- Implementation --- //
-
-    template<
-        typename F,
-        list_size_type N, typename L, BOOST_ASSIGN_V2_params(typename T)
-    >
-    void as_arglist(
-        F const& f ,
-        ::boost::mpl::int_<N>,
-        container<N, L, BOOST_ASSIGN_V2_params(T)> const& list
-    )
-    {}
-
-    template<
-        typename F,
-        list_size_type I,
-        list_size_type N,
-        typename L, BOOST_ASSIGN_V2_params(typename T)
-    >
-    void as_arglist(
-        F const& f ,
-        ::boost::mpl::int_<I>,
-        container<N, L, BOOST_ASSIGN_V2_params(T)> const& list
-    )
-    {
-        {
-            typedef ::boost::mpl::int_<I> int_;
-            as_arglist( f, list.get( int_() ) );
-        }
-        {
-            typedef ::boost::mpl::int_<I+1> next_;
-            as_arglist( f, next_(), list );
-        }
-    }
-
-    // ----- User interface ----- //
-
-    template<typename F, typename L>
-    void as_arglist(
-        F const& f ,
-        container<0, L> const& list
-    ){}
-
-    template<typename F,
-        list_size_type N, typename L, BOOST_ASSIGN_V2_params(typename T)>
-    void as_arglist(
-        F const& f,
-        container<N, L, BOOST_ASSIGN_V2_params(T)> const& list
-    )
-    {
-        typedef ::boost::mpl::int_<0> int_;
-        as_arglist(f, int_(), list);
-    }
-
-#undef BOOST_ASSIGN_V2_params
-
-}// list_tuple_aux
-using list_tuple_aux::as_arglist;
-}// ref
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/container.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,27 +9,23 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP03_CONTAINER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP03_CONTAINER_ER_2010_HPP
-#include <boost/preprocessor/arithmetic/dec.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/repetition.hpp>
-
-#include <boost/mpl/identity.hpp>
+#include <boost/assign/v2/detail/config/limit_arity.hpp>
+#include <boost/assign/v2/detail/functor/crtp_unary_and_up.hpp>
+#include <boost/assign/v2/ref/list_tuple/common.hpp>
+#include <boost/assign/v2/ref/list_tuple/extraction.hpp>
+#include <boost/assign/v2/ref/list_tuple/size_type.hpp>
+#include <boost/config.hpp>
+#include <boost/mpl/aux_/na.hpp>
 #include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
 #include <boost/mpl/unpack_args.hpp>
-#include <boost/mpl/aux_/na.hpp>
-#include <boost/config.hpp>
-#include <boost/type_traits/add_reference.hpp>
+#include <boost/preprocessor/arithmetic.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/repetition.hpp>
 #include <boost/tuple/tuple.hpp>
+#include <boost/type_traits/add_reference.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <boost/static_assert.hpp>
-
-#include <boost/assign/v2/detail/config/limit_arity.hpp>
-#include <boost/assign/v2/detail/functor/crtp_unary_and_up.hpp>
-#include <boost/assign/v2/ref/list_tuple/extraction.hpp>
-#include <boost/assign/v2/ref/list_tuple/common.hpp>
-#include <boost/assign/v2/ref/list_tuple/size_type.hpp>
 
 namespace boost{
 namespace assign{
@@ -248,4 +244,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP03_CONTAINER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/as_arglist.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/as_arglist.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/as_arglist.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -1,85 +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_REF_LIST_TUPLE_CPP0X_AS_ARGLIST_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP0X_AS_ARGLIST_ER_2010_HPP
-#include <boost/mpl/size.hpp>
-#include <boost/assign/v2/ref/tuple/cpp0x/as_arglist.hpp>
-#include <boost/assign/v2/ref/list_tuple/container.hpp>
-#include <boost/assign/v2/temporary/variadic_args_to_indices.hpp>
-#include <boost/assign/v2/ref/list_tuple/size_type.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace ref{
-namespace list_tuple_aux{
-
-
-    // --- List  --- //
-
-    template<
-        typename F,
-        list_size_type N, typename L, typename...Args
-    >
-    void as_arglist(
-        F const& f ,
-        ::boost::mpl::int_<N>,
-        container<N, L, Args...> const& list
-    )
-    {}
-
-    template<
-        typename F,
-        list_size_type I,
-        list_size_type N, typename L, typename...Args
-    >
-    void as_arglist(
-        F const& f ,
-        ::boost::mpl::int_<I>,
-        container<N, L, Args...> const& list
-    )
-    {
-        {
-            typedef ::boost::mpl::int_<I> int_;
-            as_arglist( f, list.get( int_() ) ); // tuple
-        }
-        {
-            typedef ::boost::mpl::int_<I+1> next_;
-            as_arglist( f, next_(), list );
-        }
-    }
-
-    // ------------ //
-
-    template<typename F, typename L>
-    void as_arglist(
-        F const& f ,
-        container<0, L> const& list
-    ){}
-
-    template<typename F,
-        list_size_type N, typename L, typename...Args>
-    void as_arglist(
-        F const& f,
-        container<N, L, Args...> const& list
-    )
-    {
-        typedef ::boost::mpl::int_<0> int_;
-        as_arglist(f, int_(), list);
-    }
-
-}// list_tuple_aux
-using list_tuple_aux::as_arglist;
-}// ref
-}// v2
-}// assign
-}// boost
-
-#endif 
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,19 +10,17 @@
 #ifndef BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP0X_CONTAINER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_TUPLE_CPP0X_CONTAINER_ER_2010_HPP
 #include <utility>
-
-#include <boost/mpl/identity.hpp>
+#include <boost/assign/v2/ref/list_tuple/extraction.hpp>
+#include <boost/assign/v2/ref/list_tuple/common.hpp>
+#include <boost/assign/v2/ref/list_tuple/size_type.hpp>
+#include <boost/assign/v2/ref/tuple/cpp0x/data.hpp>
+#include <boost/config.hpp>
 #include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 
-#include <boost/assign/v2/ref/tuple/cpp0x.hpp>
-#include <boost/assign/v2/ref/list_tuple/extraction.hpp>
-#include <boost/assign/v2/ref/list_tuple/common.hpp>
-#include <boost/assign/v2/ref/list_tuple/size_type.hpp>
-
 namespace boost{
 namespace assign{
 namespace v2{
@@ -66,14 +64,14 @@
     >::type,
     public list_tuple_aux::extraction<
         N, L,
-        tuple_aux::container<Args...>,
+        tuple_aux::data<Args...>,
         list_tuple_aux::container<N, L, Args...>
     >
     {
         typedef link<L> link_;
         typedef meta_result<N, L, Args...> meta_result_;
 
-        typedef tuple_aux::container<Args...> tuple_;
+        typedef tuple_aux::data<Args...> tuple_;
         tuple_ tuple;
 
         public:
@@ -82,6 +80,7 @@
 
         typedef list_tuple_aux::list_size_type list_size_type;
         typedef list_tuple_aux::tuple_size_type tuple_size_type;
+        
         BOOST_STATIC_CONSTANT( list_size_type, static_get_size = N );
         BOOST_STATIC_CONSTANT(
             tuple_size_type,

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/extraction.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/extraction.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/extraction.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,12 +9,12 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_TUPLE_EXTRACTION_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_TUPLE_EXTRACTION_ER_2010_HPP
-#include <boost/mpl/eval_if.hpp>
+#include <boost/assign/v2/ref/list_tuple/size_type.hpp>
 #include <boost/mpl/bool.hpp>
+#include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <boost/assign/v2/ref/list_tuple/size_type.hpp>
 
 namespace boost{
 namespace assign{

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/nth_result_of.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/nth_result_of.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/nth_result_of.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,16 +9,16 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_LIST_TUPLE_NTH_RESULT_OF_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_LIST_TUPLE_NTH_RESULT_OF_ER_2010_HPP
-#include <boost/mpl/unpack_args.hpp>
+#include <boost/assign/v2/ref/list_tuple/container.hpp>
 #include <boost/mpl/apply.hpp>
 #include <boost/mpl/fold.hpp>
-#include <boost/assign/v2/ref/list_tuple/container.hpp>
+#include <boost/mpl/unpack_args.hpp>
 
 namespace boost{
 namespace assign{
 namespace v2{
 namespace ref{
-namespace nth_result_of{
+namespace nth_result_of{ // TODO this should be result_of
 
     class list_tuple
     {

Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/size_type.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/size_type.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/size_type.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -25,4 +25,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_LIST_TUPLE_SIZE_TYPE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/tuple/as_arglist.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/tuple/as_arglist.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/tuple/as_arglist.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -1,18 +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_REF_TUPLE_AS_ARGLIST_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_TUPLE_AS_ARGLIST_ER_2010_HPP
-#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-#include <boost/assign/v2/ref/tuple/cpp0x/as_arglist.hpp>
-#else
-#include <boost/assign/v2/ref/tuple/cpp03/as_arglist.hpp>
-#endif
-#endif // BOOST_ASSIGN_V2_REF_TUPLE_AS_ARGLIST_ER_2010_HPP
\ No newline at end of file
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp03/as_arglist.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp03/as_arglist.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp03/as_arglist.hpp	2011-03-08 22:09:11 EST (Tue, 08 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)        //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_REF_TUPLE_CPP03_AS_ARGLIST_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_TUPLE_CPP03_AS_ARGLIST_ER_2010_HPP
-#include <boost/preprocessor/repetition.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/tuple/tuple.hpp>
-#include <boost/assign/v2/detail/config/limit_arity.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace ref{
-
-#define BOOST_ASSIGN_V2_MACRO1(z, I, data) ::boost::get<I>( data )
-#define BOOST_ASSIGN_V2_MACRO(z, N, data)\
-    template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)>\
-    void as_arglist(\
-        F const& f,\
-        ::boost::tuples::tuple<BOOST_PP_ENUM_PARAMS(N, T)> const& t\
-    )\
-    {\
-        f( BOOST_PP_ENUM(N, BOOST_ASSIGN_V2_MACRO1, t) );\
-    }\
-/**/
-BOOST_PP_REPEAT(
-    BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_ARITY),
-    BOOST_ASSIGN_V2_MACRO,
-    ~
-)
-#undef BOOST_ASSIGN_V2_MACRO1
-#undef BOOST_ASSIGN_V2_MACRO
-
-}// ref
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/as_arglist.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/as_arglist.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/as_arglist.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -1,53 +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_REF_TUPLE_CPP0X_AS_ARGLIST_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_TUPLE_CPP0X_AS_ARGLIST_ER_2010_HPP
-#include <boost/assign/v2/ref/tuple/cpp0x/data.hpp>
-#include <boost/assign/v2/temporary/variadic_args_to_indices.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace ref{
-namespace tuple_aux{
-
-    // --- Implementation --- //
-
-    template<typename F, typename T, typename I, I ...Values>
-    void as_arglist_helper(
-        F const& f,
-        T const& t,
-        ::boost::mpl::er2010::indices<I, Values...>
-    )
-    {
-        f( ref::get<Values>( t )... );
-    }
-
-    template<typename F, typename ...Args>
-    void as_arglist(
-        F const& f,
-        data<Args...> const& t
-    )
-    {
-        typedef typename ::boost::mpl::er2010::args_to_indices<
-            int,
-            Args...
-        >::type indices_;
-        as_arglist_helper( f, t, indices_() );
-    }
-
-}// tuple_aux
-using tuple_aux::as_arglist;
-}// ref
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/data.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/tuple/cpp0x/data.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,10 +10,10 @@
 #ifndef BOOST_ASSIGN_V2_REF_TUPLE_CPP0X_DATA_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_TUPLE_CPP0X_DATA_ER_2010_HPP
 #include <utility>
-#include <boost/type_traits/is_reference.hpp>
+#include <boost/assign/v2/ref/tuple/cpp0x.hpp>
 #include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
-#include <boost/assign/v2/ref/tuple/cpp0x.hpp>
+#include <boost/type_traits/is_reference.hpp>
 
 // This tuple variant keeps a copy of rvalue reference. Expression templates
 // involving references to tuples otheriwse cause runtime errors in Release mode under OS X.

Modified: sandbox/assign_v2/boost/assign/v2/ref/tuple/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/tuple/data.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/tuple/data.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -14,5 +14,5 @@
 #include <boost/assign/v2/ref/tuple/cpp0x/data.hpp>
 #else
 #include <boost/tuple/tuple.hpp>
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 #endif // BOOST_ASSIGN_V2_REF_TUPLE_DATA_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,9 +10,9 @@
 #ifndef BOOST_ASSIGN_V2_REF_WRAPPER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_WRAPPER_ER_2010_HPP
 
+#include <boost/assign/v2/ref/wrapper/get.hpp>
 #include <boost/assign/v2/ref/wrapper/copy.hpp>
 #include <boost/assign/v2/ref/wrapper/cpp0x.hpp>
-#include <boost/assign/v2/ref/wrapper/get.hpp>
 #include <boost/assign/v2/ref/wrapper/range_get.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_WRAPPER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,12 +9,12 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_WRAPPER_COPY_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_WRAPPER_COPY_ER_2010_HPP
-#include <boost/config.hpp>
+#include <boost/assign/v2/ref/wrapper/crtp.hpp>
+#include <boost/assign/v2/ref/wrapper/framework.hpp>
 #include <boost/call_traits.hpp>
+#include <boost/config.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/remove_cv.hpp>
-#include <boost/assign/v2/ref/wrapper/framework.hpp>
-#include <boost/assign/v2/ref/wrapper/crtp.hpp>
 
 namespace boost{
 namespace assign{
@@ -29,10 +29,7 @@
         public ref::wrapper_crtp< wrapper<ref::assign_tag::copy, T>, T>
     {
         typedef T type;
-        BOOST_STATIC_CONSTANT(
-            bool,
-            is_const = boost::is_const<T>::value
-        );
+        BOOST_STATIC_CONSTANT( bool, is_const = boost::is_const<T>::value );
 
         wrapper(){/*TODO or null pointer?*/}
 
@@ -44,7 +41,6 @@
             this->ref_ = &r;
         }
 
-        // TODO a) crtp b) reference() or get()
         typedef T& result_of_get_type;
         T& get() const
         {
@@ -82,4 +78,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_WRAPPER_COPY_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/cpp0x.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/cpp0x.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/cpp0x.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_TRAITS_TYPE_CPP0X_ER_2010_HPP
 #define BOOST_ASSIGN_V2_TRAITS_TYPE_CPP0X_ER_2010_HPP
-
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
-
 #include <boost/type_traits/add_const.hpp>
 
 namespace boost{
@@ -43,6 +40,6 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
 #endif // BOOST_ASSIGN_V2_TRAITS_TYPE_CPP0X_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -11,12 +11,12 @@
 #ifndef BOOST_ASSIGN_V2_REF_WRAPPER_CRTP_ER_MPG_2010_HPP
 #define BOOST_ASSIGN_V2_REF_WRAPPER_CRTP_ER_MPG_2010_HPP
 #include <iosfwd>
-#include <boost/utility/enable_if.hpp>
+#include <boost/call_traits.hpp>
+#include <boost/operators.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/type_traits/add_const.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/operators.hpp>
+#include <boost/utility/enable_if.hpp>
 
 // This design is an outgrowth of assign_detail::assign_reference<> by TO.
 
@@ -48,7 +48,6 @@
         typedef typename boost::add_const<T>::type const_;
 
         public:
-        // protected
 
         D& derived(){ return static_cast<D&>( *this ); }
         D const & derived()const{ return static_cast<D const&>( *this ); }
@@ -104,10 +103,10 @@
     };
 
 
-    template<typename D,typename T>
+    template<typename D, typename T>
     void rebind( wrapper_crtp<D,T>& a, T& t ){ a.rebind( t ); }
 
-    template<typename D,typename T>
+    template<typename D, typename T>
     inline void swap( wrapper_crtp<D,T>& l, wrapper_crtp<D,T>& r )
     {
         l.swap( r );
@@ -118,4 +117,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_WRAPPER_CRTP_ER_MPG_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/framework.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/framework.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/framework.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -15,7 +15,7 @@
 namespace v2{
 namespace ref{
 
-    template<typename Tag,typename T>
+    template<typename Tag, typename T>
     struct wrapper{
         // specialize on Tag
     };
@@ -57,7 +57,7 @@
 namespace boost{
 
 #  define AUX_REFERENCE_WRAPPER_METAFUNCTIONS_DEF(U) \
-template<typename Tag,typename T> \
+template<typename Tag, typename T> \
 class is_reference_wrapper<U> \
     : public mpl::true_ \
 { \
@@ -85,4 +85,4 @@
 
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_WRAPPER_FRAMEWORK_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/get.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/get.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/get.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -69,4 +69,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_WRAPPER_GET_ER_2010_HPP

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -115,4 +115,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_REF_WRAPPER_RANGE_GET_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/temporary/variadic_args_to_indices.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/temporary/variadic_args_to_indices.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/temporary/variadic_args_to_indices.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -15,7 +15,7 @@
 
 template<typename ...Args> struct pack_holder{};
 
-template<typename Indices,typename Pack> struct args_to_indices{};
+template<typename Indices, typename Pack> struct args_to_indices{};
 
 template<typename I, I...Tail, typename T, typename... Rest>
 struct args_to_indices<
@@ -39,7 +39,7 @@
 
 }// impl
 
-template<typename I,typename...Args>
+template<typename I, typename...Args>
 struct args_to_indices : impl::args_to_indices<
     indices<I>,
     impl::pack_holder<Args...>

Modified: sandbox/assign_v2/boost/assign/v2/temporary/variadic_sequence.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/temporary/variadic_sequence.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/temporary/variadic_sequence.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -62,4 +62,4 @@
 }; \
 /**/
 
-#endif
+#endif // BOOST_MPL_DETAIL_VARIADIC_SEQUENCE_HPP_ER_2010

Modified: sandbox/assign_v2/boost/assign/v2/temporary/variadic_vector.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/temporary/variadic_vector.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/temporary/variadic_vector.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -27,4 +27,4 @@
 }// mpl
 }// boost
 
-#endif
+#endif // BOOST_MPL_DETAIL_VARIADIC_VECTOR_HPP_ER_2010

Modified: sandbox/assign_v2/boost/assign/v2/utility.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -14,4 +14,4 @@
 #include <boost/assign/v2/utility/conversion.hpp>
 #include <boost/assign/v2/utility/csv.hpp>
 
-#endif
+#endif BOOST_ASSIGN_V2_UTILITY_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -12,7 +12,7 @@
 
 #include <boost/assign/v2/utility/chain/pipe.hpp>
 
-// While && is convenient it's safer not to include it by default
-//     #include <boost/assign/v2/utility/chain/short.hpp>
+// This has to be included explicitly (it's convenient, but some may object to operator overloading)
+//     #include <boost/assign/v2/utility/chain/alias.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_UTILITY_CHAIN_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/adaptor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/adaptor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/adaptor.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -65,4 +65,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_CHAIN_ADAPTOR_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/alias.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/alias.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/alias.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -18,7 +18,7 @@
 namespace v2{
 
 #define BOOST_ASSIGN_V2_MACRO(U1, U2) \
-template<typename R1,typename R2> \
+template<typename R1, typename R2> \
 typename chain_aux::result< \
     U1,\
     U2 \
@@ -38,4 +38,4 @@
 }// assign
 }// boost
 
-#endif
\ No newline at end of file
+#endif // BOOST_ASSIGN_V2_CHAIN_ALIAS_ER_2010_HPP
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,21 +9,21 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_CHAIN_CHECK_ER_2010_HPP
 #define BOOST_ASSIGN_V2_CHAIN_CHECK_ER_2010_HPP
-#include <boost/static_assert.hpp>
 #include <vector>
 #include <boost/array.hpp>
+#include <boost/assign/v2/detail/config/check.hpp>
+#include <boost/assign/v2/ref/wrapper/range_get.hpp>
+#include <boost/assign/v2/ref/wrapper/copy.hpp>
+#include <boost/assign/v2/utility/chain/pipe.hpp>
+#include <boost/assign/v2/utility/chain/use_const.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/assert.hpp>
-#include <boost/type_traits/add_const.hpp>
-#include <boost/type_traits/is_same.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/algorithm/equal.hpp>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/ref/wrapper/range_get.hpp>
-#include <boost/assign/v2/ref/wrapper/copy.hpp>
-#include <boost/assign/v2/utility/chain/use_const.hpp>
-#include <boost/assign/v2/utility/chain/pipe.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 namespace boost{
 namespace assign{
@@ -180,4 +180,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_CHAIN_CHECK_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/iterator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/iterator.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/iterator.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,12 +9,12 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_CHAIN_ITERATOR_ER_2010_HPP
 #define BOOST_ASSIGN_V2_CHAIN_ITERATOR_ER_2010_HPP
-#include <boost/mpl/apply.hpp>
-#include <boost/type_traits/remove_reference.hpp>
+#include <boost/assign/v2/detail/traits/type/meta_convert.hpp>
 #include <boost/iterator/iterator_traits.hpp>
-#include <boost/range/detail/join_iterator.hpp>
+#include <boost/mpl/apply.hpp>
 #include <boost/range/detail/demote_iterator_traversal_tag.hpp>
-#include <boost/assign/v2/detail/traits/type/meta_convert.hpp>
+#include <boost/range/detail/join_iterator.hpp>
+#include <boost/type_traits/remove_reference.hpp>
 
 namespace boost{
 namespace assign{
@@ -57,4 +57,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_CHAIN_ITERATOR_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/pipe.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/pipe.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/pipe.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -11,9 +11,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_CHAIN_PIPE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_CHAIN_PIPE_ER_2010_HPP
-#include <boost/mpl/void.hpp>
-#include <boost/assign/v2/utility/chain/result.hpp>
 #include <boost/assign/v2/utility/chain/adaptor.hpp>
+#include <boost/assign/v2/utility/chain/result.hpp>
+#include <boost/mpl/void.hpp>
 
 // Design:
 // - Original design was boost::chain in RangeEx
@@ -54,4 +54,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_CHAIN_PIPE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/range.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/range.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/range.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,10 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_CHAIN_RANGE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_CHAIN_RANGE_ER_2010_HPP
+#include <boost/assign/v2/utility/chain/iterator.hpp>
 #include <boost/concept/assert.hpp>
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/iterator.hpp>
-#include <boost/assign/v2/utility/chain/iterator.hpp>
 
 namespace boost{
 namespace assign{
@@ -58,4 +58,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_CHAIN_RANGE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/result.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/result.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/result.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,17 +9,17 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_CHAIN_RESULT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_CHAIN_RESULT_ER_2010_HPP
-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/identity.hpp>
 #include <boost/assign/v2/utility/chain/use_const.hpp>
 #include <boost/assign/v2/utility/chain/range.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
 
 namespace boost{
 namespace assign{
 namespace v2{
 namespace chain_aux{
 
-    template<typename R1,typename R2,typename Tag = use_default>
+    template<typename R1, typename R2, typename Tag = use_default>
     struct result{
         typedef typename  ::boost::mpl::eval_if<
             chain_aux::use_const<R1, R2, Tag>,
@@ -40,4 +40,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_CHAIN_RESULT_ER_2010_HPP

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -14,11 +14,11 @@
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/identity.hpp>
-#include <boost/type_traits/remove_reference.hpp>
+#include <boost/range/reference.hpp>
+#include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/is_reference.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/range/reference.hpp>
+#include <boost/type_traits/remove_reference.hpp>
 
 namespace boost{
     struct use_default;
@@ -53,4 +53,5 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_CHAIN_USE_CONST_ER_2010_HPP
+

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_UTILITY_CONVERSION_ER_2010_HPP
 #define BOOST_ASSIGN_V2_UTILITY_CONVERSION_ER_2010_HPP
-
 #include <boost/assign/v2/utility/conversion/convert.hpp>
 #include <boost/assign/v2/utility/conversion/converter.hpp>
-#include <boost/assign/v2/utility/conversion/name_lookup.hpp>
 
 #endif

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/check.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/check.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -16,14 +16,14 @@
 #include <set>
 #include <stack>
 #include <vector>
-#include <boost/mpl/assert.hpp>
-#include <boost/type.hpp>
 #include <boost/array.hpp>
-#include <boost/type_traits/is_same.hpp>
 #include <boost/assign/v2/utility/conversion/converter.hpp>
 #include <boost/assign/v2/utility/conversion/deduce_tag.hpp>
 #include <boost/assign/v2/utility/conversion/predicate.hpp>
 #include <boost/assign/v2/detail/check/fwd_equal_container.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/type.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 // Don't include this file in v2/utility/conversion.hpp
 
@@ -115,4 +115,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_UTILITY_CONVERSION_CHECK_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_ER_2010_HPP
+#include <boost/assign/v2/put/container/range.hpp>
 #include <boost/assign/v2/utility/conversion/deduce_tag.hpp>
-#include <boost/assign/v2/utility/conversion/dispatch.hpp>
 
 namespace boost{
 namespace assign{
@@ -21,8 +21,7 @@
     C convert(R const& r, convert_tag::put)
     {
         C cont;
-        return (cont | v2::_put_range( r ) );
-
+        return v2::put_range( cont, r );
     }
 
     template<typename C, typename R>
@@ -31,22 +30,21 @@
         return C( boost::begin( r ), boost::end( r ) );
     }
 
+    template<typename C, typename R>
+    C convert(R const& r)
+    {
+		typedef typename convert_aux::deduce_tag<C, R>::type tag_;
+        return convert_aux::convert<C>( r, tag_() );
+    }
 
 }// convert_aux
+using convert_aux::convert;
 namespace result_of{
 
         template<typename /*<<Container>>*/ C, typename /*<<Range>>*/R>
     struct convert{ typedef C type; };
 
 }//result_of
-
-    template<typename C, typename R>
-    C convert(R const& r)
-    {
-		typedef typename convert_aux::deduce_tag<C, R>::type tag_;
-        return convert_aux::convert<C>( r, tag_() );
-    }
-
 }// v2
 }// assign
 }// boost
@@ -60,19 +58,18 @@
 
 #define BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_NAME_LOOKUP_PARAM(s, data, T) typename T
 #define BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_NAME_LOOKUP(Seq, R)\
-    template<BOOST_PP_SEQ_ENUM(\
+    template<typename C, BOOST_PP_SEQ_ENUM(\
         BOOST_PP_SEQ_TRANSFORM(\
-            BOOST_ASSIGN_V2_UTILITY_CONVERSION_NAME_LOOKUP_PARAM,\
+            BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_NAME_LOOKUP_PARAM,\
             ~,\
             Seq\
         )\
     )>\
     typename ::boost::assign::v2::result_of::convert<C, R>::type \
-    convert( R const& range)\
+    convert( R const& range )\
     {\
         return ::boost::assign::v2::convert<C>( range );\
     }\
 /**/
-#endif
 
-#endif
+#endif //  BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,11 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER_ER_2010_HPP
+#include <boost/assign/v2/ref/wrapper.hpp>
+#include <boost/assign/v2/utility/conversion/convert.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/type_traits/add_const.hpp>
-#include <boost/assign/v2/ref/wrapper.hpp>
-#include <boost/assign/v2/utility/conversion/convert.hpp>
 
 namespace boost{
 namespace assign{
@@ -62,7 +62,6 @@
 
 }//result_of
 
-
     template<typename R>
     typename result_of::converter<R>::type
     converter(R const& r){
@@ -83,7 +82,7 @@
 #include <boost/preprocessor/seq/transform.hpp>
 
 #define BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER_NAME_LOOKUP_PARAM(s, data, T) typename T
-#define BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER(Seq, R)\
+#define BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER_NAME_LOOKUP(Seq, R)\
     template<BOOST_PP_SEQ_ENUM(\
         BOOST_PP_SEQ_TRANSFORM(\
             BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER_NAME_LOOKUP_PARAM,\
@@ -91,13 +90,12 @@
             Seq\
         )\
     )>\
-    typename ::boost::assign::v2::result_of::converter< R >::type \
-    converter( R const& range)\
+    typename ::boost::assign::v2::result_of::converter<R>::type \
+    converter( R const& range )\
     {\
-        typedef typename ::boost::assign::v2::result_of::converter< R >::type result_; \
-        return result_( range );\
+        return ::boost::assign::v2::converter( range );\
     }\
 /**/
-#endif
 
-#endif
+
+#endif // BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/deduce_tag.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/deduce_tag.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/deduce_tag.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,10 +9,10 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_UTILITY_CONVERSION_DEDUCE_TAG_ER_2010_HPP
 #define BOOST_ASSIGN_V2_UTILITY_CONVERSION_DEDUCE_TAG_ER_2010_HPP
-#include <boost/mpl/pair.hpp>
 #include <boost/assign/v2/detail/traits/switch.hpp>
 #include <boost/assign/v2/utility/conversion/helper.hpp>
 #include <boost/assign/v2/utility/conversion/predicate.hpp>
+#include <boost/mpl/pair.hpp>
 
 namespace boost{
     struct use_default;

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/dispatch.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/dispatch.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/dispatch.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -1,43 +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_UTILITY_CONVERSION_DISPATCH_ER_2010_HPP
-#define BOOST_ASSIGN_V2_UTILITY_CONVERSION_DISPATCH_ER_2010_HPP
-#include <boost/range/begin.hpp>
-#include <boost/range/end.hpp>
-#include <boost/detail/workaround.hpp>
-#include <boost/assign/v2/put/pipe/range.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-//[convert_dispatch
-namespace convert_aux{
-
-    template<typename C, typename R>
-    C dispatch(R const& r, convert_tag::put)
-    {
-        C cont;
-        return (cont | v2::_put_range( r ) );
-
-    }
-
-    template<typename C, typename R>
-    C dispatch(R const& r, convert_tag::copy)
-    {
-        return C( boost::begin( r ), boost::end( r ) );
-    }
-
-}// convert_aux
-//]
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/helper.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/helper.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/helper.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -39,4 +39,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_UTILITY_CONVERSION_HELPER_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/name_lookup.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/name_lookup.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/name_lookup.hpp	2011-03-08 22:09:11 EST (Tue, 08 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_UTILITY_CONVERSION_NAME_LOOKUP_ER_2010_HPP
-#define BOOST_ASSIGN_V2_UTILITY_CONVERSION_NAME_LOOKUP_ER_2010_HPP
-#include <boost/assign/v2/utility/conversion/convert.hpp>
-#include <boost/assign/v2/utility/conversion/converter.hpp>
-
-// Expanding
-//  namespace ns{
-//   BOOST_ASSIGN_V2_CONVERTER( (A)(B)(C), range<A,B,C> )
-//  }
-// creates a name-lookup version of convert() and converter()  for name ns::range<A, B, C>
-
-
-#define BOOST_ASSIGN_V2_UTILITY_CONVERSION_NAME_LOOKUP(Seq, R)\
-BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_NAME_LOOKUP(Seq, R)\
-BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER_NAME_LOOKUP(Seq, R)\
-/**/
-
-#endif
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/predicate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/predicate.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/predicate.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,9 +9,9 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_UTILITY_CONVERSION_TRAITS_ER_2010_HPP
 #define BOOST_ASSIGN_V2_UTILITY_CONVERSION_TRAITS_ER_2010_HPP
-#include <boost/mpl/or.hpp>
 #include <boost/assign/v2/detail/traits/container/is_array.hpp>
 #include <boost/assign/v2/detail/traits/container/has_push.hpp>
+#include <boost/mpl/or.hpp>
 
 namespace boost{
 namespace assign{
@@ -29,4 +29,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_UTILITY_CONVERSION_TRAITS_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/utility/csv.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/csv.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/csv.hpp	2011-03-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -10,7 +10,7 @@
 #ifndef BOOST_ASSIGN_V2_UTILITY_CSV_ER_2010_HPP
 #define BOOST_ASSIGN_V2_UTILITY_CSV_ER_2010_HPP
 
-#include <boost/assign/v2/utility/csv/result.hpp>
 #include <boost/assign/v2/utility/csv/make.hpp>
+#include <boost/assign/v2/utility/csv/result.hpp>
 
-#endif
+#endif // BOOST_ASSIGN_V2_UTILITY_CSV_ER_2010_HPP

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -9,18 +9,17 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_UTILITY_CSV_MAKE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_UTILITY_CSV_MAKE_ER_2010_HPP
-#include <boost/mpl/vector.hpp>
 #include <boost/assign/v2/utility/csv/result.hpp>
-
+#include <boost/mpl/vector.hpp>
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <utility>
 #include <boost/assign/v2/temporary/variadic_vector.hpp>
 #else
+#include <boost/assign/v2/detail/config/limit_csv_arity.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/repetition.hpp>
-#include <boost/assign/v2/detail/config/limit_csv_arity.hpp>
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
 namespace boost{
 namespace assign{
@@ -91,4 +90,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X

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-08 22:09:11 EST (Tue, 08 Mar 2011)
@@ -56,4 +56,4 @@
 }// assign
 }// boost
 
-#endif
+#endif // BOOST_ASSIGN_V2_UTILITY_CSV_RESULT_ER_2010_HPP