[Boost-commit] svn:boost r70599 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/deque boost/assign/v2/include boost/assign/v2/include/macro boost/assign/v2/option/data_generator libs/assign/v2/test libs/assign/v2/test/option libs/assign/v2/test/pipe/option

Subject: [Boost-commit] svn:boost r70599 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/deque boost/assign/v2/include boost/assign/v2/include/macro boost/assign/v2/option/data_generator libs/assign/v2/test libs/assign/v2/test/option libs/assign/v2/test/pipe/option
From: erwann.rogard_at_[hidden]
Date: 2011-03-26 16:51:14

Author: e_r
Date: 2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
New Revision: 70599
URL: http://svn.boost.org/trac/boost/changeset/70599

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/deque/deque.hpp                  |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/_data.hpp                |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/_insert.hpp              |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/_iterate.hpp             |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/_key.hpp                 |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/_mapped.hpp              |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/_push.hpp                |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/_push_back.hpp           |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/_push_front.hpp          |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/_repeat.hpp              |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/macro/modifier.hpp       |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/macro/std_modifier.hpp   |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/option.hpp                       |    12 ++++++------                            
   sandbox/assign_v2/boost/assign/v2/option/data_generator/key.hpp    |     8 ++++----                                
   sandbox/assign_v2/boost/assign/v2/put.hpp                          |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/csv.cpp                      |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/option/data.cpp              |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp           |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp            |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp            |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp      |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp         |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp      |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp       |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp       |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp |     2 +-                                      
   26 files changed, 37 insertions(+), 37 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/deque/deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/deque.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/deque/deque.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -11,7 +11,7 @@
 #define BOOST_ASSIGN_V2_DEQUE_DEQUE_ER_2010_HPP
 #include <deque>
 #include <boost/assign/v2/interpreter/crtp.hpp>
-#include <boost/assign/v2/interpreter/data.hpp>
+#include <boost/assign/v2/interpreter/data_generator.hpp>
 #include <boost/assign/v2/interpreter/modifier.hpp>
 #include <boost/assign/v2/interpreter/replace.hpp>
 #include <boost/assign/v2/deque/fwd.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/include/_data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_data.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/_data.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,6 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE__DATA_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE__DATA_ER_2010_HPP
-#include <boost/assign/v2/option/data.hpp>
+#include <boost/assign/v2/option/data_generator/framework.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE__DATA_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/_insert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_insert.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/_insert.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,6 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE__INSERT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE__INSERT_ER_2010_HPP
-#include <boost/assign/v2/option/insert.hpp>
+#include <boost/assign/v2/option/modifier/std.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE__INSERT_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/_iterate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_iterate.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/_iterate.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,6 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE__ITERATE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE__ITERATE_ER_2010_HPP
-#include <boost/assign/v2/option/iterate.hpp>
+#include <boost/assign/v2/option/modifier/iterate.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE__ITERATE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/_key.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_key.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/_key.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,6 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE__KEY_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE__KEY_ER_2010_HPP
-#include <boost/assign/v2/option/key.hpp>
+#include <boost/assign/v2/option/data_generator/key.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE__KEY_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/_mapped.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_mapped.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/_mapped.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,6 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE__MAPPED_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE__MAPPED_ER_2010_HPP
-#include <boost/assign/v2/option/mapped.hpp>
+#include <boost/assign/v2/option/modifier/mapped.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE__MAPPED_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/_push.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_push.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/_push.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,6 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE__PUSH_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE__PUSH_ER_2010_HPP
-#include <boost/assign/v2/option/push.hpp>
+#include <boost/assign/v2/option/modifier/std.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE__PUSH_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/_push_back.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_push_back.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/_push_back.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,6 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE__PUSH_BACK_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE__PUSH_BACK_ER_2010_HPP
-#include <boost/assign/v2/option/push_back.hpp>
+#include <boost/assign/v2/option/modifier/std.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE__PUSH_BACK_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/_push_front.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_push_front.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/_push_front.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,6 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE__PUSH_FRONT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE__PUSH_FRONT_ER_2010_HPP
-#include <boost/assign/v2/option/push_front.hpp>
+#include <boost/assign/v2/option/modifier/std.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE__PUSH_FRONT_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/_repeat.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_repeat.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/_repeat.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,6 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE__REPEAT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE__REPEAT_ER_2010_HPP
-#include <boost/assign/v2/option/repeat.hpp>
+#include <boost/assign/v2/option/modifier/repeat.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE__REPEAT_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/macro/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/macro/modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/macro/modifier.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE_MACRO_MODIFIER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE_MACRO_MODIFIER_ER_2010_HPP
-#include <boost/assign/v2/option/modifier.hpp>
+#include <boost/assign/v2/option/modifier/framework.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE_MACRO_MODIFIER_ER_2010_HPP
 

Modified: sandbox/assign_v2/boost/assign/v2/include/macro/std_modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/macro/std_modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/macro/std_modifier.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE_MACRO_STD_MODIFIER_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE_MACRO_STD_MODIFIER_ER_2010_HPP
-#include <boost/assign/v2/option/std_modifier.hpp>
+#include <boost/assign/v2/option/modifier/std.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE_MACRO_STD_MODIFIER_ER_2010_HPP
 

Modified: sandbox/assign_v2/boost/assign/v2/option.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -9,11 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_OPTION_ER_2010_HPP
 #define BOOST_ASSIGN_V2_OPTION_ER_2010_HPP
-#include <boost/assign/v2/option/key.hpp>
-#include <boost/assign/v2/option/iterate.hpp>
-#include <boost/assign/v2/option/mapped.hpp>
-#include <boost/assign/v2/option/modifier.hpp>
-#include <boost/assign/v2/option/repeat.hpp>
-#include <boost/assign/v2/option/std_modifier.hpp>
+#include <boost/assign/v2/option/data_generator/key.hpp>
+#include <boost/assign/v2/option/modifier/iterate.hpp>
+#include <boost/assign/v2/option/modifier/mapped.hpp>
+#include <boost/assign/v2/option/modifier/framework.hpp>
+#include <boost/assign/v2/option/modifier/repeat.hpp>
+#include <boost/assign/v2/option/modifier/std.hpp>
 
 #endif // BOOST_ASSIGN_V2_OPTION_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/option/data_generator/key.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/data_generator/key.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/data_generator/key.hpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -7,11 +7,11 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_OPTION_KEY_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTION_KEY_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_OPTION_DATA_GENERATOR_KEY_ER_2010_HPP
+#define BOOST_ASSIGN_V2_OPTION_DATA_GENERATOR_KEY_ER_2010_HPP
 #include <boost/assign/v2/detail/traits/ptr_container/meta.hpp>
 #include <boost/assign/v2/detail/traits/value_container/category.hpp>
-#include <boost/assign/v2/interpreter/data.hpp>
+#include <boost/assign/v2/interpreter/data_generator.hpp>
 #include <boost/assign/v2/option/data_generator/framework.hpp>
 #include <boost/mpl/apply.hpp>
 #include <boost/utility/enable_if.hpp>
@@ -85,4 +85,4 @@
 }// assign
 }// boost
 
-#endif // BOOST_ASSIGN_V2_OPTION_KEY_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_DATA_GENERATOR_KEY_ER_2010_HPP

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-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -10,7 +10,7 @@
 #ifndef BOOST_ASSIGN_V2_PUT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_ER_2010_HPP
 #include <boost/assign/v2/interpreter/crtp.hpp>
-#include <boost/assign/v2/interpreter/data.hpp>
+#include <boost/assign/v2/interpreter/data_generator.hpp>
 #include <boost/assign/v2/interpreter/modifier.hpp>
 #include <boost/assign/v2/interpreter/replace.hpp>
 #include <boost/assign/v2/detail/pp/ignore.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/csv.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/csv.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/csv.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -12,7 +12,7 @@
 #include <boost/assign/v2/csv.hpp>
 #include <boost/assign/v2/deque.hpp>
 #include <boost/assign/v2/put.hpp>
-#include <boost/assign/v2/option/push_front.hpp>
+#include <boost/assign/v2/option/modifier/std.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <libs/assign/v2/test/csv.h>
 

Modified: sandbox/assign_v2/libs/assign/v2/test/option/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/data.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/data.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -16,7 +16,7 @@
 #include <boost/assign/v2/deque.hpp>
 #include <boost/assign/v2/put.hpp>
 // Options come next
-#include <boost/assign/v2/option/data.hpp>
+#include <boost/assign/v2/option/data_generator/framework.hpp>
 #include <boost/function.hpp>
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/lambda.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -12,7 +12,7 @@
 
 #include <boost/assign/v2/put.hpp>
 // Options come next
-#include <boost/assign/v2/option/iterate.hpp> 
+#include <boost/assign/v2/option/modifier/iterate.hpp> 
 #include <boost/assign/v2/deque.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/lambda/bind.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -14,8 +14,8 @@
 #include <boost/assign/v2/put.hpp>
 #include <boost/assign/v2/deque.hpp>
 // Options come next
-#include <boost/assign/v2/option/key.hpp>
-#include <boost/assign/v2/option/mapped.hpp>
+#include <boost/assign/v2/option/data_generator/key.hpp>
+#include <boost/assign/v2/option/modifier/mapped.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/apply.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -12,8 +12,8 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/put.hpp>
 // Options come next
-#include <boost/assign/v2/option/push_front.hpp>
-#include <boost/assign/v2/option/repeat.hpp>
+#include <boost/assign/v2/option/modifier/std.hpp>
+#include <boost/assign/v2/option/modifier/repeat.hpp>
 #include <boost/assign/v2/deque.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <libs/assign/v2/test/option/repeat.h>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -16,7 +16,7 @@
 #include <boost/assign/v2/put.hpp>
 #include <boost/assign/v2/deque.hpp>
 // Options come next
-#include <boost/assign/v2/option/std_modifier.hpp>
+#include <boost/assign/v2/option/modifier/std.hpp>
 #include <boost/circular_buffer.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -14,7 +14,7 @@
 #include <boost/assign/v2/deque/csv_deque.hpp>
 #include <boost/assign/v2/pipe/csv_put.hpp>
 // Options come next
-#include <boost/assign/v2/option/data.hpp>
+#include <boost/assign/v2/option/data_generator/framework.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <libs/assign/v2/test/pipe/option/data.h>

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -12,7 +12,7 @@
 #include <boost/assign/v2/pipe/csv_put.hpp>
 #include <boost/assign/v2/deque/csv_deque.hpp>
 // Options come next
-#include <boost/assign/v2/option/iterate.hpp>
+#include <boost/assign/v2/option/modifier/iterate.hpp>
 #include <boost/array.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/range/algorithm/equal.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -14,8 +14,8 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/pipe/csv_put.hpp>
 // Options come next
-#include <boost/assign/v2/option/data.hpp>
-#include <boost/assign/v2/option/mapped.hpp>
+#include <boost/assign/v2/option/data_generator/framework.hpp>
+#include <boost/assign/v2/option/modifier/mapped.hpp>
 #include <libs/assign/v2/test/pipe/option/mapped.h>
 
 namespace test_assign_v2{

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -12,7 +12,7 @@
 #include <boost/assign/v2/pipe/csv_put.hpp>
 #include <boost/assign/v2/deque.hpp>
 // Options come next
-#include <boost/assign/v2/option/repeat.hpp>
+#include <boost/assign/v2/option/modifier/repeat.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <libs/assign/v2/test/pipe/option/repeat.h>
 

Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp	2011-03-26 16:51:12 EDT (Sat, 26 Mar 2011)
@@ -19,7 +19,7 @@
 #include <boost/assign/v2/pipe/csv_put.hpp>
 #include <boost/assign/v2/deque.hpp>
 // Options come next
-#include <boost/assign/v2/option/std_modifier.hpp>
+#include <boost/assign/v2/option/modifier/std.hpp>
 #include <libs/assign/v2/test/pipe/option/std_modifier.h>
 
 namespace test_assign_v2{