$include_dir="/home/hyper-archives/boost-commit/include"; include("$include_dir/msg-header.inc") ?>
Subject: [Boost-commit] svn:boost r70400 - in sandbox/assign_v2/libs/assign/v2: . src test test/optional test/put test/put/pipe test/put/pipe/optional test/utility
From: erwann.rogard_at_[hidden]
Date: 2011-03-22 15:02:04
Author: e_r
Date: 2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
New Revision: 70400
URL: http://svn.boost.org/trac/boost/changeset/70400
Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/libs/assign/v2/src/main.cpp                        |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/optional.cpp                   |    16 ++++++++--------                        
   sandbox/assign_v2/libs/assign/v2/test/optional.h                     |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/optional/data.cpp              |    12 ++++++------                            
   sandbox/assign_v2/libs/assign/v2/test/optional/data.h                |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/optional/iterate.cpp           |    24 ++++++++++++------------                
   sandbox/assign_v2/libs/assign/v2/test/optional/iterate.h             |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/optional/mapped.cpp            |    26 +++++++++++++-------------              
   sandbox/assign_v2/libs/assign/v2/test/optional/mapped.h              |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/optional/repeat.cpp            |    14 +++++++-------                          
   sandbox/assign_v2/libs/assign/v2/test/optional/repeat.h              |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/optional/standard.cpp          |    26 +++++++++++++-------------              
   sandbox/assign_v2/libs/assign/v2/test/optional/standard.h            |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/put/pipe.cpp                   |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.cpp          |    16 ++++++++--------                        
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.h            |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/data.cpp     |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/data.h       |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/iterate.cpp  |     8 ++++----                                
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/iterate.h    |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/mapped.cpp   |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/mapped.h     |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/repeat.cpp   |     8 ++++----                                
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/repeat.h     |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/standard.cpp |     8 ++++----                                
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/standard.h   |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp                |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/tutorial.cpp                        |     2 +-                                      
   28 files changed, 155 insertions(+), 155 deletions(-)
Modified: sandbox/assign_v2/libs/assign/v2/src/main.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/src/main.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/src/main.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -9,7 +9,7 @@
 #include <libs/assign/v2/test/detail.h>
 #include <libs/assign/v2/test/deque.h>
 #include <libs/assign/v2/test/interpreter.h>
-#include <libs/assign/v2/test/optional.h>
+#include <libs/assign/v2/test/option.h>
 #include <libs/assign/v2/test/put.h>
 #include <libs/assign/v2/test/ref.h>
 #include <libs/assign/v2/test/utility.h>
@@ -64,7 +64,7 @@
         xxx_detail::test();
         xxx_deque::test();
         xxx_interpreter::test();
-        xxx_optional::test();
+        xxx_option::test();
         xxx_put::test();
         xxx_ref::test();
         xxx_utility::test();
Modified: sandbox/assign_v2/libs/assign/v2/test/optional.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,15 +7,15 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#include <libs/assign/v2/test/optional/data.h>
-#include <libs/assign/v2/test/optional/iterate.h>
-#include <libs/assign/v2/test/optional/mapped.h>
-#include <libs/assign/v2/test/optional/repeat.h>
-#include <libs/assign/v2/test/optional/standard.h>
-#include <libs/assign/v2/test/optional.h>
+#include <libs/assign/v2/test/option/data.h>
+#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.h>
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 
     void test(){
         xxx_fun::test();
@@ -25,6 +25,6 @@
         xxx_standard::test();
     }
 
-}// xxx_optional
+}// xxx_option
 }// xxx_test_assign
 
Modified: sandbox/assign_v2/libs/assign/v2/test/optional.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,15 +7,15 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#ifndef LIBS_ASSIGN_V2_TEST_OPTIONAL_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_OPTIONAL_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_OPTION_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_OPTION_ER_2010_H
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 
     void test();
 
-}// xxx_optional
+}// xxx_option
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_OPTIONAL_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_OPTION_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/optional/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/data.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/data.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -16,7 +16,7 @@
 #include <boost/assign/v2/deque.hpp>
 #include <boost/assign/v2/put/put.hpp>
 // Options come next
-#include <boost/assign/v2/optional/data.hpp>
+#include <boost/assign/v2/option/data.hpp>
 #include <boost/function.hpp>
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/lambda.hpp>
@@ -24,10 +24,10 @@
 #include <boost/numeric/conversion/bounds.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <boost/typeof/typeof.hpp>
-#include <libs/assign/v2/test/optional/data.h>
+#include <libs/assign/v2/test/option/data.h>
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_fun{
 
     void test()
@@ -36,7 +36,7 @@
         namespace as2 = assign::v2;
         {
             // (*fp) resolves error C2440 using MSVC
-            //[test_optional_data_math
+            //[test_option_data_math
             std::vector<double> exponent;
             typedef double(*fp)(double);
             typedef function<double(double)> f_;
@@ -50,7 +50,7 @@
             //]
         }
         {
-            //[test_optional_data_recursive
+            //[test_option_data_recursive
             using namespace lambda;
             int i = 1, k = 1;
             BOOST_AUTO(
@@ -68,5 +68,5 @@
     }
 
 }// xxx_fun
-}// xxx_optional
+}// xxx_option
 }// test_assign_v2
Modified: sandbox/assign_v2/libs/assign/v2/test/optional/data.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/data.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/data.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,17 +7,17 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#ifndef LIBS_ASSIGN_V2_TEST_OPTIONAL_DATA_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_OPTIONAL_DATA_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_OPTION_DATA_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_OPTION_DATA_ER_2010_H
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_fun{
 
     void test();
 
 }// xxx_fun
-}// xxx_optional
+}// xxx_option
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_OPTIONAL_DATA_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_OPTION_DATA_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/optional/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/iterate.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/iterate.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -12,7 +12,7 @@
 
 #include <boost/assign/v2/put/put.hpp>
 // Options come next
-#include <boost/assign/v2/optional/iterate.hpp> 
+#include <boost/assign/v2/option/iterate.hpp> 
 #include <boost/assign/v2/deque.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/lambda/bind.hpp>
@@ -22,12 +22,12 @@
 #include <boost/range/algorithm/equal.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/typeof/typeof.hpp>
-#include <libs/assign/v2/test/optional/iterate.h>
+#include <libs/assign/v2/test/option/iterate.h>
 
 #include <iostream>
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_iterate{
 
     void test()
@@ -35,13 +35,13 @@
         using namespace boost;
         namespace as2 = assign::v2;
         {
-            //[test_optional_iterate_meta
+            //[test_option_iterate_meta
             typedef as2::aux::keyword_iterate keyword_;
             typedef as2::modifier_tag::iterate_arg arg_;
-            typedef as2::aux::optional_modifier<keyword_, arg_> modulo_;
+            typedef as2::aux::option_modifier<keyword_, arg_> modulo_;
             typedef array<int, 4> cont_;
             typedef as2::result_of::put<cont_>::type put_;
-            typedef as2::result_of::optional_modifier<put_> meta1_;
+            typedef as2::result_of::option_modifier<put_> meta1_;
             typedef ::boost::mpl::apply2<meta1_, keyword_, arg_>::type result1_;
             typedef as2::modifier_tag::iterate<arg_> tag1_;
             typedef as2::aux::replace_modifier_tag<put_> meta2_;
@@ -50,7 +50,7 @@
             //]
         }
         {
-            //[test_optional_iterate_shifted
+            //[test_option_iterate_shifted
             using namespace lambda;
             typedef int T; array<T, 4> powers; powers[0] = 1; powers[1] = 10;
             int index = 2; ( as2::put( powers ) % ( as2::_iterate = var( index )++ ) )( 100 )( 1000 );
@@ -59,12 +59,12 @@
             //]
         }
         {
-            //[test_optional_iterate_meta_deque
+            //[test_option_iterate_meta_deque
             typedef as2::aux::keyword_iterate keyword_;
             typedef as2::modifier_tag::iterate_arg arg_;
-            typedef as2::aux::optional_modifier<keyword_, arg_> modulo_;
+            typedef as2::aux::option_modifier<keyword_, arg_> modulo_;
             typedef as2::result_of::deque<int>::type put_;
-            typedef as2::result_of::optional_modifier<put_> meta1_;
+            typedef as2::result_of::option_modifier<put_> meta1_;
             typedef ::boost::mpl::apply2<meta1_, keyword_, arg_>::type result1_;
             typedef as2::modifier_tag::iterate<arg_> tag1_;
             typedef as2::aux::replace_modifier_tag<put_> meta2_;
@@ -73,7 +73,7 @@
             //]
         }
         {
-            //[test_optional_iterate_shifted_deque
+            //[test_option_iterate_shifted_deque
             using namespace lambda;
             as2::result_of::deque<int>::type missing_tail = as2::deque<int>( 1 )( 10 )( -1 )( -1 );
             int index = 2; 
@@ -89,5 +89,5 @@
     }
 
 }// xxx_iterate
-}// xxx_optional
+}// xxx_option
 }// test_assign_v2
Modified: sandbox/assign_v2/libs/assign/v2/test/optional/iterate.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/iterate.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/iterate.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,17 +7,17 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#ifndef LIBS_ASSIGN_V2_TEST_OPTIONAL_ITERATE_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_OPTIONAL_ITERATE_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_OPTION_ITERATE_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_OPTION_ITERATE_ER_2010_H
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_iterate{
 
     void test();
 
 }// xxx_iterate
-}// xxx_optional
+}// xxx_option
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_OPTIONAL_ITERATE_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_OPTION_ITERATE_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/optional/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/mapped.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/mapped.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -14,18 +14,18 @@
 #include <boost/assign/v2/put/put.hpp>
 #include <boost/assign/v2/deque.hpp>
 // Options come next
-#include <boost/assign/v2/optional/key.hpp>
-#include <boost/assign/v2/optional/mapped.hpp> 
+#include <boost/assign/v2/option/key.hpp>
+#include <boost/assign/v2/option/mapped.hpp> 
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/apply.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/typeof/typeof.hpp>
 #include <boost/tuple/tuple.hpp>
-#include <libs/assign/v2/test/optional/mapped.h>
+#include <libs/assign/v2/test/option/mapped.h>
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_mapped{
 
     void test()
@@ -34,14 +34,14 @@
         using namespace boost;
         namespace as2 = assign::v2;
         {
-            //[test_optional_mapped_meta
+            //[test_option_mapped_meta
             using namespace lambda;
             typedef BOOST_TYPEOF(_1) arg_;
             typedef as2::aux::keyword_mapped keyword_;
-            typedef as2::aux::optional_modifier<keyword_, arg_> modulo_;
+            typedef as2::aux::option_modifier<keyword_, arg_> modulo_;
             typedef std::map<std::string, int> cont_;
             typedef as2::result_of::put<cont_>::type put_;
-            typedef as2::result_of::optional_modifier<put_> meta1_;
+            typedef as2::result_of::option_modifier<put_> meta1_;
             typedef ::boost::mpl::apply2<meta1_, keyword_, arg_>::type result1_;
             typedef as2::modifier_tag::mapped<arg_> tag1_;
             typedef as2::aux::replace_modifier_tag<put_> meta2_;
@@ -50,7 +50,7 @@
             //]
         }
         {
-            //[test_optional_mapped_map
+            //[test_option_mapped_map
             using namespace lambda;
             typedef std::string str_; typedef std::map<str_, int> C; C year; 
             ( 
@@ -63,13 +63,13 @@
             //]        
         }
         {
-            //[test_optional_mapped_meta_deque
+            //[test_option_mapped_meta_deque
             using namespace lambda;
             typedef BOOST_TYPEOF(_1) arg_;
             typedef as2::aux::keyword_mapped keyword_;
-            typedef as2::aux::optional_modifier<keyword_, arg_> modulo_;
+            typedef as2::aux::option_modifier<keyword_, arg_> modulo_;
             typedef as2::result_of::deque<int>::type put_;
-            typedef as2::result_of::optional_modifier<put_> meta1_;
+            typedef as2::result_of::option_modifier<put_> meta1_;
             typedef ::boost::mpl::apply2<meta1_, keyword_, arg_>::type result1_;
             typedef as2::modifier_tag::mapped<arg_> tag1_;
             typedef as2::aux::replace_modifier_tag<put_> meta2_;
@@ -78,7 +78,7 @@
             //]
         }
         {
-            //[test_optional_mapped_map_deque
+            //[test_option_mapped_map_deque
             using namespace lambda;
             BOOST_AUTO(
                 days_in_first_quater,
@@ -94,5 +94,5 @@
     }
 
 }// xxx_mapped
-}// xxx_optional
+}// xxx_option
 }// test_assign_v2
Modified: sandbox/assign_v2/libs/assign/v2/test/optional/mapped.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/mapped.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/mapped.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,17 +7,17 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#ifndef LIBS_ASSIGN_V2_TEST_OPTIONAL_MAPPED_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_OPTIONAL_MAPPED_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_OPTION_MAPPED_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_OPTION_MAPPED_ER_2010_H
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_mapped{
 
     void test();
 
 }// xxx_mapped
-}// xxx_optional
+}// xxx_option
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_OPTIONAL_MAPPED_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_OPTION_MAPPED_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/optional/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/repeat.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/repeat.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -12,14 +12,14 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/put/put.hpp>
 // Options come next
-#include <boost/assign/v2/optional/push_front.hpp>
-#include <boost/assign/v2/optional/repeat.hpp>
+#include <boost/assign/v2/option/push_front.hpp>
+#include <boost/assign/v2/option/repeat.hpp>
 #include <boost/assign/v2/deque.hpp>
 #include <boost/range/algorithm/equal.hpp>
-#include <libs/assign/v2/test/optional/repeat.h>
+#include <libs/assign/v2/test/option/repeat.h>
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_repeat{
 
     void test()
@@ -27,7 +27,7 @@
         using namespace boost;
         namespace as2 = assign::v2;
         {
-            //[test_optional_repeat_simple
+            //[test_option_repeat_simple
             std::vector<int> cont;
             ( as2::put( cont ) % ( as2::_repeat = 2  ) )( 72 )( 31 )( 48 );
 
@@ -35,7 +35,7 @@
             //]
         }
         {
-            //[test_optional_repeat_compose
+            //[test_option_repeat_compose
             BOOST_AUTO(
                 cont, (
                     as2::deque<int>( as2::_nil ) % as2::_push_front % ( as2::_repeat = 2 )
@@ -49,5 +49,5 @@
 
 
 }// xxx_repeat
-}// xxx_optional
+}// xxx_option
 }// test_assign_v2
Modified: sandbox/assign_v2/libs/assign/v2/test/optional/repeat.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/repeat.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/repeat.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,17 +7,17 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#ifndef LIBS_ASSIGN_V2_TEST_OPTIONAL_REPEAT_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_OPTIONAL_REPEAT_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_OPTION_REPEAT_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_OPTION_REPEAT_ER_2010_H
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_repeat{
 
     void test();
 
 }// xxx_repeat
-}// xxx_optional
+}// xxx_option
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_OPTIONAL_REPEAT_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_OPTION_REPEAT_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/optional/standard.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/standard.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/standard.cpp	2011-03-22 15:02:00 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/optional/standard.hpp>
+#include <boost/assign/v2/option/standard.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/algorithm/equal.hpp>
@@ -27,10 +27,10 @@
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/typeof/typeof.hpp>
-#include <libs/assign/v2/test/optional/standard.h>
+#include <libs/assign/v2/test/option/standard.h>
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_standard{
 
     void test()
@@ -46,11 +46,11 @@
 
         // PUT
         {
-            //[test_optional_standard_meta
+            //[test_option_standard_meta
             typedef as2::result_of::put<std::vector<int> >::type put_;
             typedef as2::aux::keyword_standard_modifier keyword_;
             typedef as2::modifier_tag::push_front tag_;
-            typedef as2::result_of::optional_modifier<put_> meta1_;
+            typedef as2::result_of::option_modifier<put_> meta1_;
             typedef ::boost::mpl::apply2<meta1_, keyword_, tag_>::type result1_;
             typedef as2::aux::replace_modifier_tag<put_> meta2_;
             typedef ::boost::mpl::apply1<meta2_, tag_>::type result2_;
@@ -59,7 +59,7 @@
         }
         {
             // fully qual boost::begin/end demanded by MSVC - error C2668
-            //[test_optional_push_front
+            //[test_option_push_front
             std::deque<double> sqrt2;
             ( as2::put( sqrt2 ) % as2::_push_front )( 1.41421 )( 1.4142 )( 1.414 )( 1.41 );
 
@@ -69,7 +69,7 @@
             //]
         }
         {
-            //[test_optional_push
+            //[test_option_push
             std::queue<int> fifo; ( as2::put( fifo ) % as2::_push )( 72 )( 31 )( 48 );
 
             BOOST_ASSIGN_V2_CHECK( fifo.front() == 72 );
@@ -77,7 +77,7 @@
             //]
         }
         {
-            //[test_optional_insert
+            //[test_option_insert
             std::set<std::string> letters; ( as2::put( letters ) % as2::_insert )( "d" )( "a" )( "c" )( "b" );
 
             BOOST_ASSIGN_V2_CHECK( letters.lower_bound( "a" ) == boost::begin( letters ) );
@@ -85,7 +85,7 @@
             //]
         }
         {
-            //[test_optional_push_back
+            //[test_option_push_back
             std::list<int> list;
             ( as2::put( list ) % as2::_push_back )( 72 )( 31 )( 48 );
 
@@ -94,11 +94,11 @@
         }
         // DEQUE
         {
-            //[test_optional_meta_deque
+            //[test_option_meta_deque
             typedef as2::result_of::deque<int>::type put_;
             typedef as2::aux::keyword_standard_modifier keyword_;
             typedef as2::modifier_tag::push_front tag_;
-            typedef as2::result_of::optional_modifier<put_> meta1_;
+            typedef as2::result_of::option_modifier<put_> meta1_;
             typedef ::boost::mpl::apply2<meta1_, keyword_, tag_>::type result1_;
             typedef as2::aux::replace_modifier_tag<put_> meta2_;
             typedef ::boost::mpl::apply1<meta2_, tag_>::type result2_;
@@ -107,7 +107,7 @@
             //]
         }
         {
-            //[test_optional_push_front_deque
+            //[test_option_push_front_deque
             BOOST_AUTO(
                 powers,
                 ( as2::deque<int>( as2::_nil ) % as2::_push_front )( 16 )( 8 )( 4 )( 2 )( 1 )
@@ -119,5 +119,5 @@
     }
 
 }// xxx_standard
-}// xxx_optional
+}// xxx_option
 }// test_assign_v2
Modified: sandbox/assign_v2/libs/assign/v2/test/optional/standard.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/standard.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/standard.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,17 +7,17 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#ifndef LIBS_ASSIGN_V2_TEST_OPTIONAL_STANDARD_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_OPTIONAL_STANDARD_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_OPTION_STANDARD_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_OPTION_STANDARD_ER_2010_H
 
 namespace test_assign_v2{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_standard{
 
     void test();
 
 }// xxx_standard
-}// xxx_optional
+}// xxx_option
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_OPTIONAL_STANDARD_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_OPTION_STANDARD_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -8,7 +8,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
 #include <libs/assign/v2/test/put/pipe/csv_put.h>
-#include <libs/assign/v2/test/put/pipe/optional.h>
+#include <libs/assign/v2/test/put/pipe/option.h>
 #include <libs/assign/v2/test/put/pipe.h>
 
 namespace test_assign_v2{
@@ -18,7 +18,7 @@
     void test()
     {
         xxx_csv_put::test();
-        xxx_optional::test();
+        xxx_option::test();
     }
 
 }// xxx_pipe
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,17 +7,17 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#include <libs/assign/v2/test/put/pipe/optional/data.h>
-#include <libs/assign/v2/test/put/pipe/optional/iterate.h>
-#include <libs/assign/v2/test/put/pipe/optional/mapped.h>
-#include <libs/assign/v2/test/put/pipe/optional/repeat.h>
-#include <libs/assign/v2/test/put/pipe/optional/standard.h>
-#include <libs/assign/v2/test/put/pipe/optional.h>
+#include <libs/assign/v2/test/put/pipe/option/data.h>
+#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.h>
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 
     void test()
     {
@@ -28,7 +28,7 @@
         xxx_standard::test();
     }
 
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_put
 }// xxx_test_assign
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,19 +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 LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 
     void test();
 
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_put
 }// test_assign_v2
 
-#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/data.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/data.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -14,15 +14,15 @@
 #include <boost/assign/v2/deque/csv_deque.hpp>
 #include <boost/assign/v2/put/pipe/csv_put.hpp>
 // Options come next
-#include <boost/assign/v2/optional/data.hpp>
+#include <boost/assign/v2/option/data.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/range/algorithm/equal.hpp>
-#include <libs/assign/v2/test/put/pipe/optional/data.h>
+#include <libs/assign/v2/test/put/pipe/option/data.h>
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_fun{
 
     void test()
@@ -30,7 +30,7 @@
         using namespace boost;
         namespace as2 = assign::v2;
         {
-            //[test_put_pipe_optional_data_math
+            //[test_put_pipe_option_data_math
             int k = 1; std::list<int> factorials;
             using namespace lambda;
             
@@ -47,7 +47,7 @@
     }
 
 }// xxx_fun
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_value
 }// test_assign_v2
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/data.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/data.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/data.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,21 +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 LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_DATA_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_DATA_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_DATA_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_DATA_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_fun{
 
     void test();
 
 }// xxx_fun
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_value
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_DATA_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_DATA_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/iterate.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/iterate.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -12,16 +12,16 @@
 #include <boost/assign/v2/put/pipe/csv_put.hpp>
 #include <boost/assign/v2/deque/csv_deque.hpp>
 // Options come next
-#include <boost/assign/v2/optional/iterate.hpp>
+#include <boost/assign/v2/option/iterate.hpp>
 #include <boost/array.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/range/algorithm/equal.hpp>
-#include <libs/assign/v2/test/put/pipe/optional/iterate.h>
+#include <libs/assign/v2/test/put/pipe/option/iterate.h>
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_iterate{
 
     void test()
@@ -46,7 +46,7 @@
     }
 
 }// xxx_iterate
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_put
 }// test_assign_v2
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/iterate.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/iterate.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/iterate.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,21 +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 LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_ITERATE_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_ITERATE_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_ITERATE_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_ITERATE_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_iterate{
 
     void test();
 
 }// xxx_iterate
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_put
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_ITERATE_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_ITERATE_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/mapped.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/mapped.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -14,14 +14,14 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/put/pipe/csv_put.hpp>
 // Options come next
-#include <boost/assign/v2/optional/data.hpp>
-#include <boost/assign/v2/optional/mapped.hpp>
-#include <libs/assign/v2/test/put/pipe/optional/mapped.h>
+#include <boost/assign/v2/option/data.hpp>
+#include <boost/assign/v2/option/mapped.hpp>
+#include <libs/assign/v2/test/put/pipe/option/mapped.h>
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_mapped{
 
     void test()
@@ -49,7 +49,7 @@
     }
 
 }// xxx_mapped
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_put
 }// test_assign_v2
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/mapped.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/mapped.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/mapped.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,21 +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 LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_MAPPED_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_MAPPED_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_MAPPED_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_MAPPED_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_mapped{
 
     void test();
 
 }// xxx_mapped
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_put
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_MAPPED_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_MAPPED_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/repeat.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/repeat.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -12,14 +12,14 @@
 #include <boost/assign/v2/put/pipe/csv_put.hpp>
 #include <boost/assign/v2/deque.hpp>
 // Options come next
-#include <boost/assign/v2/optional/repeat.hpp>
+#include <boost/assign/v2/option/repeat.hpp>
 #include <boost/range/algorithm/equal.hpp>
-#include <libs/assign/v2/test/put/pipe/optional/repeat.h>
+#include <libs/assign/v2/test/put/pipe/option/repeat.h>
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_repeat{
 
     void test()
@@ -42,7 +42,7 @@
 
 
 }// xxx_repeat
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_put
 }// test_assign_v2
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/repeat.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/repeat.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/repeat.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,21 +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 LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_REPEAT_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_REPEAT_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_REPEAT_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_REPEAT_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_repeat{
 
     void test();
 
 }// xxx_repeat
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_put
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_REPEAT_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_REPEAT_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/standard.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/standard.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/standard.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -19,13 +19,13 @@
 #include <boost/assign/v2/put/pipe/csv_put.hpp>
 #include <boost/assign/v2/deque.hpp>
 // Options come next
-#include <boost/assign/v2/optional/standard.hpp>
-#include <libs/assign/v2/test/put/pipe/optional/standard.h>
+#include <boost/assign/v2/option/standard.hpp>
+#include <libs/assign/v2/test/put/pipe/option/standard.h>
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_standard{
 
     void test()
@@ -75,7 +75,7 @@
     }
 
 }// xxx_standard
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_put
 }// test_assign_v2
\ No newline at end of file
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/standard.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/standard.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/standard.h	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -7,21 +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 LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_STANDARD_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_STANDARD_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_STANDARD_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_STANDARD_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
-namespace xxx_optional{
+namespace xxx_option{
 namespace xxx_standard{
 
     void test();
 
 }// xxx_standard
-}// xxx_optional
+}// xxx_option
 }// xxx_pipe
 }// xxx_put
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_STANDARD_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTION_STANDARD_ER_2010_H
Modified: sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -12,7 +12,7 @@
 #include <boost/assign/v2/utility/csv.hpp>
 #include <boost/assign/v2/deque.hpp>
 #include <boost/assign/v2/put/put.hpp>
-#include <boost/assign/v2/optional/push_front.hpp>
+#include <boost/assign/v2/option/push_front.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <libs/assign/v2/test/utility/csv.h>
 
Modified: sandbox/assign_v2/libs/assign/v2/tutorial.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/tutorial.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/tutorial.cpp	2011-03-22 15:02:00 EDT (Tue, 22 Mar 2011)
@@ -102,7 +102,7 @@
             //]
         }
         {
-            //[tutorial_optional
+            //[tutorial_option
             using namespace lambda;
             array<int, 4> powers = converter( csv_deque( 1, 10, -1, -1 ) );
             std::size_t index = 2; using namespace lambda;