|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r70385 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/deque boost/assign/v2/detail/functor boost/assign/v2/detail/keyword boost/assign/v2/include boost/assign/v2/interpreter boost/assign/v2/optional boost/assign/v2/put boost/assign/v2/put/pipe boost/assign/v2/ref/aux_/list boost/assign/v2/ref/aux_/list/holder boost/assign/v2/utility boost/assign/v2/utility/chain libs/assign/v2 libs/assign/v2/src libs/assign/v2/test libs/assign/v2/test/optional libs/assign/v2/test/put/pipe/optional libs/assign/v2/test/utility
From: erwann.rogard_at_[hidden]
Date: 2011-03-21 22:57:28
Author: e_r
Date: 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
New Revision: 70385
URL: http://svn.boost.org/trac/boost/changeset/70385
Log:
upd_assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/deque/conversion.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/deque/deque.hpp | 22 +++++++++++-----------
sandbox/assign_v2/boost/assign/v2/deque/fwd.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp | 40 ++++++++++++++++------------------------
sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp | 6 ++++++
sandbox/assign_v2/boost/assign/v2/include/optional.hpp | 1 +
sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp | 16 +++++++++++-----
sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp | 24 +++++++++++++++---------
sandbox/assign_v2/boost/assign/v2/optional.hpp | 1 +
sandbox/assign_v2/boost/assign/v2/optional/data.hpp | 28 ++++++++++++++--------------
sandbox/assign_v2/boost/assign/v2/optional/iterate.hpp | 18 ++++++++----------
sandbox/assign_v2/boost/assign/v2/optional/mapped.hpp | 17 ++++++++---------
sandbox/assign_v2/boost/assign/v2/optional/modifier.hpp | 30 ++++++++----------------------
sandbox/assign_v2/boost/assign/v2/optional/repeat.hpp | 17 ++++++++---------
sandbox/assign_v2/boost/assign/v2/put/pipe/arg_list.hpp | 12 +++++++-----
sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp | 9 +++++++--
sandbox/assign_v2/boost/assign/v2/put/put.hpp | 22 +++++++++++-----------
sandbox/assign_v2/boost/assign/v2/ref/aux_/list/as_modulo_list.hpp | 6 +++---
sandbox/assign_v2/boost/assign/v2/ref/aux_/list/container.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/head.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/utility/chain/chain.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/utility/csv.hpp | 4 ++--
sandbox/assign_v2/libs/assign/v2/src/main.cpp | 10 +++++-----
sandbox/assign_v2/libs/assign/v2/test/interpreter.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/optional/data.cpp | 4 ++--
sandbox/assign_v2/libs/assign/v2/test/optional/iterate.cpp | 4 ++--
sandbox/assign_v2/libs/assign/v2/test/optional/mapped.cpp | 12 ++++++------
sandbox/assign_v2/libs/assign/v2/test/optional/standard.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/data.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/iterate.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/mapped.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/repeat.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/standard.cpp | 8 ++++----
sandbox/assign_v2/libs/assign/v2/test/utility/chain.cpp | 3 ++-
sandbox/assign_v2/libs/assign/v2/tutorial.cpp | 11 ++++++-----
35 files changed, 176 insertions(+), 173 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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -18,7 +18,7 @@
namespace aux{
#define BOOST_ASSIGN_V2_SEQ (T)(F)(Tag)
-#define BOOST_ASSIGN_V2_R deque_adapter<T, F, Tag>
+#define BOOST_ASSIGN_V2_R deque_interpreter<T, F, Tag>
BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERTER_NAME_LOOKUP(BOOST_ASSIGN_V2_SEQ, BOOST_ASSIGN_V2_R)
#undef BOOST_ASSIGN_V2_SEQ
#undef BOOST_ASSIGN_V2_R
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -38,18 +38,18 @@
struct /*<<Metafunction>>*/deque_impl{ typedef /*<-*/std::deque<T> BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified /*<-*/)/*->*/type; };
template<typename T, typename F, typename Tag>
- class deque_adapter
+ class deque_interpreter
//<-
: public interpreter_crtp<
typename deque_impl<T>::type, F, Tag,
- deque_adapter<T, F, Tag>
+ deque_interpreter<T, F, Tag>
>
//->
{
//<-
typedef typename deque_impl<T>::type impl_;
typedef impl_ const cimpl_;
- typedef interpreter_crtp<impl_, F, Tag, deque_adapter> put_crtp_;
+ typedef interpreter_crtp<impl_, F, Tag, deque_interpreter> put_crtp_;
typedef aux::adapter_modifier<Tag> modifier_;
//->
@@ -61,9 +61,9 @@
typedef /*<-*/typename boost::range_iterator<cimpl_>::type BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified /*<-*/)/*->*/const_iterator;
// Construct
- deque_adapter()/*<-*/
+ deque_interpreter()/*<-*/
{}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
- explicit deque_adapter( impl_ const& cont, F const& f, modifier_ const& m )/*<-*/
+ explicit deque_interpreter( impl_ const& cont, F const& f, modifier_ const& m )/*<-*/
: put_crtp_( f, m ), impl( cont )
{}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
@@ -118,7 +118,7 @@
void pop_back()/*<-*/{
this->container().pop_back();
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
- void swap(deque_adapter& that)/*<-*/{
+ void swap(deque_interpreter& that)/*<-*/{
this->container().swap( that.container() );
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
@@ -132,17 +132,17 @@
};
template<typename T, typename F, typename Tag>
- struct /*<<Metafunction class>>*/replace_fun< deque_adapter<T, F, Tag> >/*<-*/
+ struct /*<<Metafunction class>>*/replace_fun< deque_interpreter<T, F, Tag> >/*<-*/
{
template<typename F1>
- struct apply{ typedef deque_adapter<T, F1, Tag> type; };
+ struct apply{ typedef deque_interpreter<T, F1, Tag> type; };
}/*->*/;
template<typename T, typename F, typename Tag>
- struct /*<<Metafunction class>>*/replace_modifier_tag< deque_adapter<T, F, Tag> >/*<-*/
+ struct /*<<Metafunction class>>*/replace_modifier_tag< deque_interpreter<T, F, Tag> >/*<-*/
{
template<typename Tag1>
- struct apply{ typedef deque_adapter<T, F, Tag1> type; };
+ struct apply{ typedef deque_interpreter<T, F, Tag1> type; };
}/*->*/;
//<-
@@ -155,7 +155,7 @@
typedef typename deque_impl<t_>::type impl_;
typedef typename deduce_data_generator<impl_>::type f_;
typedef typename deduce_modifier_tag<impl_>::type modifier_tag_;
- typedef deque_adapter<t_,f_,modifier_tag_> type;
+ typedef deque_interpreter<t_,f_,modifier_tag_> type;
};
}// result_of
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -17,7 +17,7 @@
template<typename T> struct deque_impl;
- template<typename T, typename F, typename Tag> class deque_adapter;
+ template<typename T, typename F, typename Tag> class deque_interpreter;
}// aux
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -24,33 +24,41 @@
namespace boost{
namespace assign{
namespace v2{
+//syntax_detail_functor_constructor
namespace functor_aux{
template<typename T = keyword_aux::nil>
- class constructor
+ class constructor/*<-*/
#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
: public functor_aux::crtp_unary_and_up<
functor_aux::constructor<T>,
::boost::mpl::always<T>
>
#endif
+ /*->*/
{
+//<-
typedef functor_aux::constructor<T> this_;
-
+//->
public:
- constructor(){}
+ constructor()/*<-*/{}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
+//<-
template<typename U>
constructor<U> type()const{ return constructor<U>(); }
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
+//->
template<typename... Args>
- T operator()(Args&&...args)const
+ T operator()(Args&&...args)const/*<-*/
{
return T( std::forward<Args>(args)... );
- }
+ }/*->*/BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
+//<-
+
#else
+
protected:
typedef ::boost::mpl::always<T> meta_result_;
typedef functor_aux::crtp_unary_and_up<this_, meta_result_> super_;
@@ -75,28 +83,12 @@
#undef BOOST_ASSIGN_V2_MACRO
#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
- };
-
-}// functor_aux
-/*
-namespace result_of{
- template<typename T>
- struct constructor
- {
- typedef functor_aux::constructor<T> type;
+//->
};
-}// result_of
-
- template<typename T>
- typename result_of::constructor<T>::type
- constructor()
- {
- typedef typename result_of::constructor<T>::type result_;
- return result_();
- }
-*/
+}// functor_aux
+//]
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -13,10 +13,16 @@
namespace boost{
namespace assign{
namespace v2{
+//[syntax_detail_keyword_nil
namespace keyword_aux{ struct nil{}; }
+//<-
namespace{
+//->
const keyword_aux::nil _nil = keyword_aux::nil();
+//<-
}
+//->
+//]
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/include/optional.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/optional.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/optional.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -10,6 +10,7 @@
#ifndef BOOST_ASSIGN_V2_INCLUDE_OPTIONAL_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_OPTIONAL_ER_2010_HPP
#include <boost/assign/v2/include/optional/data.hpp>
+#include <boost/assign/v2/include/optional/key.hpp>
#include <boost/assign/v2/include/optional/insert.hpp>
#include <boost/assign/v2/include/optional/iterate.hpp>
#include <boost/assign/v2/include/optional/mapped.hpp>
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -27,19 +27,26 @@
template<typename C>
struct container_value{ typedef typename C::value_type type; };
- template<typename /*<<Pointer-container>>*/PtrC>
+ template<typename /*<<Pointer-container>>*/PtrC,
+ template<typename > class F = container_value
+ >
struct /*<<Metafunction>>*/ deduce_ptr_generator/*<-*/
{
typedef typename v2::ptr_container_aux::to_value_container<
PtrC
>::type cont_;
- typedef functor_aux::new_<typename cont_::value_type> type;
+ typedef functor_aux::new_<
+ typename F<cont_>::type
+ > type;
}/*->*/;
- template<typename /*<<Value-container>>*/C>
+ template<typename /*<<Value-container>>*/C,
+ template<typename > class F = container_value>
struct /*<<Metafunction>>*/ deduce_value_generator/*<-*/
{
- typedef functor_aux::constructor<typename C::value_type> type;
+ typedef functor_aux::constructor<
+ typename F<C>::type
+ > type;
}/*->*/;
template<typename /*<<Value or pointer-container>>*/C>
@@ -51,7 +58,6 @@
>
{}/*->*/;
-
}// aux
//]
}// v2
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -27,7 +27,7 @@
namespace assign{
namespace v2{
//[syntax_interpreter_modifier
-namespace /*<< Template arguments to `aux::adapter_modifier<>` have to be declared within this `namespace`>>*/modifier_tag{}
+namespace /*<< Template arguments to `aux::adapter_modifier<>` have to be within this `namespace`>>*/modifier_tag{}
namespace aux{
template<typename Tag>
@@ -54,8 +54,9 @@
static T t;
};
-}
-//]
+}//put_concept
+/*<-*/
+
namespace switch_tag{
struct deduce_put{};
}// switch_tag
@@ -63,13 +64,13 @@
#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_CASE
#error
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_CASE(Tag, MetaF, Number)\
+#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_SWITCH_CASE(Tag, BooleanMetaF, CaseNumber)\
namespace switch_aux{\
template<>\
- struct case_<switch_tag::deduce_put, Number> :\
+ struct case_<switch_tag::deduce_put, CaseNumber> :\
switch_aux::helper<\
v2::modifier_tag::Tag,\
- ptr_container_aux::through_value_container<MetaF>::apply\
+ ptr_container_aux::through_value_container<BooleanMetaF>::apply\
>{};\
}\
/**/
@@ -125,13 +126,16 @@
//]
#endif
+
+/*->*/
namespace aux{
- template<typename C>
- struct deduce_modifier_tag
+ template<typename /*<<Container>>*/C>
+ struct /*<<Metafunction>>*/deduce_modifier_tag/*<-*/
: switch_aux::result< switch_tag::deduce_put, C>
- {};
+ {}/*->*/;
+//<-
// For testing purposes
template<typename C, typename X>
void check_deduce()
@@ -140,7 +144,9 @@
BOOST_MPL_ASSERT(( boost::is_same<found_, X> ));
}
+//->
}// aux
+//]
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/optional.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -9,6 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#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>
Modified: sandbox/assign_v2/boost/assign/v2/optional/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/data.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional/data.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -23,7 +23,7 @@
namespace result_of{
template<typename D>
- struct /*<<Metafunction class>>*/data_generator/*<-*/{
+ struct /*<<Metafunction class>>*/optional_data_generator/*<-*/{
typedef aux::replace_fun<D> meta_;
@@ -35,10 +35,10 @@
}// result_of
template<typename F/*<-*/= keyword_aux::ignore/*->*/>
- struct data_generator/*<-*/
+ struct optional_data_generator/*<-*/
{
- data_generator(){}
- data_generator(F f) : f_( f ){}
+ optional_data_generator(){}
+ optional_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::data_generator<D>, F1>::type
- operator%(
+ typename ::boost::mpl::apply1<result_of::optional_data_generator<D>, F1>::type
+ operator%/*<<Overrides data generator>>*/(
interpreter_crtp<C, F, Tag, D> const& lhs,
- data_generator<F1> const& rhs
+ optional_data_generator<F1> const& rhs
)/*<-*/
{
- typedef result_of::data_generator<D> meta_;
+ typedef result_of::optional_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>
- data_generator<F> operator=(F const& f)const{
- return data_generator<F>( f );
+ optional_data_generator<F> operator=(F const& f)const{
+ return optional_data_generator<F>( f );
}
}/*->*/;
@@ -71,13 +71,13 @@
}// aux
namespace{
const aux::keyword_data_generator _data/*<-*/
- = aux::keyword_data_generator()/*->*/;
+ = aux::keyword_data_generator()/*->*/;
}
namespace result_of{
template<typename D>
- struct /*<<Metafunction class>>*/data_generator/*<-*/
- : aux::result_of::data_generator<D>
+ struct /*<<Metafunction class>>*/optional_data_generator/*<-*/
+ : aux::result_of::optional_data_generator<D>
{}/*->*/;
}// result_of
@@ -97,7 +97,7 @@
namespace aux{\
\
template<typename T>\
- data_generator< FUN > NAME()\
+ optional_data_generator< FUN > NAME()\
{\
return ( v2::_data = FUN() );\
}\
Modified: sandbox/assign_v2/boost/assign/v2/optional/iterate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/iterate.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional/iterate.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -13,8 +13,8 @@
#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/modifier.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
+#include <boost/assign/v2/optional/modifier.hpp>
#include <boost/call_traits.hpp>
#include <boost/shared_ptr.hpp>
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
@@ -26,6 +26,7 @@
namespace boost{
namespace assign{
namespace v2{
+//[syntax_optional_iterate
namespace modifier_tag{
struct iterate_arg
@@ -45,13 +46,13 @@
};
- template<typename Arg = iterate_arg::type > struct iterate{};
+ template<typename Arg/*<-*/= iterate_arg::type/*->*/> struct iterate{};
}// modifier_tag
namespace aux{
template<typename Arg>
- class adapter_modifier< modifier_tag::iterate<Arg> >
+ class adapter_modifier< modifier_tag::iterate<Arg> >/*<-*/
{
typedef keyword_aux::ignore ignore_;
@@ -97,18 +98,15 @@
protected:
ptr_ ptr;
- };
+ }/*->*/;
}// aux
+BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(iterate)
+BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(iterate, modifier_tag::iterate<Arg>)
+//]
}// v2
}// assign
}// boost
-#include <boost/assign/v2/optional/modifier.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(iterate)
-
-#define BOOST_ASSIGN_V2_TAG modifier_tag::iterate<Arg>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(iterate, BOOST_ASSIGN_V2_TAG)
-#undef BOOST_ASSIGN_V2_TAG
#endif // BOOST_ASSIGN_V2_OPTIONAL_ITERATE_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/optional/mapped.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/mapped.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional/mapped.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -11,23 +11,24 @@
#define BOOST_ASSIGN_V2_OPTIONAL_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/modifier.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
+#include <boost/assign/v2/optional/modifier.hpp>
#include <boost/call_traits.hpp>
#include <boost/shared_ptr.hpp>
namespace boost{
namespace assign{
namespace v2{
+//[syntax_optional_mapped
namespace modifier_tag{
- template<typename Arg> struct mapped;
+ template<typename/*<<Mapping>>*/ Arg> struct mapped;
}// modifier_tag
namespace aux{
template<typename Arg>
- class adapter_modifier<modifier_tag::mapped<Arg> >
+ class adapter_modifier<modifier_tag::mapped<Arg> >/*<-*/
{
typedef Arg arg_;
@@ -62,17 +63,15 @@
private:
ptr_ ptr;
- };
+ }/*->*/;
}// aux
+BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(mapped)
+BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(mapped, modifier_tag::mapped<Arg>)
+//]
}// v2
}// assign
}// boost
-#include <boost/assign/v2/optional/modifier.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(mapped)
-#define BOOST_ASSIGN_V2_TAG modifier_tag::mapped<Arg>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(mapped, BOOST_ASSIGN_V2_TAG)
-#undef BOOST_ASSIGN_V2_TAG
#endif // BOOST_ASSIGN_V2_OPTIONAL_MAPPED_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/optional/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional/modifier.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -119,17 +119,11 @@
{};
}// result_of
-}// v2
-}// assign
-}// boost
#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG
#error
#else
#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(NAME, Result)\
-namespace boost{\
-namespace assign{\
-namespace v2{\
namespace aux{\
\
template<typename Arg>\
@@ -138,18 +132,14 @@
template<typename D>\
struct apply{ typedef Result type; };\
};\
-\
-}\
-}\
-}\
}\
/**/
#endif
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_PARAM
+#ifdef BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KWD_TYPE
#error
#else
-#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_PARAM(NAME)\
+#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KWD_TYPE(NAME)\
aux::optional_modifier<aux::BOOST_PP_CAT(keyword_,NAME)>\
/**/
#endif
@@ -158,24 +148,16 @@
#error
#else
#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(NAME)\
-namespace boost{\
-namespace assign{\
-namespace v2{\
namespace aux{\
-\
struct BOOST_PP_CAT(keyword_,NAME){\
\
BOOST_PP_CAT(keyword_,NAME)(){}\
\
};\
-\
}\
namespace {\
- BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_PARAM(NAME) const BOOST_PP_CAT(_,NAME)\
- = BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_PARAM(NAME)();\
-}\
-}\
-}\
+ BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KWD_TYPE(NAME) const BOOST_PP_CAT(_,NAME)\
+ = BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KWD_TYPE(NAME)();\
}\
/**/
#endif
@@ -184,4 +166,8 @@
BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(standard_modifier)
BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(standard_modifier, Arg)
+}// v2
+}// assign
+}// boost
+
#endif // BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/optional/repeat.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/repeat.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional/repeat.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -17,21 +17,22 @@
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits/is_reference.hpp>
#endif
-//#include <boost/assign/v2/interpreter/modifier.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
+#include <boost/assign/v2/optional/modifier.hpp>
namespace boost{
namespace assign{
namespace v2{
+//[syntax_optional_repeat
namespace modifier_tag{
- template<typename Tag> struct repeat{};
+ template<typename Tag> struct repeat/*<-*/{}/*->*/;
}// modifier_tag
namespace aux{
template<typename Arg>
- class adapter_modifier<modifier_tag::repeat<Arg> >
+ class adapter_modifier<modifier_tag::repeat<Arg> >/*<-*/
{
typedef adapter_modifier<Arg> inner_type;
@@ -77,16 +78,14 @@
protected:
inner_type inner_;
size_type n_;
- };
+ }/*->*/;
}// aux
+BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(repeat)
+BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(repeat, modifier_tag::repeat<typename D::modifier_tag>)
+//]
}// v2
}// assign
}// boost
-#include <boost/assign/v2/optional/modifier.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(repeat)
-#define BOOST_ASSIGN_V2_TAG modifier_tag::repeat<typename D::modifier_tag>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(repeat, BOOST_ASSIGN_V2_TAG)
-#undef BOOST_ASSIGN_V2_TAG
#endif // BOOST_ASSIGN_V2_OPTIONAL_REPEAT_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/arg_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/arg_list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/arg_list.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -27,12 +27,13 @@
struct use_default;
namespace assign{
namespace v2{
+//[syntax_put_pipe_arg_list
namespace aux{
typedef ref::array_aux::size_type arg_list_size_type;
template<typename Pars, arg_list_size_type N, typename U>
- struct arg_list
+ struct arg_list/*<-*/
{
typedef boost::use_default tag2_;
typedef modulo_traits<Pars> modulo_traits_;
@@ -60,10 +61,10 @@
par_list_cont_type par_list_cont_;
arg_list_cont_type arg_list_cont_;
- };
+ }/*->*/;
- template<typename ParList = ::boost::mpl::vector0<> >
- class arg_list_generator
+ template<typename ParList/*<-*/ = ::boost::mpl::vector0<> /*->*/>
+ class arg_list_generator/*<-*/
{
typedef ::boost::mpl::na na_;
@@ -188,9 +189,10 @@
protected:
par_list_cont_type par_list_cont_;
- };
+ }/*->*/;
}// aux
+//]
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -40,11 +40,16 @@
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-}// aux
-
+}// aux
+//<-
+namespace{
+//->
aux::arg_list_generator<> const _csv_put/*<-*/
= aux::arg_list_generator<>()/*->*/;
+//<-
+}
+//->
//]
}// v2
}// assign
Modified: sandbox/assign_v2/boost/assign/v2/put/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/put.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -23,14 +23,14 @@
namespace aux{
template<typename C, typename F, typename Tag>
- class container_adapter
+ class put_interpreter
//<-
: protected ref::wrapper< ref::assign_tag::copy, C >
- , public aux::interpreter_crtp< C, F, Tag, container_adapter<C, F, Tag> >
+ , public aux::interpreter_crtp< C, F, Tag, put_interpreter<C, F, Tag> >
//->
{
//<-
- typedef aux::interpreter_crtp< C, F, Tag, container_adapter > super2_t;
+ typedef aux::interpreter_crtp< C, F, Tag, put_interpreter > super2_t;
//->
public:
@@ -44,12 +44,12 @@
//->
public:
- container_adapter()/*<-*/
+ put_interpreter()/*<-*/
{}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
- explicit container_adapter( C& cont )/*<-*/
+ explicit put_interpreter( C& cont )/*<-*/
: super1_t( cont )
{}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
- explicit container_adapter( C& cont, F const& f, modifier_ const& m )/*<-*/
+ explicit put_interpreter( C& cont, F const& f, modifier_ const& m )/*<-*/
: super1_t( cont ), super2_t( f, m )
{
// This constructor is required in conjunction with modulo
@@ -62,15 +62,15 @@
};
template<typename C, typename F, typename Tag>
- struct /*<<Metafunction class>>*/replace_fun< aux::container_adapter<C, F, Tag> >{/*<-*/
+ struct /*<<Metafunction class>>*/replace_fun< aux::put_interpreter<C, F, Tag> >{/*<-*/
template<typename F1>
- struct apply{ typedef aux::container_adapter<C, F1, Tag> type; };
+ struct apply{ typedef aux::put_interpreter<C, F1, Tag> type; };
/*->*/};
template<typename C, typename F, typename Tag>
- struct /*<<Metafunction class>>*/replace_modifier_tag< aux::container_adapter<C, F, Tag> >{/*<-*/
+ struct /*<<Metafunction class>>*/replace_modifier_tag< aux::put_interpreter<C, F, Tag> >{/*<-*/
template<typename Tag1>
- struct apply{ typedef aux::container_adapter<C, F, Tag1> type; };
+ struct apply{ typedef aux::put_interpreter<C, F, Tag1> type; };
/*->*/};
}// aux
@@ -80,7 +80,7 @@
struct /*<<Metafunction>>*/put{/*<-*/
typedef typename aux::deduce_data_generator<C>::type f_;
typedef typename aux::deduce_modifier_tag<C>::type modifier_tag_;
- typedef aux::container_adapter<C, f_, modifier_tag_> type;
+ typedef aux::put_interpreter<C, f_, modifier_tag_> type;
}/*->*/;
}// result_of
Modified: sandbox/assign_v2/boost/assign/v2/ref/aux_/list/as_modulo_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/aux_/list/as_modulo_list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/aux_/list/as_modulo_list.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -35,10 +35,10 @@
static P p;
#ifdef BOOST_MSVC
- BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, lhs % p )
- typedef typename nested::type type;
+ BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, lhs % p )
+ typedef typename nested::type type;
#else
- typedef BOOST_TYPEOF_TPL( lhs % p ) type;
+ typedef BOOST_TYPEOF_TPL( lhs % p ) type;
#endif
};
Modified: sandbox/assign_v2/boost/assign/v2/ref/aux_/list/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/aux_/list/container.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/aux_/list/container.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -72,8 +72,8 @@
tail()const{ return this->tail_; }
private:
- typename boost::call_traits< // (*)
- typename tail_holder_::result_of_tail_type
+ typename boost::call_traits< // (*)
+ typename tail_holder_::result_of_tail_type
>::value_type tail_;
};
Modified: sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/head.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/head.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/head.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -31,7 +31,7 @@
result_of_head_type head()const{ return (*this->head_); }
private:
- T* head_;
+ T* head_;
};
Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/chain.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/chain.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/chain.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -30,7 +30,7 @@
struct adaptor1
{
adaptor1( U& r )
- : ptr( &r )
+ : ptr( &r )
{}
U& reference()const{ return *this->ptr; }
private:
Modified: sandbox/assign_v2/boost/assign/v2/utility/csv.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/csv.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/csv.hpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -38,8 +38,8 @@
static F f;
static T t;
#ifdef BOOST_MSVC
- BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, f( t ) )
- typedef typename nested::type type;
+ BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, f( t ) )
+ typedef typename nested::type type;
#else
typedef BOOST_TYPEOF_TPL( f( t ) ) type;
#endif
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -27,11 +27,11 @@
{
// Do not put libs/assign/v2/test/unit_testing in this project
- {
- boost::format f( "boost version %1%.%2% %3% " );
- f % (BOOST_VERSION / 100000 ) % ( (BOOST_VERSION / 100) % 1000) % (BOOST_VERSION % 100 );
- std::cout << f.str() << std::endl;
- }
+ {
+ boost::format f( "boost version %1%.%2% %3% " );
+ f % (BOOST_VERSION / 100000 ) % ( (BOOST_VERSION / 100) % 1000) % (BOOST_VERSION % 100 );
+ std::cout << f.str() << std::endl;
+ }
{
std::string str = "RVALUE_REFERENCE : %1%\n";
str += "VARIADIC_TEMPLATES : %2%\n";
Modified: sandbox/assign_v2/libs/assign/v2/test/interpreter.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/interpreter.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/interpreter.cpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -15,7 +15,7 @@
void test()
{
- xxx_modifier::test();
+ xxx_modifier::test();
}
}// xxx_interpreter
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -35,7 +35,7 @@
using namespace boost;
namespace as2 = assign::v2;
{
- // (*fp) resolves error C2440 using MSVC
+ // (*fp) resolves error C2440 using MSVC
//[test_optional_data_math
std::vector<double> exponent;
typedef double(*fp)(double);
@@ -51,7 +51,7 @@
}
{
//[test_optional_data_recursive
- using namespace lambda;
+ using namespace lambda;
int i = 1, k = 1;
BOOST_AUTO(
factorials, (
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -51,7 +51,7 @@
}
{
//[test_optional_iterate_shifted
- using namespace lambda;
+ 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 );
@@ -74,7 +74,7 @@
}
{
//[test_optional_iterate_shifted_deque
- using namespace lambda;
+ using namespace lambda;
as2::result_of::deque<int>::type missing_tail = as2::deque<int>( 1 )( 10 )( -1 )( -1 );
int index = 2;
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -14,7 +14,7 @@
#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/deque.hpp>
// Options come next
-#include <boost/assign/v2/optional/data.hpp>
+#include <boost/assign/v2/optional/key.hpp>
#include <boost/assign/v2/optional/mapped.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/mpl/assert.hpp>
@@ -35,7 +35,7 @@
namespace as2 = assign::v2;
{
//[test_optional_mapped_meta
- using namespace lambda;
+ using namespace lambda;
typedef BOOST_TYPEOF(_1) arg_;
typedef as2::aux::keyword_mapped keyword_;
typedef as2::aux::optional_modifier<keyword_, arg_> modulo_;
@@ -51,11 +51,11 @@
}
{
//[test_optional_mapped_map
- using namespace lambda;
+ using namespace lambda;
typedef std::string str_; typedef std::map<str_, int> C; C year;
(
as2::put( year )( "feb", 28 )( "apr", 30 )( "jun", 30 )( "sep", 30 )( "nov", 30 )
- % ( as2::_data = _1 ) % ( as2::_mapped = ( _1 = 31 ) )
+ % as2::_key % ( as2::_mapped = ( _1 = 31 ) )
)/*<<Calls `year["jan"] = 31` etc.>>*/( "jan" )( "mar" )( "may" )( "jul" )( "aug" )( "oct" )( "dec" );
BOOST_ASSIGN_V2_CHECK( year["jan"] == 31 );
@@ -64,7 +64,7 @@
}
{
//[test_optional_mapped_meta_deque
- using namespace lambda;
+ using namespace lambda;
typedef BOOST_TYPEOF(_1) arg_;
typedef as2::aux::keyword_mapped keyword_;
typedef as2::aux::optional_modifier<keyword_, arg_> modulo_;
@@ -79,7 +79,7 @@
}
{
//[test_optional_mapped_map_deque
- using namespace lambda;
+ using namespace lambda;
BOOST_AUTO(
days_in_first_quater,
(
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -58,7 +58,7 @@
//]
}
{
- // fully qual boost::begin/end demanded by MSVC - error C2668
+ // fully qual boost::begin/end demanded by MSVC - error C2668
//[test_optional_push_front
std::deque<double> sqrt2;
( as2::put( sqrt2 ) % as2::_push_front )( 1.41421 )( 1.4142 )( 1.414 )( 1.41 );
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -32,7 +32,7 @@
{
//[test_put_pipe_optional_data_math
int k = 1; std::list<int> factorials;
- using namespace lambda;
+ using namespace lambda;
BOOST_ASSIGN_V2_CHECK(
range::equal(
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -34,7 +34,7 @@
typedef int T; boost::array<T, 4> powers; powers[0] = 1; powers[1] = 10;
int i = 2;
- using namespace lambda;
+ using namespace lambda;
BOOST_ASSIGN_V2_CHECK(
boost::range::equal(
powers | ( as2::_csv_put % ( as2::_iterate = var( i )++ ) )( 100, 1000 ),
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -30,7 +30,7 @@
namespace as2 = assign::v2;
{
//[test_put_pipe_modifier_mapped
- using namespace lambda;
+ using namespace lambda;
typedef std::map<std::string, int> C; C cal;
BOOST_AUTO( _local, ( as2::_data = _1 ) );
BOOST_ASSIGN_V2_CHECK(
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -28,7 +28,7 @@
using namespace boost;
namespace as2 = assign::v2;
{
- //[test_put_pipe_modifier_repeat
+ //[test_put_pipe_modifier_repeat
std::vector<int> cont;
BOOST_ASSIGN_V2_CHECK(
range::equal(
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -39,10 +39,10 @@
// already set at that invoked with operator% //
// ------------------------------------------------------------------- //
- // MSVC REMINDER : fully qualify boost::begin boost::end - error C2668
+ // MSVC REMINDER : fully qualify boost::begin boost::end - error C2668
{
- //[test_put_pipe_modifier_push_front
+ //[test_put_pipe_modifier_push_front
std::deque<int> powers; int front = (
powers | ( as2::_csv_put % as2::_push_front )( 16, 8, 4, 2, 1 )
).front();
@@ -52,7 +52,7 @@
//]
}
{
- //[test_put_pipe_modifier_push
+ //[test_put_pipe_modifier_push
typedef int int_; std::queue<int_> fifo; int_ front = (
fifo | ( as2::_csv_put % as2::_push )( 72, 31, 48 )
).front();
@@ -62,7 +62,7 @@
//]
}
{
- //[test_put_pipe_modifier_insert
+ //[test_put_pipe_modifier_insert
typedef std::set<double> doubles_; doubles_ sqrt2;
range_iterator<doubles_>::type lower = (
sqrt2 | ( as2::_csv_put % as2::_insert )( 1.414, 1.41421, 1.41, 1.4142 )
Modified: sandbox/assign_v2/libs/assign/v2/test/utility/chain.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/chain.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/chain.cpp 2011-03-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -66,7 +66,8 @@
{
//[test_utility_chain_write_refs
/*<< Needed to bring && into scope >>*/ using namespace assign::v2;
- std::vector<int> consecutive8( 8 ); for(int i = 0; i < 8; i++){ consecutive8[i] = 1 + i; }
+ std::vector<int> consecutive8( 8 );
+ for(int i = 0; i < 8; i++){ consecutive8[i] = 1 + i; }
array<int, 5> consecutive5; int six, seven, eight;
boost::copy(
consecutive8,
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-21 22:57:24 EDT (Mon, 21 Mar 2011)
@@ -73,7 +73,7 @@
assert( &max == &y );
//]
}
- {
+ {
//[tutorial_chain
std::vector<int> consecutive8( 8 ); for(int i = 0; i < 8; i++){ consecutive8[i] = 1 + i; }
array<int, 5> consecutive5; int six, seven, eight;
@@ -94,7 +94,7 @@
//]
}
{
- //[tutorial_arg_forwarding
+ //[tutorial_data_gen
std::map<std::string, int> map;
put( map )( "foo", 1 )( "bar", 2 )( "baz", 3 );
@@ -104,9 +104,10 @@
{
//[tutorial_optional
using namespace lambda;
- typedef int T; array<T, 4> powers = converter( csv_deque( 1, 10, -1, -1 ) );
- std::size_t index = 2; ( put( powers ) % ( _iterate = var( index )++ ) )( 100 )( 1000 );
-
+ array<int, 4> powers = converter( csv_deque( 1, 10, -1, -1 ) );
+ std::size_t index = 2; using namespace lambda;
+ ( put( powers ) % ( _iterate = var( index )++ ) )( 100 )( 1000 );
+
for(int value = 1, index = 0; index < powers.size(); index++, value *=10 )
{
assert( powers[index] == value );
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