Subject: [Boost-commit] svn:boost r70399 - in sandbox/assign_v2/boost/assign/v2: . include/operator/modulus interpreter option option/standard utility
From: erwann.rogard_at_[hidden]
Date: 2011-03-22 15:00:15
Author: e_r
Date: 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
New Revision: 70399
URL: http://svn.boost.org/trac/boost/changeset/70399
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/include.hpp | 1
sandbox/assign_v2/boost/assign/v2/include/operator/modulus/data.hpp | 2
sandbox/assign_v2/boost/assign/v2/include/operator/modulus/insert.hpp | 2
sandbox/assign_v2/boost/assign/v2/include/operator/modulus/iterate.hpp | 2
sandbox/assign_v2/boost/assign/v2/include/operator/modulus/key.hpp | 2
sandbox/assign_v2/boost/assign/v2/include/operator/modulus/mapped.hpp | 2
sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push.hpp | 2
sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push_back.hpp | 2
sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push_front.hpp | 2
sandbox/assign_v2/boost/assign/v2/include/operator/modulus/repeat.hpp | 2
sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp | 46 ++++++++++++++++++++--------------------
sandbox/assign_v2/boost/assign/v2/option.hpp | 18 +++++++-------
sandbox/assign_v2/boost/assign/v2/option/data.hpp | 42 ++++++++++++++++++------------------
sandbox/assign_v2/boost/assign/v2/option/insert.hpp | 12 +++++-----
sandbox/assign_v2/boost/assign/v2/option/iterate.hpp | 14 ++++++------
sandbox/assign_v2/boost/assign/v2/option/key.hpp | 16 ++++++------
sandbox/assign_v2/boost/assign/v2/option/mapped.hpp | 14 ++++++------
sandbox/assign_v2/boost/assign/v2/option/modifier.hpp | 46 ++++++++++++++++++++--------------------
sandbox/assign_v2/boost/assign/v2/option/push.hpp | 12 +++++-----
sandbox/assign_v2/boost/assign/v2/option/push_back.hpp | 12 +++++-----
sandbox/assign_v2/boost/assign/v2/option/push_front.hpp | 12 +++++-----
sandbox/assign_v2/boost/assign/v2/option/repeat.hpp | 14 ++++++------
sandbox/assign_v2/boost/assign/v2/option/standard.hpp | 10 ++++----
sandbox/assign_v2/boost/assign/v2/option/standard/include.hpp | 14 ++++++------
sandbox/assign_v2/boost/assign/v2/option/standard/modifier.hpp | 34 ++++++++++++++--------------
sandbox/assign_v2/boost/assign/v2/utility/chain.hpp | 2
26 files changed, 168 insertions(+), 169 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/include.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -16,7 +16,6 @@
#include <boost/assign/v2/include/csv_deque.hpp>
#include <boost/assign/v2/include/deque.hpp>
#include <boost/assign/v2/include/operator.hpp>
-#include <boost/assign/v2/include/operator/modulus.hpp>
#include <boost/assign/v2/include/ref.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/operator/modulus/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/operator/modulus/data.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/operator/modulus/data.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -9,6 +9,6 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_DATA_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_DATA_ER_2010_HPP
-#include <boost/assign/v2/optional/data.hpp>
+#include <boost/assign/v2/option/data.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_DATA_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/operator/modulus/insert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/operator/modulus/insert.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/operator/modulus/insert.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -9,6 +9,6 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_INSERT_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_INSERT_ER_2010_HPP
-#include <boost/assign/v2/optional/insert.hpp>
+#include <boost/assign/v2/option/insert.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_INSERT_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/operator/modulus/iterate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/operator/modulus/iterate.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/operator/modulus/iterate.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -9,6 +9,6 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_ITERATE_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_ITERATE_ER_2010_HPP
-#include <boost/assign/v2/optional/iterate.hpp>
+#include <boost/assign/v2/option/iterate.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_ITERATE_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/operator/modulus/key.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/operator/modulus/key.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/operator/modulus/key.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -9,6 +9,6 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_KEY_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_KEY_ER_2010_HPP
-#include <boost/assign/v2/optional/key.hpp>
+#include <boost/assign/v2/option/key.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_KEY_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/operator/modulus/mapped.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/operator/modulus/mapped.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/operator/modulus/mapped.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -9,6 +9,6 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_MAPPED_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_MAPPED_ER_2010_HPP
-#include <boost/assign/v2/optional/mapped.hpp>
+#include <boost/assign/v2/option/mapped.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_MAPPED_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -9,6 +9,6 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_PUSH_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_PUSH_ER_2010_HPP
-#include <boost/assign/v2/optional/push.hpp>
+#include <boost/assign/v2/option/push.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_PUSH_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push_back.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push_back.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push_back.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -9,6 +9,6 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_PUSH_BACK_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_PUSH_BACK_ER_2010_HPP
-#include <boost/assign/v2/optional/push_back.hpp>
+#include <boost/assign/v2/option/push_back.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_PUSH_BACK_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push_front.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push_front.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/operator/modulus/push_front.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -9,6 +9,6 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_PUSH_FRONT_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_PUSH_FRONT_ER_2010_HPP
-#include <boost/assign/v2/optional/push_front.hpp>
+#include <boost/assign/v2/option/push_front.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_PUSH_FRONT_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/operator/modulus/repeat.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/operator/modulus/repeat.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/operator/modulus/repeat.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -9,6 +9,6 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_REPEAT_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_REPEAT_ER_2010_HPP
-#include <boost/assign/v2/optional/repeat.hpp>
+#include <boost/assign/v2/option/repeat.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_OPERATOR_MODULUS_REPEAT_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -14,10 +14,10 @@
#include <boost/assign/v2/detail/traits/value_container/category.hpp>
#include <boost/assign/v2/detail/traits/ptr_container/meta.hpp>
#include <boost/assign/v2/detail/traits/switch.hpp>
-#include <boost/assign/v2/optional/insert.hpp>
-#include <boost/assign/v2/optional/iterate.hpp>
-#include <boost/assign/v2/optional/push.hpp>
-#include <boost/assign/v2/optional/push_back.hpp>
+#include <boost/assign/v2/option/insert.hpp>
+#include <boost/assign/v2/option/iterate.hpp>
+#include <boost/assign/v2/option/push.hpp>
+#include <boost/assign/v2/option/push_back.hpp>
#include <boost/concept_check.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/preprocessor/cat.hpp>
@@ -61,10 +61,10 @@
struct deduce_put{};
}// switch_tag
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_CASE
+#ifdef BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_CASE
#error
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_CASE(Tag, BooleanMetaF, CaseNumber)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_CASE(Tag, BooleanMetaF, CaseNumber)\
namespace switch_aux{\
template<>\
struct case_<switch_tag::deduce_put, CaseNumber> :\
@@ -77,34 +77,34 @@
#endif
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_ASSOCIATIVE
+#ifdef BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_ASSOCIATIVE
#error
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_ASSOCIATIVE(CaseNumber)\
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_CASE(insert, value_container_aux::is_sorted, CaseNumber)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_ASSOCIATIVE(CaseNumber)\
+BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_CASE(insert, value_container_aux::is_sorted, CaseNumber)\
/**/
#endif
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_ARRAY
+#ifdef BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_ARRAY
#error
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_ARRAY(CaseNumber)\
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_CASE(iterate<>, value_container_aux::is_array, CaseNumber)
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_ARRAY(CaseNumber)\
+BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_CASE(iterate<>, value_container_aux::is_array, CaseNumber)
/**/
#endif
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_ADAPTER
+#ifdef BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_ADAPTER
#error
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_ADAPTER(CaseNumber)\
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_CASE(push, value_container_aux::has_push_deduced_value, CaseNumber)
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_ADAPTER(CaseNumber)\
+BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_CASE(push, value_container_aux::has_push_deduced_value, CaseNumber)
/**/
#endif
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_DEFAULT
+#ifdef BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_DEFAULT
#error
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_DEFAULT(CaseNumber)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_DEFAULT(CaseNumber)\
namespace switch_aux{\
template<>\
struct case_<switch_tag::deduce_put, CaseNumber> :\
@@ -115,14 +115,14 @@
#endif
//[example_put_modifier_deduce_switch
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH
+#ifdef BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH
#warning
#else
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_ASSOCIATIVE(0)
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_ARRAY(1)
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_ADAPTER(2)
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_DEFAULT(3)
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH
+BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_ASSOCIATIVE(0)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_ARRAY(1)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_ADAPTER(2)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_DEFAULT(3)
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH
//]
#endif
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:00:12 EDT (Tue, 22 Mar 2011)
@@ -7,13 +7,13 @@
// 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_OPTIONAL_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_ER_2010_HPP
-#include <boost/assign/v2/optional/key.hpp>
-#include <boost/assign/v2/optional/iterate.hpp>
-#include <boost/assign/v2/optional/mapped.hpp>
-#include <boost/assign/v2/optional/modifier.hpp>
-#include <boost/assign/v2/optional/repeat.hpp>
-#include <boost/assign/v2/optional/standard.hpp>
+#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/standard.hpp>
-#endif // BOOST_ASSIGN_V2_OPTIONAL_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/option/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/data.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/data.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_OPTIONAL_DATA_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_DATA_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_OPTION_DATA_ER_2010_HPP
+#define BOOST_ASSIGN_V2_OPTION_DATA_ER_2010_HPP
#include <boost/assign/v2/detail/keyword/ignore.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
@@ -18,12 +18,12 @@
namespace boost{
namespace assign{
namespace v2{
-//[syntax_optional_data
+//[syntax_option_data
namespace aux{
namespace result_of{
template<typename D>
- struct /*<<Metafunction class>>*/optional_data_generator/*<-*/{
+ struct /*<<Metafunction class>>*/option_data_generator/*<-*/{
typedef aux::replace_fun<D> meta_;
@@ -35,10 +35,10 @@
}// result_of
template<typename F/*<-*/= keyword_aux::ignore/*->*/>
- struct optional_data_generator/*<-*/
+ struct option_data_generator/*<-*/
{
- optional_data_generator(){}
- optional_data_generator(F f) : f_( f ){}
+ option_data_generator(){}
+ option_data_generator(F f) : f_( f ){}
F const& fun()const{ return this->f_; }
@@ -47,13 +47,13 @@
}/*->*/;
template<typename C, typename F, typename Tag, typename D, typename F1>
- typename ::boost::mpl::apply1<result_of::optional_data_generator<D>, F1>::type
+ typename ::boost::mpl::apply1<result_of::option_data_generator<D>, F1>::type
operator%/*<<Overrides data generator>>*/(
interpreter_crtp<C, F, Tag, D> const& lhs,
- optional_data_generator<F1> const& rhs
+ option_data_generator<F1> const& rhs
)/*<-*/
{
- typedef result_of::optional_data_generator<D> meta_;
+ typedef result_of::option_data_generator<D> meta_;
typedef typename ::boost::mpl::apply1<meta_, F1>::type result_;
return result_( lhs.container(), rhs.fun(), lhs.modifier );
}/*<-*/BOOST_ASSIGN_V2_IGNORE(/*<-*/;/*->*/)/*->*/
@@ -62,8 +62,8 @@
/*<-*/{
template<typename F>
- optional_data_generator<F> operator=(F const& f)const{
- return optional_data_generator<F>( f );
+ option_data_generator<F> operator=(F const& f)const{
+ return option_data_generator<F>( f );
}
}/*->*/;
@@ -76,8 +76,8 @@
namespace result_of{
template<typename D>
- struct /*<<Metafunction class>>*/optional_data_generator/*<-*/
- : aux::result_of::optional_data_generator<D>
+ struct /*<<Metafunction class>>*/option_data_generator/*<-*/
+ : aux::result_of::option_data_generator<D>
{}/*->*/;
}// result_of
@@ -90,14 +90,14 @@
#include <boost/preprocessor/cat.hpp>
-#define BOOST_ASSIGN_V2_OPTIONAL_DATA_GENERATE(NAME, FUN)\
+#define BOOST_ASSIGN_V2_OPTION_DATA_GENERATE(NAME, FUN)\
namespace boost{\
namespace assign{\
namespace v2{\
namespace aux{\
\
template<typename T>\
- optional_data_generator< FUN > NAME()\
+ option_data_generator< FUN > NAME()\
{\
return ( v2::_data = FUN() );\
}\
@@ -110,14 +110,14 @@
/**/
#include <boost/assign/v2/detail/functor/constructor.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_DATA_GENERATE(constructor, v2::functor_aux::constructor<T>)
+BOOST_ASSIGN_V2_OPTION_DATA_GENERATE(constructor, v2::functor_aux::constructor<T>)
#include <boost/assign/v2/detail/functor/new.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_DATA_GENERATE(new_ptr, v2::functor_aux::new_<T>)
+BOOST_ASSIGN_V2_OPTION_DATA_GENERATE(new_ptr, v2::functor_aux::new_<T>)
#include <boost/typeof/typeof.hpp>
#include <boost/type_traits/add_const.hpp>
-#define BOOST_ASSIGN_V2_OPTIONAL_DATA_KEYWORD(NAME, EXPR)\
+#define BOOST_ASSIGN_V2_OPTION_DATA_KEYWORD(NAME, EXPR)\
namespace boost{\
namespace assign{\
namespace v2{\
@@ -131,6 +131,6 @@
}\
#include <boost/lambda/lambda.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_DATA_KEYWORD(identity, ::boost::lambda::_1)
+BOOST_ASSIGN_V2_OPTION_DATA_KEYWORD(identity, ::boost::lambda::_1)
-#endif // BOOST_ASSIGN_V2_OPTIONAL_DATA_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_DATA_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:00:12 EDT (Tue, 22 Mar 2011)
@@ -7,10 +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_OPTIONAL_INSERT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_INSERT_ER_2010_HPP
-#include <boost/assign/v2/optional/standard/modifier.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_TAG(insert)
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD(insert)
+#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>
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_TAG(insert)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD(insert)
-#endif // BOOST_ASSIGN_V2_OPTIONAL_INSERT_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_INSERT_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/option/iterate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/iterate.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/iterate.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -7,14 +7,14 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_OPTIONAL_ITERATE_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_ITERATE_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_OPTION_ITERATE_ER_2010_HPP
+#define BOOST_ASSIGN_V2_OPTION_ITERATE_ER_2010_HPP
#include <cstddef>
#include <boost/assign/v2/detail/keyword/ignore.hpp>
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
-#include <boost/assign/v2/optional/modifier.hpp>
+#include <boost/assign/v2/option/modifier.hpp>
#include <boost/call_traits.hpp>
#include <boost/shared_ptr.hpp>
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
@@ -26,7 +26,7 @@
namespace boost{
namespace assign{
namespace v2{
-//[syntax_optional_iterate
+//[syntax_option_iterate
namespace modifier_tag{
struct iterate_arg
@@ -101,12 +101,12 @@
}/*->*/;
}// aux
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(iterate)
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(iterate, modifier_tag::iterate<Arg>)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD(iterate)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG(iterate, modifier_tag::iterate<Arg>)
//]
}// v2
}// assign
}// boost
-#endif // BOOST_ASSIGN_V2_OPTIONAL_ITERATE_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_ITERATE_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/option/key.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/key.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/key.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -10,13 +10,13 @@
#ifndef BOOST_ASSIGN_V2_INTERPRETER_KEY_ER_2010_HPP
#define BOOST_ASSIGN_V2_INTERPRETER_KEY_ER_2010_HPP
#include <boost/assign/v2/interpreter/data.hpp>
-#include <boost/assign/v2/optional/data.hpp>
+#include <boost/assign/v2/option/data.hpp>
#include <boost/mpl/apply.hpp>
namespace boost{
namespace assign{
namespace v2{
-//[syntax_optional_key
+//[syntax_option_key
namespace aux{
template<typename C>
@@ -31,24 +31,24 @@
>
{}/*->*/;
- struct optional_key{};
+ struct option_key{};
namespace result_of{
template<typename C, typename D>
- struct optional_key : ::boost::mpl::apply1<
- aux::result_of::optional_data_generator<D>,
+ struct option_key : ::boost::mpl::apply1<
+ aux::result_of::option_data_generator<D>,
typename deduce_key_generator<C>::type
>{};
}//result_of
template<typename C, typename F, typename Tag, typename D>
- typename result_of::optional_key<C, D>::type
+ typename result_of::option_key<C, D>::type
operator%/*<<Overrides data generator with a constructor for C::key_type>>*/(
interpreter_crtp<C, F, Tag, D> const& lhs,
- optional_key rhs
+ option_key rhs
)/*<-*/
{
typedef typename deduce_key_generator<C>::type gen_;
@@ -60,7 +60,7 @@
//<-
namespace{
//->
- aux::optional_key const _key/*<-*/= aux::optional_key()/*->*/;
+ aux::option_key const _key/*<-*/= aux::option_key()/*->*/;
//]
}
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/option/mapped.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/mapped.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/mapped.hpp 2011-03-22 15:00:12 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 BOOST_ASSIGN_V2_OPTIONAL_MAPPED_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_MAPPED_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_OPTION_MAPPED_ER_2010_HPP
+#define BOOST_ASSIGN_V2_OPTION_MAPPED_ER_2010_HPP
#include <boost/assign/v2/detail/keyword/ignore.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
-#include <boost/assign/v2/optional/modifier.hpp>
+#include <boost/assign/v2/option/modifier.hpp>
#include <boost/call_traits.hpp>
#include <boost/shared_ptr.hpp>
namespace boost{
namespace assign{
namespace v2{
-//[syntax_optional_mapped
+//[syntax_option_mapped
namespace modifier_tag{
template<typename/*<<Mapping>>*/ Arg> struct mapped;
@@ -66,12 +66,12 @@
}/*->*/;
}// aux
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(mapped)
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(mapped, modifier_tag::mapped<Arg>)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD(mapped)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG(mapped, modifier_tag::mapped<Arg>)
//]
}// v2
}// assign
}// boost
-#endif // BOOST_ASSIGN_V2_OPTIONAL_MAPPED_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_MAPPED_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/option/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/modifier.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_OPTION_MODIFIER_ER_2010_HPP
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_ER_2010_HPP
#include <boost/assign/v2/detail/keyword/ignore.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
@@ -24,11 +24,11 @@
namespace aux{
template<typename /*<<A class of modifiers>>*/ Keyword, typename /*<<A part of the modifier's implementation>>*/Arg = keyword_aux::ignore>
- struct optional_modifier
+ struct option_modifier
{
- optional_modifier(){}
- optional_modifier(Arg arg)/*<-*/
+ option_modifier(){}
+ option_modifier(Arg arg)/*<-*/
:arg_( arg )
{}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
@@ -38,9 +38,9 @@
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
template<typename Arg1>
- optional_modifier<Keyword, Arg1>
+ option_modifier<Keyword, Arg1>
operator=(const Arg1& arg1)const/*<-*/{
- return optional_modifier<Keyword, Arg1>( arg1 );
+ return option_modifier<Keyword, Arg1>( arg1 );
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
//<-
@@ -59,7 +59,7 @@
namespace result_of{
template<typename D>
- struct optional_modifier{
+ struct option_modifier{
//<-
typedef aux::replace_modifier_tag<D> meta_;
@@ -85,12 +85,12 @@
template<typename C, typename F, typename Tag, typename D,
typename Keyword, typename Arg>
typename ::boost::mpl::apply2<
- result_of::optional_modifier<D>,
+ result_of::option_modifier<D>,
Keyword, Arg
>::type
operator%(
interpreter_crtp<C, F, Tag, D> const& lhs,
- optional_modifier<Keyword, Arg> const& rhs
+ option_modifier<Keyword, Arg> const& rhs
)/*<-*/
{
typedef aux::meta_modifier_tag<Keyword, Arg> meta_;
@@ -98,7 +98,7 @@
typedef aux::adapter_modifier<modifier_tag> modifier_;
typedef typename ::boost::mpl::apply2<
- result_of::optional_modifier<D>,
+ result_of::option_modifier<D>,
Keyword, Arg
>::type result_;
@@ -114,16 +114,16 @@
namespace result_of{
template<typename D>
- struct optional_modifier
- : aux::result_of::optional_modifier<D>
+ struct option_modifier
+ : aux::result_of::option_modifier<D>
{};
}// result_of
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG
+#ifdef BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG
#error
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(NAME, Result)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG(NAME, Result)\
namespace aux{\
\
template<typename Arg>\
@@ -136,18 +136,18 @@
/**/
#endif
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KWD_TYPE
+#ifdef BOOST_ASSIGN_V2_OPTION_MODIFIER_KWD_TYPE
#error
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KWD_TYPE(NAME)\
- aux::optional_modifier<aux::BOOST_PP_CAT(keyword_,NAME)>\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_KWD_TYPE(NAME)\
+ aux::option_modifier<aux::BOOST_PP_CAT(keyword_,NAME)>\
/**/
#endif
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD
+#ifdef BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD
#error
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(NAME)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD(NAME)\
namespace aux{\
struct BOOST_PP_CAT(keyword_,NAME){\
\
@@ -156,8 +156,8 @@
};\
}\
namespace {\
- BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KWD_TYPE(NAME) const BOOST_PP_CAT(_,NAME)\
- = BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KWD_TYPE(NAME)();\
+ BOOST_ASSIGN_V2_OPTION_MODIFIER_KWD_TYPE(NAME) const BOOST_PP_CAT(_,NAME)\
+ = BOOST_ASSIGN_V2_OPTION_MODIFIER_KWD_TYPE(NAME)();\
}\
/**/
#endif
@@ -166,4 +166,4 @@
}// assign
}// boost
-#endif // BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_MODIFIER_ER_2010_HPP
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:00:12 EDT (Tue, 22 Mar 2011)
@@ -7,10 +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_OPTIONAL_PUSH_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_PUSH_ER_2010_HPP
-#include <boost/assign/v2/optional/standard/modifier.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_TAG(push)
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD(push)
+#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>
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_TAG(push)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD(push)
-#endif // BOOST_ASSIGN_V2_OPTIONAL_PUSH_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_PUSH_ER_2010_HPP
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:00:12 EDT (Tue, 22 Mar 2011)
@@ -7,10 +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_OPTIONAL_PUSH_BACK_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_PUSH_BACK_ER_2010_HPP
-#include <boost/assign/v2/optional/standard/modifier.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_TAG(push_back)
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD(push_back)
+#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>
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_TAG(push_back)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD(push_back)
-#endif // BOOST_ASSIGN_V2_OPTIONAL_PUSH_BACK_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_PUSH_BACK_ER_2010_HPP
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:00:12 EDT (Tue, 22 Mar 2011)
@@ -7,10 +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_OPTIONAL_PUSH_FRONT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_PUSH_FRONT_ER_2010_HPP
-#include <boost/assign/v2/optional/standard/modifier.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_TAG(push_front)
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD(push_front)
+#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>
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_TAG(push_front)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD(push_front)
-#endif // BOOST_ASSIGN_V2_OPTIONAL_PUSH_FRONT_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_PUSH_FRONT_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/option/repeat.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/repeat.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/repeat.hpp 2011-03-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_OPTIONAL_REPEAT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_REPEAT_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_OPTION_REPEAT_ER_2010_HPP
+#define BOOST_ASSIGN_V2_OPTION_REPEAT_ER_2010_HPP
#include <cstddef>
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
@@ -18,12 +18,12 @@
#include <boost/type_traits/is_reference.hpp>
#endif
#include <boost/assign/v2/interpreter/fwd.hpp>
-#include <boost/assign/v2/optional/modifier.hpp>
+#include <boost/assign/v2/option/modifier.hpp>
namespace boost{
namespace assign{
namespace v2{
-//[syntax_optional_repeat
+//[syntax_option_repeat
namespace modifier_tag{
template<typename Tag> struct repeat/*<-*/{}/*->*/;
@@ -81,11 +81,11 @@
}/*->*/;
}// aux
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(repeat)
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(repeat, modifier_tag::repeat<typename D::modifier_tag>)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD(repeat)
+BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG(repeat, modifier_tag::repeat<typename D::modifier_tag>)
//]
}// v2
}// assign
}// boost
-#endif // BOOST_ASSIGN_V2_OPTIONAL_REPEAT_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_REPEAT_ER_2010_HPP
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:00:12 EDT (Tue, 22 Mar 2011)
@@ -7,9 +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_OPTIONAL_STANDARD_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_STANDARD_ER_2010_HPP
-#include <boost/assign/v2/optional/standard/modifier.hpp>
-#include <boost/assign/v2/optional/standard/include.hpp>
+#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>
-#endif // BOOST_ASSIGN_V2_OPTIONAL_STANDARD_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_STANDARD_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/option/standard/include.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/standard/include.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/standard/include.hpp 2011-03-22 15:00:12 EDT (Tue, 22 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_OPTIONAL_STANDARD_INCLUDE_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_STANDARD_INCLUDE_ER_2010_HPP
-#include <boost/assign/v2/optional/insert.hpp>
-#include <boost/assign/v2/optional/push.hpp>
-#include <boost/assign/v2/optional/push_back.hpp>
-#include <boost/assign/v2/optional/push_front.hpp>
+#ifndef BOOST_ASSIGN_V2_OPTION_STANDARD_INCLUDE_ER_2010_HPP
+#define BOOST_ASSIGN_V2_OPTION_STANDARD_INCLUDE_ER_2010_HPP
+#include <boost/assign/v2/option/insert.hpp>
+#include <boost/assign/v2/option/push.hpp>
+#include <boost/assign/v2/option/push_back.hpp>
+#include <boost/assign/v2/option/push_front.hpp>
-#endif // BOOST_ASSIGN_V2_OPTIONAL_STANDARD_INCLUDE_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_STANDARD_INCLUDE_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:00:12 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 BOOST_ASSIGN_V2_OPTIONAL_STANDARD_MODIFIER_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_STANDARD_MODIFIER_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_OPTION_STANDARD_MODIFIER_ER_2010_HPP
+#define BOOST_ASSIGN_V2_OPTION_STANDARD_MODIFIER_ER_2010_HPP
#include <boost/assign/v2/detail/keyword/ignore.hpp>
//#include <boost/assign/v2/interpreter/modifier.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
-#include <boost/assign/v2/optional/modifier.hpp>
+#include <boost/assign/v2/option/modifier.hpp>
#include <boost/preprocessor/cat.hpp>
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_IMPL_PTR(FUN)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_IMPL_PTR(FUN)\
template<typename C, typename T>\
void impl(C& cont, T* t)const{\
cont.FUN( t );\
}\
/**/
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_IMPL_LVALUE(FUN)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_IMPL_LVALUE(FUN)\
template<typename C, typename T>\
void impl(C& cont, T& t)const{\
cont.FUN( t );\
@@ -34,7 +34,7 @@
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits/is_reference.hpp>
// disable_if necessary to avoid ambiguity resolution with GCC4.4
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_IMPL_RVALUE(FUN)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_IMPL_RVALUE(FUN)\
template<typename C, typename T>\
typename boost::disable_if<\
boost::is_reference<T>,\
@@ -44,17 +44,17 @@
cont.FUN( std::move( t ) );\
}\
/**/
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_IMPL(FUN)\
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_IMPL_LVALUE(FUN)\
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_IMPL_RVALUE(FUN)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_IMPL(FUN)\
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_IMPL_LVALUE(FUN)\
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_IMPL_RVALUE(FUN)\
/**/
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_IMPL(FUN)\
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_IMPL_LVALUE(FUN)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_IMPL(FUN)\
+BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_IMPL_LVALUE(FUN)\
/**/
#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_TAG(FUN)\
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_TAG(FUN)\
namespace boost{\
namespace assign{\
namespace v2{\
@@ -64,8 +64,8 @@
}\
/**/
-// Must be preceded by BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_TAG(FUN)
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD(FUN)\
+// Must be preceded by BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_TAG(FUN)
+#define BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD(FUN)\
namespace boost{\
namespace assign{\
namespace v2{\
@@ -78,13 +78,13 @@
public:\
adapter_modifier(){}\
adapter_modifier( ignore_, ignore_ ){}\
- BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_IMPL(FUN)\
+ BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_IMPL(FUN)\
};\
\
}\
namespace{\
\
- aux::optional_modifier<aux::keyword_standard_modifier, modifier_tag::FUN> const\
+ aux::option_modifier<aux::keyword_standard_modifier, modifier_tag::FUN> const\
BOOST_PP_CAT(_,FUN) = ( \
_standard_modifier = modifier_tag::FUN() \
);\
@@ -96,4 +96,4 @@
/**/
-#endif // BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTION_MODIFIER_STANDARD_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-22 15:00:12 EDT (Tue, 22 Mar 2011)
@@ -11,6 +11,6 @@
#define BOOST_ASSIGN_V2_UTILITY_CHAIN_ER_2010_HPP
#include <boost/assign/v2/utility/chain/chain.hpp>
-// #include <boost/assign/v2/utility/chain/operator_and.hpp> // keep commented out as it is optional
+// #include <boost/assign/v2/utility/chain/operator_and.hpp> // keep commented out as it is option
#endif // BOOST_ASSIGN_V2_UTILITY_CHAIN_ER_2010_HPP