|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r70478 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/deque boost/assign/v2/deque/cpp03 boost/assign/v2/interpreter boost/assign/v2/option boost/assign/v2/option/std_modifier boost/assign/v2/pipe libs/assign/v2/test/interpreter libs/assign/v2/test/option
From: erwann.rogard_at_[hidden]
Date: 2011-03-23 10:34:56
Author: e_r
Date: 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
New Revision: 70478
URL: http://svn.boost.org/trac/boost/changeset/70478
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/deque/conversion.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque.hpp | 6 +++---
sandbox/assign_v2/boost/assign/v2/deque/cpp03/deque.hpp | 6 +++---
sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp | 14 +++++++-------
sandbox/assign_v2/boost/assign/v2/deque/deque.hpp | 18 +++++++++---------
sandbox/assign_v2/boost/assign/v2/deque/fwd.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp | 8 ++++----
sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp | 12 ++++++------
sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp | 12 ++++++------
sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/option/data.hpp | 16 ++++++++--------
sandbox/assign_v2/boost/assign/v2/option/iterate.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/option/key.hpp | 8 ++++----
sandbox/assign_v2/boost/assign/v2/option/mapped.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/option/modifier.hpp | 20 ++++++++++----------
sandbox/assign_v2/boost/assign/v2/option/repeat.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/option/std_modifier/modifier.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp | 12 ++++++------
sandbox/assign_v2/boost/assign/v2/pipe/option_traits.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/put.hpp | 24 ++++++++++++------------
sandbox/assign_v2/libs/assign/v2/test/interpreter/modifier.cpp | 26 +++++++++++++-------------
sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp | 12 ++++++------
sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp | 12 ++++++------
sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp | 8 ++++----
26 files changed, 127 insertions(+), 127 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/deque/conversion.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/conversion.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/conversion.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -15,7 +15,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace aux{
+namespace interpreter_aux{
#define BOOST_ASSIGN_V2_SEQ (T)(F)(Tag)
#define BOOST_ASSIGN_V2_R deque_interpreter<T, F, Tag>
@@ -23,7 +23,7 @@
#undef BOOST_ASSIGN_V2_SEQ
#undef BOOST_ASSIGN_V2_R
-}// aux
+}// interpreter_aux
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -16,7 +16,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace aux{
+namespace interpreter_aux{
#define BOOST_ASSIGN_V2_MACRO1(z, i, data) ( BOOST_PP_CAT(_, i) )
#define BOOST_ASSIGN_V2_MACRO2(z, N, data)\
@@ -37,9 +37,9 @@
#undef BOOST_ASSIGN_V2_MACRO1
#undef BOOST_ASSIGN_V2_MACRO2
-}// aux
+}// interpreter_aux
-using aux::csv_deque;
+using interpreter_aux::csv_deque;
}// v2
}// assign
Modified: sandbox/assign_v2/boost/assign/v2/deque/cpp03/deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/cpp03/deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/cpp03/deque.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -22,7 +22,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace aux{
+namespace interpreter_aux{
template<typename T>
typename result_of::deque<T>::type
@@ -80,9 +80,9 @@
)
#undef BOOST_ASSIGN_V2_MACRO
-}// aux
+}// interpreter_aux
-using aux::deque;
+using interpreter_aux::deque;
}// v2
}// assign
Modified: sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -21,7 +21,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace aux{
+namespace interpreter_aux{
template<typename T>
struct csv_deque_value : boost::decay<
@@ -36,25 +36,25 @@
>{};
}// result_of
-}// aux
+}// interpreter_aux
//[syntax_deque_csv_deque
template<typename T>
struct csv_deque_value/*<-*/
- : aux::csv_deque_value<T>
+ : interpreter_aux::csv_deque_value<T>
{}/*->*/;
namespace result_of{
template<typename T>
struct csv_deque/*<-*/
- : aux::result_of::csv_deque<T>
+ : interpreter_aux::result_of::csv_deque<T>
{}/*->*/;
}// result_of
//<-
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-namespace aux{
+namespace interpreter_aux{
template<typename T, typename R>
void csv_deque_impl(R& r){}
@@ -77,9 +77,9 @@
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
//]
-}// aux
+}// interpreter_aux
-using aux::csv_deque;
+using interpreter_aux::csv_deque;
#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
Modified: sandbox/assign_v2/boost/assign/v2/deque/deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/deque.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -32,7 +32,7 @@
namespace assign{
namespace v2{
//[syntax_deque_deque
-namespace aux{
+namespace interpreter_aux{
template<typename T>
struct /*<<Metafunction>>*/deque_impl{ typedef /*<-*/std::deque<T> BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified /*<-*/)/*->*/type; };
@@ -49,7 +49,7 @@
typedef impl_ const cimpl_;
typedef interpreter_crtp<impl_, F, Tag, deque_interpreter> put_crtp_;
- typedef aux::adapter_modifier<Tag> modifier_;
+ typedef interpreter_aux::adapter_modifier<Tag> modifier_;
//->
public:
@@ -158,9 +158,9 @@
}// result_of
//<-
-}// aux
+}// interpreter_aux
//->
-namespace aux{
+namespace interpreter_aux{
//<-
template<typename T>
@@ -171,19 +171,19 @@
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
//<-
-}// aux
+}// interpreter_aux
//->
namespace result_of{
template<typename T>
struct /*<<Metafunction>>*/deque/*<-*/
- : aux::result_of::deque<T>
+ : interpreter_aux::result_of::deque<T>
{}/*->*/;
}// result_of
//<-
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-namespace aux{
+namespace interpreter_aux{
//->
template<typename T, typename...Args>
@@ -194,8 +194,8 @@
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
//]
-}// aux
-using aux::deque;
+}// interpreter_aux
+using interpreter_aux::deque;
#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/deque/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/fwd.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/fwd.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -13,13 +13,13 @@
namespace boost{
namespace assign{
namespace v2{
-namespace aux{
+namespace interpreter_aux{
template<typename T> struct deque_impl;
template<typename T, typename F, typename Tag> class deque_interpreter;
-}// aux
+}// interpreter_aux
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -17,7 +17,7 @@
namespace assign{
namespace v2{
//[syntax_interpreter_as_arg_list
-namespace aux{
+namespace interpreter_aux{
template<typename /*<<Range>>*/R>
class as_arg_list_adapter/*<-*/
@@ -67,13 +67,13 @@
return typename result_of::as_arg_list<R const>::type( range );
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-}// aux
- using aux::as_arg_list;
+}// interpreter_aux
+ using interpreter_aux::as_arg_list;
namespace result_of{
template<typename R>
struct as_arg_list/*<-*/
- : aux::result_of::as_arg_list<R>
+ : interpreter_aux::result_of::as_arg_list<R>
{}/*->*/;
}// result_of
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -36,7 +36,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace aux{
+namespace interpreter_aux{
template<typename F>
struct data_gen_holder{
@@ -54,7 +54,7 @@
struct modifier_holder{
typedef Tag modifier_tag;
- typedef aux::adapter_modifier<Tag> modifier_type;
+ typedef interpreter_aux::adapter_modifier<Tag> modifier_type;
modifier_holder(){}
modifier_holder(modifier_type const& m) : modifier( m ){}
@@ -100,7 +100,7 @@
};
}//aux
//[syntax_put_interpreter_crtp
-namespace aux{
+namespace interpreter_aux{
template<typename C, typename D>
struct ConceptAdapter1{
@@ -119,7 +119,7 @@
template<typename C, typename F, typename Tag, typename D>
struct ConceptAdapter2 : ConceptAdapter1<C, D>{
- typedef aux::adapter_modifier<Tag> modifier_;
+ typedef interpreter_aux::adapter_modifier<Tag> modifier_;
BOOST_CONCEPT_USAGE(ConceptAdapter2)
{
@@ -259,7 +259,7 @@
result_type modify(T&& t)const
{
check_modifier( t );
- /*<< Instance of aux::adapter_modifier<Tag> >>*/this->modifier.impl(
+ /*<< Instance of interpreter_aux::adapter_modifier<Tag> >>*/this->modifier.impl(
/*<< Reference to C >>*/this->derived().container(),
std::forward<T>( t )
);
@@ -288,7 +288,7 @@
};
-}// aux
+}// interpreter_aux
//]
}// v2
}// assign
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -22,7 +22,7 @@
namespace assign{
namespace v2{
//[syntax_interpreter_data
-namespace aux{
+namespace interpreter_aux{
template<typename C>
struct container_value{ typedef typename C::value_type type; };
@@ -58,7 +58,7 @@
>
{}/*->*/;
-}// aux
+}// interpreter_aux
//]
}// v2
}// assign
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -13,14 +13,14 @@
namespace boost{
namespace assign{
namespace v2{
-namespace aux{
+namespace interpreter_aux{
template<typename C, typename F, typename Tag, typename D>
class interpreter_crtp;
template<typename Tag> struct /*<<Specialize on Tag>>*/ adapter_modifier;
-}// aux
+}// interpreter_aux
}// v2
}// assign
}// boost
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-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -28,7 +28,7 @@
namespace v2{
//[syntax_interpreter_modifier
namespace /*<< Template arguments to `aux::adapter_modifier<>` have to be within this `namespace`>>*/modifier_tag{}
-namespace aux{
+namespace interpreter_aux{
template<typename Tag>
struct /*<<Specialize on Tag>>*/ adapter_modifier{};
@@ -36,7 +36,7 @@
template<typename C>
struct /*<<Metafunction returning a modifier-tag>>*/deduce_modifier_tag;
-}// aux
+}// interpreter_aux
namespace put_concept{
template<typename Tag, /*<<Container>>*/ typename C, /*<<Input>>*/ typename T>
@@ -49,7 +49,7 @@
}
private:
- static aux::adapter_modifier<Tag>& m;
+ static interpreter_aux::adapter_modifier<Tag>& m;
static C& cont;
static T t;
};
@@ -128,7 +128,7 @@
/*->*/
-namespace aux{
+namespace interpreter_aux{
template<typename /*<<Container>>*/C>
struct /*<<Metafunction>>*/deduce_modifier_tag/*<-*/
@@ -140,12 +140,12 @@
template<typename C, typename X>
void check_deduce()
{
- typedef typename aux::deduce_modifier_tag<C>::type found_;
+ typedef typename interpreter_aux::deduce_modifier_tag<C>::type found_;
BOOST_MPL_ASSERT(( boost::is_same<found_, X> ));
}
//->
-}// aux
+}// interpreter_aux
//]
}// v2
}// assign
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -16,7 +16,7 @@
namespace assign{
namespace v2{
//[syntax_put_adapter_replace_parameter
-namespace aux{
+namespace interpreter_aux{
template<typename /*<<Inherits interpreter_crtp\<\> >>*/D>
struct /*<<Metafunction class to be specialized on D>>*/replace_data_generator{
@@ -30,7 +30,7 @@
struct /*<<Transforms D by replacing Tag D::modifier_tag with Tag>>*/ apply{};
};
-}// aux
+}// interpreter_aux
//]
}// v2
}// assign
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-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -19,13 +19,13 @@
namespace assign{
namespace v2{
//[syntax_option_data
-namespace aux{
+namespace interpreter_aux{
namespace result_of{
template<typename D>
struct /*<<Metafunction class>>*/option_data_generator/*<-*/{
- typedef aux::replace_data_generator<D> meta_;
+ typedef interpreter_aux::replace_data_generator<D> meta_;
template<typename F>
struct apply : ::boost::mpl::apply1<meta_, F>{};
@@ -68,16 +68,16 @@
}/*->*/;
-}// aux
+}// interpreter_aux
namespace{
- const aux::keyword_data_generator _data/*<-*/
- = aux::keyword_data_generator()/*->*/;
+ const interpreter_aux::keyword_data_generator _data/*<-*/
+ = interpreter_aux::keyword_data_generator()/*->*/;
}
namespace result_of{
template<typename D>
struct /*<<Metafunction class>>*/option_data_generator/*<-*/
- : aux::result_of::option_data_generator<D>
+ : interpreter_aux::result_of::option_data_generator<D>
{}/*->*/;
}// result_of
@@ -94,7 +94,7 @@
namespace boost{\
namespace assign{\
namespace v2{\
-namespace aux{\
+namespace interpreter_aux{\
\
template<typename T>\
option_data_generator< FUN > NAME()\
@@ -103,7 +103,7 @@
}\
\
}\
-using aux::NAME;\
+using interpreter_aux::NAME;\
}\
}\
}\
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-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -49,7 +49,7 @@
template<typename Arg/*<-*/= iterate_arg::type/*->*/> struct iterate{};
}// modifier_tag
-namespace aux{
+namespace interpreter_aux{
template<typename Arg>
class adapter_modifier< modifier_tag::iterate<Arg> >/*<-*/
@@ -100,7 +100,7 @@
}/*->*/;
-}// aux
+}// interpreter_aux
BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD(iterate)
BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG(iterate, modifier_tag::iterate<Arg>)
//]
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-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -17,7 +17,7 @@
namespace assign{
namespace v2{
//[syntax_option_key
-namespace aux{
+namespace interpreter_aux{
template<typename C>
struct container_key{ typedef typename C::key_type type; };
@@ -38,7 +38,7 @@
template<typename C, typename D>
struct option_key : ::boost::mpl::apply1<
- aux::result_of::option_data_generator<D>,
+ interpreter_aux::result_of::option_data_generator<D>,
typename deduce_key_generator<C>::type
>{};
@@ -56,11 +56,11 @@
}/*<-*/BOOST_ASSIGN_V2_IGNORE(/*<-*/;/*->*/)/*->*/
-}// aux
+}// interpreter_aux
//<-
namespace{
//->
- aux::option_key const _key/*<-*/= aux::option_key()/*->*/;
+ interpreter_aux::option_key const _key/*<-*/= interpreter_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-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -25,7 +25,7 @@
template<typename/*<<Mapping>>*/ Arg> struct mapped;
}// modifier_tag
-namespace aux{
+namespace interpreter_aux{
template<typename Arg>
class adapter_modifier<modifier_tag::mapped<Arg> >/*<-*/
@@ -65,7 +65,7 @@
ptr_ ptr;
}/*->*/;
-}// aux
+}// interpreter_aux
BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD(mapped)
BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG(mapped, modifier_tag::mapped<Arg>)
//]
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-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -21,7 +21,7 @@
namespace assign{
namespace v2{
//[syntax_put_modifier_modulo
-namespace aux{
+namespace interpreter_aux{
template<typename /*<<A class of modifiers>>*/ Keyword, typename /*<<A part of the modifier's implementation>>*/Arg = keyword_aux::ignore>
struct option_modifier
@@ -62,7 +62,7 @@
struct option_modifier{
//<-
- typedef aux::replace_modifier_tag<D> meta_;
+ typedef interpreter_aux::replace_modifier_tag<D> meta_;
//->
template<typename Keyword, typename Arg>
@@ -71,7 +71,7 @@
: ::boost::mpl::apply1<
meta_,
typename ::boost::mpl::apply1<
- aux::meta_modifier_tag<Keyword, Arg>,
+ interpreter_aux::meta_modifier_tag<Keyword, Arg>,
D
>::type
>
@@ -93,9 +93,9 @@
option_modifier<Keyword, Arg> const& rhs
)/*<-*/
{
- typedef aux::meta_modifier_tag<Keyword, Arg> meta_;
+ typedef interpreter_aux::meta_modifier_tag<Keyword, Arg> meta_;
typedef typename ::boost::mpl::apply1<meta_, D>::type modifier_tag;
- typedef aux::adapter_modifier<modifier_tag> modifier_;
+ typedef interpreter_aux::adapter_modifier<modifier_tag> modifier_;
typedef typename ::boost::mpl::apply2<
result_of::option_modifier<D>,
@@ -109,13 +109,13 @@
);
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-}// aux
+}// interpreter_aux
//]
namespace result_of{
template<typename D>
struct option_modifier
- : aux::result_of::option_modifier<D>
+ : interpreter_aux::result_of::option_modifier<D>
{};
}// result_of
@@ -124,7 +124,7 @@
#error
#else
#define BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG(NAME, Result)\
-namespace aux{\
+namespace interpreter_aux{\
\
template<typename Arg>\
struct meta_modifier_tag<BOOST_PP_CAT(keyword_,NAME), Arg>\
@@ -140,7 +140,7 @@
#error
#else
#define BOOST_ASSIGN_V2_OPTION_MODIFIER_KWD_TYPE(NAME)\
- aux::option_modifier<aux::BOOST_PP_CAT(keyword_,NAME)>\
+ interpreter_aux::option_modifier<interpreter_aux::BOOST_PP_CAT(keyword_,NAME)>\
/**/
#endif
@@ -148,7 +148,7 @@
#error
#else
#define BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD(NAME)\
-namespace aux{\
+namespace interpreter_aux{\
struct BOOST_PP_CAT(keyword_,NAME){\
\
BOOST_PP_CAT(keyword_,NAME)(){}\
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-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -29,7 +29,7 @@
template<typename Tag> struct repeat/*<-*/{}/*->*/;
}// modifier_tag
-namespace aux{
+namespace interpreter_aux{
template<typename Arg>
class adapter_modifier<modifier_tag::repeat<Arg> >/*<-*/
@@ -80,7 +80,7 @@
size_type n_;
}/*->*/;
-}// aux
+}// interpreter_aux
BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD(repeat)
BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG(repeat, modifier_tag::repeat<typename D::modifier_tag>)
//]
Modified: sandbox/assign_v2/boost/assign/v2/option/std_modifier/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/std_modifier/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/std_modifier/modifier.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -79,7 +79,7 @@
namespace boost{\
namespace assign{\
namespace v2{\
-namespace aux{\
+namespace interpreter_aux{\
\
template<>\
class adapter_modifier<modifier_tag::FUN>\
@@ -94,7 +94,7 @@
}\
namespace{\
\
- aux::option_modifier<aux::keyword_std_modifier, modifier_tag::FUN> const\
+ interpreter_aux::option_modifier<interpreter_aux::keyword_std_modifier, modifier_tag::FUN> const\
BOOST_PP_CAT(_,FUN) = ( \
_std_modifier = modifier_tag::FUN() \
);\
Modified: sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -32,7 +32,7 @@
namespace assign{
namespace v2{
//[syntax_pipe_csv_put
-namespace aux{
+namespace interpreter_aux{
typedef ref::array_aux::size_type arg_list_size_type;
@@ -102,7 +102,7 @@
template<std::size_t N, typename U = na_> // size?
struct result{
- typedef aux::arg_list<OptionList, N, U> type;
+ typedef interpreter_aux::arg_list<OptionList, N, U> type;
};
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
@@ -196,7 +196,7 @@
}/*->*/;
template<typename C, typename ParList, arg_list_size_type N, typename U>
- C& operator|(C& cont, aux::arg_list<ParList, N, U> const& arg_list)/*<-*/
+ C& operator|(C& cont, interpreter_aux::arg_list<ParList, N, U> const& arg_list)/*<-*/
{
v2::ref::as_arg_list(
v2::ref::as_modulo_list<ParList>(
@@ -209,13 +209,13 @@
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-}// aux
+}// interpreter_aux
//<-
namespace{
//->
- aux::arg_list_generator<> const _csv_put/*<-*/
- = aux::arg_list_generator<>()/*->*/;
+ interpreter_aux::arg_list_generator<> const _csv_put/*<-*/
+ = interpreter_aux::arg_list_generator<>()/*->*/;
//<-
}
Modified: sandbox/assign_v2/boost/assign/v2/pipe/option_traits.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/pipe/option_traits.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/pipe/option_traits.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -19,7 +19,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace aux{
+namespace interpreter_aux{
typedef ::boost::mpl::vector0<> empty_option_list_;
typedef ref::list_aux::size_type option_size_type;
@@ -38,7 +38,7 @@
>{};
};
-}// aux
+}// interpreter_aux
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put.hpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -20,17 +20,17 @@
namespace assign{
namespace v2{
//[syntax_put
-namespace aux{
+namespace interpreter_aux{
template<typename C, typename F, typename Tag>
class put_interpreter
: protected ref::wrapper< ref::assign_tag::copy, C >,
//<-
- public aux::interpreter_crtp< C, F, Tag, put_interpreter<C, F, Tag> >
+ public interpreter_aux::interpreter_crtp< C, F, Tag, put_interpreter<C, F, Tag> >
//->
{
//<-
- typedef aux::interpreter_crtp< C, F, Tag, put_interpreter > super2_t;
+ typedef interpreter_aux::interpreter_crtp< C, F, Tag, put_interpreter > super2_t;
//->
public:
@@ -38,7 +38,7 @@
//<-
protected:
- typedef aux::adapter_modifier<Tag> modifier_;
+ typedef interpreter_aux::adapter_modifier<Tag> modifier_;
typedef ref::assign_tag::copy assign_tag_;
typedef ref::wrapper<assign_tag_,C> super1_t;
//->
@@ -62,25 +62,25 @@
};
template<typename C, typename F, typename Tag>
- struct /*<<Metafunction class>>*/replace_data_generator< aux::put_interpreter<C, F, Tag> >{/*<-*/
+ struct /*<<Metafunction class>>*/replace_data_generator< interpreter_aux::put_interpreter<C, F, Tag> >{/*<-*/
template<typename F1>
- struct apply{ typedef aux::put_interpreter<C, F1, Tag> type; };
+ struct apply{ typedef interpreter_aux::put_interpreter<C, F1, Tag> type; };
/*->*/};
template<typename C, typename F, typename Tag>
- struct /*<<Metafunction class>>*/replace_modifier_tag< aux::put_interpreter<C, F, Tag> >{/*<-*/
+ struct /*<<Metafunction class>>*/replace_modifier_tag< interpreter_aux::put_interpreter<C, F, Tag> >{/*<-*/
template<typename Tag1>
- struct apply{ typedef aux::put_interpreter<C, F, Tag1> type; };
+ struct apply{ typedef interpreter_aux::put_interpreter<C, F, Tag1> type; };
/*->*/};
-}// aux
+}// interpreter_aux
namespace result_of{
template<typename C>
struct /*<<Metafunction>>*/put/*<-*/{
- typedef typename aux::deduce_data_generator<C>::type f_;
- typedef typename aux::deduce_modifier_tag<C>::type modifier_tag_;
- typedef aux::put_interpreter<C, f_, modifier_tag_> type;
+ typedef typename interpreter_aux::deduce_data_generator<C>::type f_;
+ typedef typename interpreter_aux::deduce_modifier_tag<C>::type modifier_tag_;
+ typedef interpreter_aux::put_interpreter<C, f_, modifier_tag_> type;
}/*->*/;
}// result_of
Modified: sandbox/assign_v2/libs/assign/v2/test/interpreter/modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/interpreter/modifier.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/interpreter/modifier.cpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -41,34 +41,34 @@
{
typedef as2::modifier_tag::push_back answer_;
- as2::aux::check_deduce<std::deque<int>, answer_>();
- as2::aux::check_deduce<std::list<int>, answer_>();
- as2::aux::check_deduce<std::vector<int>, answer_>();
+ as2:: interpreter_aux::check_deduce<std::deque<int>, answer_>();
+ as2:: interpreter_aux::check_deduce<std::list<int>, answer_>();
+ as2:: interpreter_aux::check_deduce<std::vector<int>, answer_>();
- as2::aux::check_deduce<boost::ptr_deque<int>, answer_>();
- as2::aux::check_deduce<boost::ptr_list<int>, answer_>();
- as2::aux::check_deduce<boost::ptr_vector<int>, answer_>();
+ as2:: interpreter_aux::check_deduce<boost::ptr_deque<int>, answer_>();
+ as2:: interpreter_aux::check_deduce<boost::ptr_list<int>, answer_>();
+ as2:: interpreter_aux::check_deduce<boost::ptr_vector<int>, answer_>();
}
{
typedef as2::modifier_tag::iterate<> answer_;
- as2::aux::check_deduce<boost::array<int, 1>, answer_>();
- as2::aux::check_deduce<boost::ptr_array<int, 1>, answer_>();
+ as2:: interpreter_aux::check_deduce<boost::array<int, 1>, answer_>();
+ as2:: interpreter_aux::check_deduce<boost::ptr_array<int, 1>, answer_>();
}
{
typedef as2::modifier_tag::push answer_;
- as2::aux::check_deduce<std::queue<int>, answer_>();
- as2::aux::check_deduce<std::stack<int>, answer_>();
+ as2:: interpreter_aux::check_deduce<std::queue<int>, answer_>();
+ as2:: interpreter_aux::check_deduce<std::stack<int>, answer_>();
}
{
typedef as2::modifier_tag::insert answer_;
- as2::aux::check_deduce<std::set<int>, answer_>();
+ as2:: interpreter_aux::check_deduce<std::set<int>, answer_>();
typedef std::string str_;
- as2::aux::check_deduce<std::map<str_, int>, answer_>();
+ as2:: interpreter_aux::check_deduce<std::map<str_, int>, answer_>();
}
{
//[put_deduce_map
typedef std::map<std::string, int> C;
- typedef as2::aux::deduce_modifier_tag<C>::type found_;
+ typedef as2:: interpreter_aux::deduce_modifier_tag<C>::type found_;
typedef as2::modifier_tag::insert answer_;
BOOST_MPL_ASSERT(( boost::is_same<found_, answer_> ));
//]
Modified: sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -36,15 +36,15 @@
namespace as2 = assign::v2;
{
//[test_option_iterate_meta
- typedef as2::aux::keyword_iterate keyword_;
+ typedef as2:: interpreter_aux::keyword_iterate keyword_;
typedef as2::modifier_tag::iterate_arg arg_;
- typedef as2::aux::option_modifier<keyword_, arg_> modulo_;
+ typedef as2:: interpreter_aux::option_modifier<keyword_, arg_> modulo_;
typedef array<int, 4> cont_;
typedef as2::result_of::put<cont_>::type put_;
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_;
+ typedef as2:: interpreter_aux::replace_modifier_tag<put_> meta2_;
typedef ::boost::mpl::apply1<meta2_, tag1_>::type result2_;
BOOST_MPL_ASSERT(( is_same<result1_, result2_> ));
//]
@@ -60,14 +60,14 @@
}
{
//[test_option_iterate_meta_deque
- typedef as2::aux::keyword_iterate keyword_;
+ typedef as2:: interpreter_aux::keyword_iterate keyword_;
typedef as2::modifier_tag::iterate_arg arg_;
- typedef as2::aux::option_modifier<keyword_, arg_> modulo_;
+ typedef as2:: interpreter_aux::option_modifier<keyword_, arg_> modulo_;
typedef as2::result_of::deque<int>::type put_;
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_;
+ typedef as2:: interpreter_aux::replace_modifier_tag<put_> meta2_;
typedef ::boost::mpl::apply1<meta2_, tag1_>::type result2_;
BOOST_MPL_ASSERT(( is_same<result1_, result2_> ));
//]
Modified: sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -37,14 +37,14 @@
//[test_option_mapped_meta
using namespace lambda;
typedef BOOST_TYPEOF(_1) arg_;
- typedef as2::aux::keyword_mapped keyword_;
- typedef as2::aux::option_modifier<keyword_, arg_> modulo_;
+ typedef as2:: interpreter_aux::keyword_mapped keyword_;
+ typedef as2:: interpreter_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::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_;
+ typedef as2:: interpreter_aux::replace_modifier_tag<put_> meta2_;
typedef ::boost::mpl::apply1<meta2_, tag1_>::type result2_;
BOOST_MPL_ASSERT((boost::is_same<result1_, result2_>));
//]
@@ -66,13 +66,13 @@
//[test_option_mapped_meta_deque
using namespace lambda;
typedef BOOST_TYPEOF(_1) arg_;
- typedef as2::aux::keyword_mapped keyword_;
- typedef as2::aux::option_modifier<keyword_, arg_> modulo_;
+ typedef as2:: interpreter_aux::keyword_mapped keyword_;
+ typedef as2:: interpreter_aux::option_modifier<keyword_, arg_> modulo_;
typedef as2::result_of::deque<int>::type put_;
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_;
+ typedef as2:: interpreter_aux::replace_modifier_tag<put_> meta2_;
typedef ::boost::mpl::apply1<meta2_, tag1_>::type result2_;
BOOST_MPL_ASSERT((boost::is_same<result1_, result2_>));
//]
Modified: sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp 2011-03-23 10:34:49 EDT (Wed, 23 Mar 2011)
@@ -48,11 +48,11 @@
{
//[test_option_standard_meta
typedef as2::result_of::put<std::vector<int> >::type put_;
- typedef as2::aux::keyword_std_modifier keyword_;
+ typedef as2:: interpreter_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_;
- typedef as2::aux::replace_modifier_tag<put_> meta2_;
+ typedef as2:: interpreter_aux::replace_modifier_tag<put_> meta2_;
typedef ::boost::mpl::apply1<meta2_, tag_>::type result2_;
BOOST_MPL_ASSERT(( boost::is_same<result1_, result2_> ));
//]
@@ -96,11 +96,11 @@
{
//[test_option_meta_deque
typedef as2::result_of::deque<int>::type put_;
- typedef as2::aux::keyword_std_modifier keyword_;
+ typedef as2:: interpreter_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_;
- typedef as2::aux::replace_modifier_tag<put_> meta2_;
+ typedef as2:: interpreter_aux::replace_modifier_tag<put_> meta2_;
typedef ::boost::mpl::apply1<meta2_, tag_>::type result2_;
BOOST_MPL_ASSERT(( boost::is_same<result1_, result2_> ));
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk