[Boost-commit] svn:boost r70403 - in sandbox/assign_v2: boost/assign boost/assign/v2 boost/assign/v2/option boost/assign/v2/option/standard libs/assign/v2/test libs/assign/v2/test/option libs/assign/v2/test/put/pipe libs/assign/v2/test/put/pipe/option

Subject: [Boost-commit] svn:boost r70403 - in sandbox/assign_v2: boost/assign boost/assign/v2 boost/assign/v2/option boost/assign/v2/option/standard libs/assign/v2/test libs/assign/v2/test/option libs/assign/v2/test/put/pipe libs/assign/v2/test/put/pipe/option
From: erwann.rogard_at_[hidden]
Date: 2011-03-22 15:25:00

Author: e_r
Date: 2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
New Revision: 70403
URL: http://svn.boost.org/trac/boost/changeset/70403

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2.hpp                              |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/option.hpp                       |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/option/insert.hpp                |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/option/push.hpp                  |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/option/push_back.hpp             |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/option/push_front.hpp            |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/option/standard.hpp              |     4 ++--                                    
   sandbox/assign_v2/boost/assign/v2/option/standard/modifier.hpp     |    15 +++++++++++++--                         
   sandbox/assign_v2/libs/assign/v2/test/option.cpp                   |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/option/standard.cpp          |     8 ++++----                                
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/option.cpp          |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/standard.cpp |     4 ++--                                    
   12 files changed, 29 insertions(+), 18 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2.hpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -12,7 +12,7 @@
 
 #include <boost/assign/v2/detail.hpp>
 #include <boost/assign/v2/deque.hpp>
-#include <boost/assign/v2/optional.hpp>
+#include <boost/assign/v2/option.hpp>
 #include <boost/assign/v2/put.hpp>
 #include <boost/assign/v2/ref.hpp>
 #include <boost/assign/v2/utility.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-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -14,6 +14,6 @@
 #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/standard.hpp>
+#include <boost/assign/v2/option/std_modifier.hpp>
 
 #endif // BOOST_ASSIGN_V2_OPTION_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/option/insert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/insert.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/insert.hpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_OPTION_INSERT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_OPTION_INSERT_ER_2010_HPP
-#include <boost/assign/v2/option/standard/modifier.hpp>
+#include <boost/assign/v2/option/std_modifier/modifier.hpp>
 BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_TAG(insert)
 BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD(insert)
 

Modified: sandbox/assign_v2/boost/assign/v2/option/push.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/push.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/push.hpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_OPTION_PUSH_ER_2010_HPP
 #define BOOST_ASSIGN_V2_OPTION_PUSH_ER_2010_HPP
-#include <boost/assign/v2/option/standard/modifier.hpp>
+#include <boost/assign/v2/option/std_modifier/modifier.hpp>
 BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_TAG(push)
 BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD(push)
 

Modified: sandbox/assign_v2/boost/assign/v2/option/push_back.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/push_back.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/push_back.hpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_OPTION_PUSH_BACK_ER_2010_HPP
 #define BOOST_ASSIGN_V2_OPTION_PUSH_BACK_ER_2010_HPP
-#include <boost/assign/v2/option/standard/modifier.hpp>
+#include <boost/assign/v2/option/std_modifier/modifier.hpp>
 BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_TAG(push_back)
 BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD(push_back)
 

Modified: sandbox/assign_v2/boost/assign/v2/option/push_front.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/push_front.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/push_front.hpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_OPTION_PUSH_FRONT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_OPTION_PUSH_FRONT_ER_2010_HPP
-#include <boost/assign/v2/option/standard/modifier.hpp>
+#include <boost/assign/v2/option/std_modifier/modifier.hpp>
 BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_TAG(push_front)
 BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD(push_front)
 

Modified: sandbox/assign_v2/boost/assign/v2/option/standard.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/standard.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/standard.hpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_OPTION_STANDARD_ER_2010_HPP
 #define BOOST_ASSIGN_V2_OPTION_STANDARD_ER_2010_HPP
-#include <boost/assign/v2/option/standard/modifier.hpp>
-#include <boost/assign/v2/option/standard/include.hpp>
+#include <boost/assign/v2/option/std_modifier/modifier.hpp>
+#include <boost/assign/v2/option/std_modifier/include.hpp>
 
 #endif // BOOST_ASSIGN_V2_OPTION_STANDARD_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/option/standard/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/standard/modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/standard/modifier.hpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -15,6 +15,17 @@
 #include <boost/assign/v2/option/modifier.hpp>
 #include <boost/preprocessor/cat.hpp>
 
+namespace boost{
+namespace assign{
+namespace v2{
+
+BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD(std_modifier)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG(std_modifier, Arg)
+
+}// v2
+}// assign
+}// boost
+
 #define BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_IMPL_PTR(FUN)\
     template<typename C, typename T>\
     void impl(C& cont, T* t)const{\
@@ -84,9 +95,9 @@
 }\
 namespace{\
 \
-    aux::option_modifier<aux::keyword_standard_modifier, modifier_tag::FUN> const\
+    aux::option_modifier<aux::keyword_std_modifier, modifier_tag::FUN> const\
         BOOST_PP_CAT(_,FUN) = ( \
-        _standard_modifier = modifier_tag::FUN() \
+        _std_modifier = modifier_tag::FUN() \
     );\
 \
 }\

Modified: sandbox/assign_v2/libs/assign/v2/test/option.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option.cpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -11,7 +11,7 @@
 #include <libs/assign/v2/test/option/iterate.h>
 #include <libs/assign/v2/test/option/mapped.h>
 #include <libs/assign/v2/test/option/repeat.h>
-#include <libs/assign/v2/test/option/standard.h>
+#include <libs/assign/v2/test/option/std_modifier.h>
 #include <libs/assign/v2/test/option.h>
 
 namespace test_assign_v2{

Modified: sandbox/assign_v2/libs/assign/v2/test/option/standard.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/standard.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/standard.cpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -16,7 +16,7 @@
 #include <boost/assign/v2/put/put.hpp>
 #include <boost/assign/v2/deque.hpp>
 // Options come next
-#include <boost/assign/v2/option/standard.hpp>
+#include <boost/assign/v2/option/std_modifier.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/algorithm/equal.hpp>
@@ -27,7 +27,7 @@
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/typeof/typeof.hpp>
-#include <libs/assign/v2/test/option/standard.h>
+#include <libs/assign/v2/test/option/std_modifier.h>
 
 namespace test_assign_v2{
 namespace xxx_option{
@@ -48,7 +48,7 @@
         {
             //[test_option_standard_meta
             typedef as2::result_of::put<std::vector<int> >::type put_;
-            typedef as2::aux::keyword_standard_modifier keyword_;
+            typedef as2::aux::keyword_std_modifier keyword_;
             typedef as2::modifier_tag::push_front tag_;
             typedef as2::result_of::option_modifier<put_> meta1_;
             typedef ::boost::mpl::apply2<meta1_, keyword_, tag_>::type result1_;
@@ -96,7 +96,7 @@
         {
             //[test_option_meta_deque
             typedef as2::result_of::deque<int>::type put_;
-            typedef as2::aux::keyword_standard_modifier keyword_;
+            typedef as2::aux::keyword_std_modifier keyword_;
             typedef as2::modifier_tag::push_front tag_;
             typedef as2::result_of::option_modifier<put_> meta1_;
             typedef ::boost::mpl::apply2<meta1_, keyword_, tag_>::type result1_;

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/option.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/option.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/option.cpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -11,7 +11,7 @@
 #include <libs/assign/v2/test/put/pipe/option/iterate.h>
 #include <libs/assign/v2/test/put/pipe/option/mapped.h>
 #include <libs/assign/v2/test/put/pipe/option/repeat.h>
-#include <libs/assign/v2/test/put/pipe/option/standard.h>
+#include <libs/assign/v2/test/put/pipe/option/std_modifier.h>
 #include <libs/assign/v2/test/put/pipe/option.h>
 
 namespace test_assign_v2{

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/standard.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/standard.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/standard.cpp	2011-03-22 15:24:58 EDT (Tue, 22 Mar 2011)
@@ -19,8 +19,8 @@
 #include <boost/assign/v2/put/pipe/csv_put.hpp>
 #include <boost/assign/v2/deque.hpp>
 // Options come next
-#include <boost/assign/v2/option/standard.hpp>
-#include <libs/assign/v2/test/put/pipe/option/standard.h>
+#include <boost/assign/v2/option/std_modifier.hpp>
+#include <libs/assign/v2/test/put/pipe/option/std_modifier.h>
 
 namespace test_assign_v2{
 namespace xxx_put{