|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r69863 - in sandbox/assign_v2: boost/assign/v2/detail boost/assign/v2/detail/config boost/assign/v2/put/deque boost/assign/v2/put/frame boost/assign/v2/put/fun boost/assign/v2/put/modifier/iterate boost/assign/v2/put/modifier/lookup boost/assign/v2/put/modifier/repeat boost/assign/v2/put/modulo/fun boost/assign/v2/put/modulo/modifier boost/assign/v2/put/pipe boost/assign/v2/ref/array boost/assign/v2/ref/array/cpp0x boost/assign/v2/ref/list boost/assign/v2/ref/list_tuple/cpp03 boost/assign/v2/utility/conversion libs/assign/v2/src libs/assign/v2/test libs/assign/v2/test/detail libs/assign/v2/test/put libs/assign/v2/test/put/modifier libs/assign/v2/test/put/pipe libs/assign/v2/test/put/pipe/modifier libs/assign/v2/test/ref libs/assign/v2/test/utility
From: erwann.rogard_at_[hidden]
Date: 2011-03-11 19:24:09
Author: e_r
Date: 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
New Revision: 69863
URL: http://svn.boost.org/trac/boost/changeset/69863
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp | 4 +-
sandbox/assign_v2/boost/assign/v2/detail/functor.hpp | 2 -
sandbox/assign_v2/boost/assign/v2/put/deque/adapter.hpp | 2
sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/put/deque/deque.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/put/frame/as_arg_list.hpp | 34 ++++++++++----------
sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp | 25 ++++++--------
sandbox/assign_v2/boost/assign/v2/put/fun/identity.hpp | 13 +++++-
sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/impl.hpp | 22 ++++++------
sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/tag.hpp | 8 ++--
sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/impl.hpp | 8 ++--
sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/tag.hpp | 2
sandbox/assign_v2/boost/assign/v2/put/modifier/repeat/impl.hpp | 26 +++++++-------
sandbox/assign_v2/boost/assign/v2/put/modifier/repeat/tag.hpp | 3 -
sandbox/assign_v2/boost/assign/v2/put/modulo/fun/keyword.hpp | 12 +++---
sandbox/assign_v2/boost/assign/v2/put/modulo/fun/make.hpp | 12 +++---
sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp | 4 +-
sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/keyword.hpp | 4 +-
sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/make.hpp | 48 ++++++++++++++--------------
sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp | 26 +++++++-------
sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/standard.hpp | 54 ++++++++++++++++----------------
sandbox/assign_v2/boost/assign/v2/put/pipe/arg_list.hpp | 8 ++--
sandbox/assign_v2/boost/assign/v2/put/pipe/args_list.hpp | 12 +++---
sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp | 10 ++--
sandbox/assign_v2/boost/assign/v2/put/pipe/modulo_traits.hpp | 2
sandbox/assign_v2/boost/assign/v2/put/pipe/put.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/ref/array/as_arg_list.hpp | 10 ++--
sandbox/assign_v2/boost/assign/v2/ref/array/cpp0x/csv_array.hpp | 10 ++--
sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp | 4 +-
sandbox/assign_v2/boost/assign/v2/ref/array/size_type.hpp | 2
sandbox/assign_v2/boost/assign/v2/ref/list/as_modulo_list.hpp | 4 +-
sandbox/assign_v2/boost/assign/v2/ref/list/list.hpp | 18 +++++-----
sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/as_args_list.hpp | 2
sandbox/assign_v2/boost/assign/v2/utility/conversion/check.hpp | 28 ++++++++--------
sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp | 22 ++++++------
sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp | 14 ++++----
sandbox/assign_v2/boost/assign/v2/utility/conversion/deduce_tag.hpp | 10 ++--
sandbox/assign_v2/boost/assign/v2/utility/conversion/helper.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/utility/conversion/predicate.hpp | 4 +-
sandbox/assign_v2/libs/assign/v2/src/main.cpp | 32 +++++++++---------
sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp | 58 +++++++++++++++++-----------------
sandbox/assign_v2/libs/assign/v2/test/mix.cpp | 67 +++++++++++++++------------------------
sandbox/assign_v2/libs/assign/v2/test/put/container.cpp | 63 +++++++++++++++++++-----------------
sandbox/assign_v2/libs/assign/v2/test/put/deduce.cpp | 4 +-
sandbox/assign_v2/libs/assign/v2/test/put/deque.cpp | 22 ++++++------
sandbox/assign_v2/libs/assign/v2/test/put/fun.cpp | 6 +-
sandbox/assign_v2/libs/assign/v2/test/put/modifier.cpp | 8 ++--
sandbox/assign_v2/libs/assign/v2/test/put/modifier/iterate.cpp | 17 ++++-----
sandbox/assign_v2/libs/assign/v2/test/put/modifier/lookup.cpp | 18 +++++-----
sandbox/assign_v2/libs/assign/v2/test/put/modifier/repeat.cpp | 6 +-
sandbox/assign_v2/libs/assign/v2/test/put/modifier/standard.cpp | 30 ++++++++--------
sandbox/assign_v2/libs/assign/v2/test/put/pipe/args_list.cpp | 6 +-
sandbox/assign_v2/libs/assign/v2/test/put/pipe/fun.cpp | 12 +++---
sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier.cpp | 8 ++--
sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/iterate.cpp | 8 ++--
sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/lookup.cpp | 11 ++---
sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/repeat.cpp | 16 ++++----
sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/standard.cpp | 14 ++++----
sandbox/assign_v2/libs/assign/v2/test/put/pipe/put.cpp | 38 +++++++++++-----------
sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/ref/convert_traits.cpp | 4 +-
sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/ref/list.cpp | 4 +-
sandbox/assign_v2/libs/assign/v2/test/ref/list_tuple.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/utility/chain.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp | 26 +++++++-------
sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp | 6 +-
67 files changed, 486 insertions(+), 499 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -15,8 +15,8 @@
/*<<
For unit-testing, do, instead,
``
- #include <boost/test/test_tools.hpp>
- #define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
+ #include <boost/test/test_tools.hpp>
+ #define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
``
<<*/
#define BOOST_ASSIGN_V2_CHECK( p ) BOOST_ASSERT( p )
Modified: sandbox/assign_v2/boost/assign/v2/detail/functor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/functor.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/functor.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -11,8 +11,6 @@
#define BOOST_ASSIGN_V2_DETAIL_FUNCTOR_ER_2010_HPP
#include <boost/assign/v2/detail/functor/crtp_unary_and_up.hpp>
#include <boost/assign/v2/detail/functor/constructor.hpp>
-#include <boost/assign/v2/detail/functor/identity.hpp>
#include <boost/assign/v2/detail/functor/new.hpp>
-#include <boost/assign/v2/detail/functor/post_increment.hpp>
#endif // BOOST_ASSIGN_V2_DETAIL_FUNCTOR_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/put/deque/adapter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/adapter.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/adapter.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -120,7 +120,7 @@
// Note : the modifiers such as push_back() are ommitted as they
// accessible through the put interface.
- impl_& container()const{ return this->impl; }
+ impl_& container()const{ return this->impl; }
protected:
mutable impl_ impl;
Modified: sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/csv_deque.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -23,10 +23,10 @@
namespace put_aux{
namespace result_of{
- template<typename T>
+ template<typename T>
struct csv_deque : result_of::deque<
typename boost::decay<
- typename boost::remove_cv<T>::type
+ typename boost::remove_cv<T>::type
>::type
>{};
@@ -34,7 +34,7 @@
}// put_aux
namespace result_of{
- template<typename T>
+ template<typename T>
struct csv_deque : put_aux::result_of::deque<T>{};
}// result_of
Modified: sandbox/assign_v2/boost/assign/v2/put/deque/deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/deque.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -43,15 +43,15 @@
typename result_of::deque<T>::type
deque( keyword_aux::nil )
{
- return typename result_of::deque<T>::type();
+ return typename result_of::deque<T>::type();
}
}// put_aux
namespace result_of{
- template<typename T>
+ template<typename T>
struct deque
- : put_aux::result_of::deque<T>
+ : put_aux::result_of::deque<T>
{};
}// result_of
Modified: sandbox/assign_v2/boost/assign/v2/put/frame/as_arg_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame/as_arg_list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame/as_arg_list.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -17,58 +17,58 @@
namespace v2{
namespace put_aux{
- template<typename R>
+ template<typename R>
class as_arg_list_adapter
{
-
+
typedef typename boost::range_iterator<R>::type ri_;
typedef boost::iterator_range<ri_> ir_;
public:
as_arg_list_adapter(R& range):ir(
- boost::make_iterator_range( range )
+ boost::make_iterator_range( range )
){}
typedef ir_ result_type;
result_type operator()()const{ return this->ir; }
- private:
+ private:
as_arg_list_adapter();
ir_ ir;
};
namespace result_of{
- template<typename R>
+ template<typename R>
struct as_arg_list{
- typedef as_arg_list_adapter<R> type;
+ typedef as_arg_list_adapter<R> type;
};
}// result_of
- template<typename R>
- typename result_of::as_arg_list<R>::type
- as_arg_list(R& range)
+ template<typename R>
+ typename result_of::as_arg_list<R>::type
+ as_arg_list(R& range)
{
- return typename result_of::as_arg_list<R>::type( range );
+ return typename result_of::as_arg_list<R>::type( range );
}
- template<typename R>
- typename result_of::as_arg_list<R const>::type
- as_arg_list(R const& range)
+ template<typename R>
+ typename result_of::as_arg_list<R const>::type
+ as_arg_list(R const& range)
{
- return typename result_of::as_arg_list<R const>::type( range );
+ return typename result_of::as_arg_list<R const>::type( range );
}
}// put_aux
- using put_aux::as_arg_list;
+ using put_aux::as_arg_list;
namespace result_of{
- template<typename R>
+ template<typename R>
struct as_arg_list
- : put_aux::result_of::as_arg_list<R>
+ : put_aux::result_of::as_arg_list<R>
{};
}// result_of
Modified: sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -63,14 +63,14 @@
};
- template<typename D>
+ template<typename D>
struct wrapper
{
wrapper(D const& d):d_( d ){}
operator D const&()const{ return this->d_; }
-
+
typedef wrapper const& result_type;
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
@@ -102,12 +102,11 @@
};
-
// D has to model concept_sub::Pre3, with respect to container C, functor F
// and Tag. It then models concept_sub::Post
template<typename C, typename F, typename Tag, typename D>
- class crtp :
- public fun_holder<F>
+ class crtp
+ : public fun_holder<F>
, public modifier_holder<Tag>
#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
, public functor_aux::crtp_unary_and_up<
@@ -118,7 +117,9 @@
{
public:
- typedef D const& result_type;
+
+ D & derived(){ return static_cast<D&>(*this); }
+ D const& derived()const{ return static_cast<D const&>(*this); }
protected:
@@ -128,15 +129,15 @@
public:
- D & derived(){ return static_cast<D&>(*this); }
- D const& derived()const{ return static_cast<D const&>(*this); }
crtp(){}
explicit crtp( F const& f ) : fun_holder_( f ){}
explicit crtp( F const& f, modifier_ const& m )
: fun_holder_( f ), modifier_holder_( m ){}
- template<typename R>
+ typedef D const& result_type;
+
+ template<typename R>
result_type
operator()( as_arg_list_adapter<R> range )const
{
@@ -146,7 +147,6 @@
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
- //[frame_crtp_functor
template<typename...Args>
result_type operator()( Args&&...args )const
{
@@ -154,7 +154,6 @@
/*<< Instance of F >>*/ this->fun( std::forward<Args>(args)... )
);
}
- //]
#else
protected:
@@ -188,7 +187,7 @@
#undef BOOST_ASSIGN_V2_MACRO
#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
- // must be mutable
+ // must be mutable
C& container()const{ return this->derived().container(); }
protected:
@@ -222,7 +221,6 @@
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
- //[frame_crtp_modify
template<typename T>
result_type modify(T&& t)const
{
@@ -233,7 +231,6 @@
);
return this->derived();
}
- //]
#else
template<typename T>
result_type modify(T& t)const
Modified: sandbox/assign_v2/boost/assign/v2/put/fun/identity.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/fun/identity.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/fun/identity.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -9,15 +9,22 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_PUT_FUN_IDENTITY_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_FUN_IDENTITY_ER_2010_HPP
-#include <boost/assign/v2/detail/functor/identity.hpp>
+#include <boost/lambda/lambda.hpp>
+#include <boost/typeof/typeof.hpp>
#include <boost/assign/v2/put/modulo/fun.hpp>
namespace boost{
namespace assign{
namespace v2{
+namespace put_aux{
+
+ typedef BOOST_TYPEOF( ( _fun = ::boost::lambda::_1 ) ) result_of_identity;
+
+}// put_aux
namespace {
- put_aux::modulo_fun<functor_aux::identity> const _identity
- = ( _fun = _functor_identity );
+
+ put_aux::result_of_identity const _identity
+ = ( _fun = ::boost::lambda::_1 );
}
}// v2
}// assign
Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/impl.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/impl.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/impl.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -30,7 +30,7 @@
class modifier< modifier_tag::iterate<Arg> >
{
- typedef keyword_aux::ignore ignore_;
+ typedef keyword_aux::ignore ignore_;
typedef Arg arg_;
// storing a copy of lambda::something has caused pbs, hence ptr
typedef boost::shared_ptr<arg_> ptr_;
@@ -39,20 +39,20 @@
modifier(): ptr( new arg_() ){}
explicit modifier(
- ignore_,
- typename boost::call_traits<arg_>::param_type arg
+ ignore_,
+ typename boost::call_traits<arg_>::param_type arg
) : ptr( new arg_( arg ) )
{}
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
- template<typename C, typename T>
- typename boost::disable_if<
- boost::is_reference<T>,
- void
- >::type
+ template<typename C, typename T>
+ typename boost::disable_if<
+ boost::is_reference<T>,
+ void
+ >::type
impl(C& cont, T&& t )const
{
- cont.at( (*this->ptr)() ) = std::move( t );
+ cont.at( (*this->ptr)() ) = std::move( t );
}
#endif
@@ -63,11 +63,11 @@
cont.at( (*this->ptr)() ) = t;
}
- // TODO verify
+ // TODO verify
template<typename C, typename T>
void impl(C& cont, T* t)const
{
- cont.replace( this->arg_() , t);
+ cont.replace( this->arg_() , t);
}
protected:
Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/tag.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/tag.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/iterate/tag.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -18,11 +18,11 @@
namespace v2{
namespace modifier_tag{
- // TODO think of lambda expression
- struct iterate_arg
+ // TODO think of lambda expression
+ struct iterate_arg
{
- typedef std::size_t result_type;
+ typedef std::size_t result_type;
iterate_arg():i( 0 ){}
iterate_arg( result_type i_ ):i( i_ ){}
@@ -36,7 +36,7 @@
};
- template<typename Arg = iterate_arg::type > struct iterate{};
+ template<typename Arg = iterate_arg::type > struct iterate{};
}// modifier_tag
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/impl.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/impl.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/impl.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -26,19 +26,19 @@
typedef Arg arg_;
// storing a copy of lambda::something has caused pbs, hence ptr
typedef boost::shared_ptr<arg_> ptr_;
- typedef keyword_aux::ignore ignore_;
-
+ typedef keyword_aux::ignore ignore_;
+
public:
modifier() : ptr( new arg_() ){}
explicit modifier(
- ignore_,
+ ignore_,
typename boost::call_traits<arg_>::param_type arg
) : ptr( new arg_( arg ) )
{}
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
- template<typename C, typename T>
+ template<typename C, typename T>
void impl(C& cont, T&& t )const
{
cont[ key ] = (*this->ptr)( cont[ std::forward<T>( key ) ] );
Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/tag.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/tag.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/lookup/tag.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -15,7 +15,7 @@
namespace v2{
namespace modifier_tag{
- template<typename Arg> struct lookup;
+ template<typename Arg> struct lookup;
}// modifier_tag
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/repeat/impl.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/repeat/impl.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/repeat/impl.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -39,31 +39,31 @@
{}
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
- template<typename C, typename T>
- typename boost::disable_if<
- boost::is_reference<T>,
- void
- >::type
+ template<typename C, typename T>
+ typename boost::disable_if<
+ boost::is_reference<T>,
+ void
+ >::type
impl(C& cont, T&& t )const
{
- size_type m = this->size();\
- while(m--) this->inner_.impl( cont, std::move( t ) /* TODO ? */ );
+ size_type m = this->size();\
+ while(m--) this->inner_.impl( cont, std::move( t ) /* TODO ? */ );
}
#endif
- template<typename C, typename T>
- void impl(C& cont, T& t )const
+ template<typename C, typename T>
+ void impl(C& cont, T& t )const
{
- size_type m = this->size();
- while(m--) this->inner_.impl( cont, t );
+ size_type m = this->size();
+ while(m--) this->inner_.impl( cont, t );
}
template<typename C, typename T>
void impl(C& cont, T* t)const
{
- size_type m = this->size();
- while(m--) this->inner_.impl( cont, t );
+ size_type m = this->size();
+ while(m--) this->inner_.impl( cont, t );
}
size_type const& size()const{ return this->n_; }
Modified: sandbox/assign_v2/boost/assign/v2/put/modifier/repeat/tag.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modifier/repeat/tag.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modifier/repeat/tag.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -9,14 +9,13 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_PUT_MODIFIER_REPEAT_TAG_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_MODIFIER_REPEAT_TAG_ER_2010_HPP
-#include <boost/assign/v2/detail/functor/post_increment.hpp>
namespace boost{
namespace assign{
namespace v2{
namespace modifier_tag{
- template<typename /*<<Arg is the modifier-tag of the implementation to override>>*/ Arg>
+ template<typename /*<<Arg is the modifier-tag of the implementation to override>>*/ Arg>
struct repeat{};
}// modifier_tag
Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/fun/keyword.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/fun/keyword.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/fun/keyword.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -20,14 +20,14 @@
\
struct BOOST_PP_CAT(keyword_,NAME){\
\
- BOOST_PP_CAT(keyword_,NAME)(){}\
+ BOOST_PP_CAT(keyword_,NAME)(){}\
\
- template<typename T>\
+ template<typename T>\
struct result{\
- typedef modulo_fun< FUN > type;\
+ typedef modulo_fun< FUN > type;\
};\
\
- template<typename T>\
+ template<typename T>\
typename result<T>::type\
operator()()const{ return ( v2::_fun = FUN() ); }\
\
@@ -35,8 +35,8 @@
\
}\
namespace {\
- put_aux::BOOST_PP_CAT(keyword_,NAME) const BOOST_PP_CAT(_,NAME)\
- = put_aux::BOOST_PP_CAT(keyword_,NAME);\
+ put_aux::BOOST_PP_CAT(keyword_,NAME) const BOOST_PP_CAT(_,NAME)\
+ = put_aux::BOOST_PP_CAT(keyword_,NAME);\
}\
}\
}\
Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/fun/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/fun/make.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/fun/make.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -22,20 +22,20 @@
template<typename F = keyword_aux::ignore>
struct modulo_fun
{
- modulo_fun(){}
+ modulo_fun(){}
modulo_fun(F f) : f_( f ){}
- F const& fun()const{ return this->f_; }
+ F const& fun()const{ return this->f_; }
- private:
+ private:
F f_;
};
- struct keyword_fun{
+ struct keyword_fun{
- template<typename F>
+ template<typename F>
modulo_fun<F> operator=(F const& f)const{
- return modulo_fun<F>( f );
+ return modulo_fun<F>( f );
}
};
Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/fun/meta.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -33,9 +33,9 @@
//[result_of_modulo_fun
namespace result_of{
- template<typename /*<<Inherits crtp\<\> >>*/ D>
+ template<typename /*<<Inherits crtp\<\> >>*/ D>
struct /*<<Meta-function class>>*/ modulo_fun
- : put_aux::result_of::modulo_fun<D>
+ : put_aux::result_of::modulo_fun<D>
{};
}// result_of
Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/keyword.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/keyword.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/keyword.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -33,8 +33,8 @@
\
}\
namespace {\
- BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_PARAM(NAME) const BOOST_PP_CAT(_,NAME)\
- = BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_PARAM(NAME)();\
+ BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_PARAM(NAME) const BOOST_PP_CAT(_,NAME)\
+ = BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_PARAM(NAME)();\
}\
}\
}\
Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/make.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/make.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -22,16 +22,16 @@
//[modulo_modifier
namespace put_aux{
- template<typename /*<<A class of modifiers>>*/ Keyword, typename /*<<A part of the modifier's implementation>>*/Arg = keyword_aux::ignore>
- struct modulo_modifier
- {
+ template<typename /*<<A class of modifiers>>*/ Keyword, typename /*<<A part of the modifier's implementation>>*/Arg = keyword_aux::ignore>
+ struct modulo_modifier
+ {
- modulo_modifier(){}
- modulo_modifier(Arg arg):arg_( arg ){}
+ modulo_modifier(){}
+ modulo_modifier(Arg arg):arg_( arg ){}
Arg const& arg()const{ return this->arg_; }
- template<typename Arg1>
+ template<typename Arg1>
modulo_modifier<Keyword, Arg1>
operator=(const Arg1& arg1)const{
return modulo_modifier<Keyword, Arg1>( arg1 );
@@ -39,37 +39,37 @@
protected:
Arg arg_;
- };
+ };
}//put_aux
//]
namespace put_aux{
- template<typename C, typename F, typename Tag, typename D,
- typename Keyword, typename Arg>
- typename ::boost::mpl::apply2<
- result_of::modulo_modifier<D>,
- Keyword, Arg
- >::type
- operator%(
+ template<typename C, typename F, typename Tag, typename D,
+ typename Keyword, typename Arg>
+ typename ::boost::mpl::apply2<
+ result_of::modulo_modifier<D>,
+ Keyword, Arg
+ >::type
+ operator%(
crtp<C, F, Tag, D> const& lhs,
modulo_modifier<Keyword, Arg> const& rhs
)
- {
- typedef put_aux::meta_modifier_tag<Keyword, Arg> meta_;
- typedef typename ::boost::mpl::apply1<meta_, D>::type modifier_tag;
- typedef put_aux::modifier<modifier_tag> modifier_;
+ {
+ typedef put_aux::meta_modifier_tag<Keyword, Arg> meta_;
+ typedef typename ::boost::mpl::apply1<meta_, D>::type modifier_tag;
+ typedef put_aux::modifier<modifier_tag> modifier_;
- typedef typename ::boost::mpl::apply2<
- result_of::modulo_modifier<D>,
- Keyword, Arg
- >::type result_;
+ typedef typename ::boost::mpl::apply2<
+ result_of::modulo_modifier<D>,
+ Keyword, Arg
+ >::type result_;
- return result_(
+ return result_(
lhs.container(),
lhs.fun,
modifier_( lhs.modifier, rhs.arg() )
);
- }
+ }
}// put_aux
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/meta.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -19,12 +19,12 @@
//[meta_modifier_tag
namespace put_aux{
- template<typename Keyword, typename Arg>
- struct /*<<Meta-function class to be specialized on Keyword>>*/ meta_modifier_tag
- {
+ template<typename Keyword, typename Arg>
+ struct /*<<Meta-function class to be specialized on Keyword>>*/ meta_modifier_tag
+ {
template<typename /*<<Inherits crtp\<\> >>*/ D>
- struct /*<<Returns a modifier-tag>>*/ apply;
- };
+ struct /*<<Returns a modifier-tag>>*/ apply;
+ };
}// put_aux
//]
@@ -38,7 +38,7 @@
template<typename Keyword, typename Arg>
struct apply : ::boost::mpl::apply1<
- meta_,
+ meta_,
typename ::boost::mpl::apply1<
put_aux::meta_modifier_tag<Keyword, Arg>,
D
@@ -52,9 +52,9 @@
//[result_of_modulo_modifier
namespace result_of{
- template<typename /*<<Inherits crtp\<\> >>*/ D>
+ template<typename /*<<Inherits crtp\<\> >>*/ D>
struct /*<<Meta-function class>>*/ modulo_modifier
- : put_aux::result_of::modulo_modifier<D>
+ : put_aux::result_of::modulo_modifier<D>
{};
}// result_of
@@ -70,12 +70,12 @@
namespace v2{\
namespace put_aux{\
\
- template<typename Arg>\
- struct meta_modifier_tag<BOOST_PP_CAT(keyword_,NAME), Arg>\
- {\
+ template<typename Arg>\
+ struct meta_modifier_tag<BOOST_PP_CAT(keyword_,NAME), Arg>\
+ {\
template<typename D>\
- struct apply{ typedef Result type; };\
- };\
+ struct apply{ typedef Result type; };\
+ };\
\
}\
}\
Modified: sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/standard.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/standard.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/modulo/modifier/standard.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -15,15 +15,15 @@
#include <boost/preprocessor/cat.hpp>
#define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_IMPL_PTR(FUN)\
- template<typename C, typename T>\
- void impl(C& cont, T* t)const{\
- cont.FUN( t );\
+ template<typename C, typename T>\
+ void impl(C& cont, T* t)const{\
+ cont.FUN( t );\
}\
/**/
#define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_IMPL_LVALUE(FUN)\
- template<typename C, typename T>\
- void impl(C& cont, T& t)const{\
- cont.FUN( t );\
+ template<typename C, typename T>\
+ void impl(C& cont, T& t)const{\
+ cont.FUN( t );\
}\
/**/
@@ -34,14 +34,14 @@
#include <boost/type_traits/is_reference.hpp>
// disable_if necessary to avoid ambiguity resolution with GCC4.4
#define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_IMPL_RVALUE(FUN)\
- template<typename C, typename T>\
- typename boost::disable_if<\
- boost::is_reference<T>,\
- void\
- >::type\
- impl(C& cont, T&& t)const{\
- cont.FUN( std::move( t ) );\
- }\
+ template<typename C, typename T>\
+ typename boost::disable_if<\
+ boost::is_reference<T>,\
+ void\
+ >::type\
+ impl(C& cont, T&& t)const{\
+ cont.FUN( std::move( t ) );\
+ }\
/**/
#define BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_IMPL(FUN)\
BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_IMPL_LVALUE(FUN)\
@@ -70,23 +70,23 @@
namespace v2{\
namespace put_aux{\
\
- template<>\
- class modifier<modifier_tag::FUN>\
- {\
- typedef keyword_aux::ignore ignore_;\
- public:\
- modifier(){}\
- modifier( ignore_, ignore_ ){}\
- BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_IMPL(FUN)\
- };\
+ template<>\
+ class modifier<modifier_tag::FUN>\
+ {\
+ typedef keyword_aux::ignore ignore_;\
+ public:\
+ modifier(){}\
+ modifier( ignore_, ignore_ ){}\
+ BOOST_ASSIGN_V2_PUT_MODULO_MODIFIER_STANDARD_IMPL(FUN)\
+ };\
\
}\
namespace{\
\
- put_aux::modulo_modifier<put_aux::keyword_modifier, modifier_tag::FUN> const\
- BOOST_PP_CAT(_,FUN) = ( \
- _modifier = modifier_tag::FUN() \
- );\
+ put_aux::modulo_modifier<put_aux::keyword_modifier, modifier_tag::FUN> const\
+ BOOST_PP_CAT(_,FUN) = ( \
+ _modifier = modifier_tag::FUN() \
+ );\
\
}\
}\
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-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -29,7 +29,7 @@
namespace v2{
namespace put_pipe_aux{
- typedef ref::array_aux::size_type arg_list_size_type;
+ typedef ref::array_aux::size_type arg_list_size_type;
template<typename Pars, arg_list_size_type N, typename U>
struct arg_list
@@ -87,7 +87,7 @@
struct modulo_result
{
typedef typename modulo_traits_:: template next_par_list<
- P
+ P
>::type par_list_;
typedef arg_list_generator<par_list_> type;
};
@@ -185,9 +185,9 @@
#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
- par_list_cont_type const& par_list_cont()const
+ par_list_cont_type const& par_list_cont()const
{
- return this->par_list_cont_;
+ return this->par_list_cont_;
}
protected:
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/args_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/args_list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/args_list.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -51,10 +51,10 @@
template<typename V>
struct next_helper
{
- typedef typename ::boost::mpl::push_back<
- ArgsList, V
+ typedef typename ::boost::mpl::push_back<
+ ArgsList, V
>::type next_args_list_;
- typedef args_list<ParList, next_args_list_, enable_pars> type;
+ typedef args_list<ParList, next_args_list_, enable_pars> type;
};
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
@@ -101,12 +101,12 @@
);
typedef typename ::boost::mpl::apply1<
- meta_, ArgsList
+ meta_, ArgsList
>::type args_list_cont_type;
args_list(){}
explicit args_list(par_list_cont_type const& a, args_list_cont_type const& b)
- : par_list_cont_( a ), args_list_cont_( b ){}
+ : par_list_cont_( a ), args_list_cont_( b ){}
// operator%
@@ -114,7 +114,7 @@
struct modulo_result
{
typedef typename modulo_traits_::template
- next_par_list<P>::type par_list_;
+ next_par_list<P>::type par_list_;
typedef args_list<par_list_, ArgsList> type;
};
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-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -22,14 +22,14 @@
template<typename C,
typename ParList, arg_list_size_type N, typename U>
C& operator|(C& cont, put_pipe_aux::arg_list<
- ParList, N, U
+ ParList, N, U
> const& arg_list
)
{
- v2::ref::as_arg_list(
+ v2::ref::as_arg_list(
v2::ref::as_modulo_list<ParList>(
- put( cont ),
+ put( cont ),
arg_list.par_list_cont()
),
arg_list.arg_list_cont()
@@ -40,8 +40,8 @@
}// put_pipe_aux
- put_pipe_aux::arg_list_generator<> const _csv_put
- = put_pipe_aux::arg_list_generator<>();
+ put_pipe_aux::arg_list_generator<> const _csv_put
+ = put_pipe_aux::arg_list_generator<>();
}// v2
}// assign
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/modulo_traits.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/modulo_traits.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/modulo_traits.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -35,7 +35,7 @@
template<typename P>
struct next_par_list : ::boost::mpl::push_back<
- ParList,
+ ParList,
P const&
>{};
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/put.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -28,12 +28,12 @@
C& operator|(
C& cont,
put_pipe_aux::args_list<
- ParList, ArgsList, enable_pars
+ ParList, ArgsList, enable_pars
> const& args_list_
){
- ref::as_args_list(
+ ref::as_args_list(
ref::as_modulo_list<ParList>(
- put( cont ), args_list_.par_list_cont()
+ put( cont ), args_list_.par_list_cont()
),
args_list_.args_list_cont()
);
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/as_arg_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/as_arg_list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/as_arg_list.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -19,7 +19,7 @@
namespace ref{
namespace array_aux{
- // --- Implementation --- //
+ // --- Implementation --- //
template<size_type I, typename F, typename Impl, typename D>
typename boost::enable_if_c<
@@ -27,7 +27,7 @@
>::type
as_arg_list(
F const& f ,
- interface<Impl, D> const& array
+ interface<Impl, D> const& array
)
{}
@@ -37,19 +37,19 @@
>::type
as_arg_list(
F const& f ,
- interface<Impl, D> const& array
+ interface<Impl, D> const& array
)
{
f( array[ I ].get() );
as_arg_list<I + 1>( f, array );
}
- // --- User interface --- //
+ // --- User interface --- //
template<typename F, typename Impl, typename D>
void as_arg_list(
F const& f ,
- interface<Impl, D> const& array
+ interface<Impl, D> const& array
){
as_arg_list<0>( f, array );
}
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/cpp0x/csv_array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/cpp0x/csv_array.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/cpp0x/csv_array.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -26,7 +26,7 @@
template<typename U, typename... Args>
struct csv_array : nth_result_of::csv_array<
- 1 + sizeof...(Args), U
+ 1 + sizeof...(Args), U
>
{};
@@ -46,7 +46,7 @@
template<typename U, typename... Args>
struct csv_helper
{
- typedef typename result_of::csv_array<U, Args...>::type type;
+ typedef typename result_of::csv_array<U, Args...>::type type;
static type call( U& u, Args&...args )
{
@@ -64,14 +64,14 @@
>::type
csv_array( T& t, Args&...args )
{
- return csv_helper<T, Args...>::call( t, args... );
+ return csv_helper<T, Args...>::call( t, args... );
}
template<typename T, typename...Args>
typename result_of::csv_array<T const, Args const...>
csv_array( T const& t, Args const&...args )
{
- return csv_helper<T const, Args const ...>::call( t, args... );
+ return csv_helper<T const, Args const ...>::call( t, args... );
}
}// array_aux
@@ -83,7 +83,7 @@
template<typename /*<<U& has to be a reference>>*/U, typename... Args>
struct csv_array : nth_result_of::csv_array<
- 1 + sizeof...(Args), U
+ 1 + sizeof...(Args), U
>
{};
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -32,7 +32,7 @@
typename nth_result_of::csv_array<0, U>::type
csv_array( keyword_aux::nil )
{
- typedef typename nth_result_of::csv_array<0, U>::type result_;
+ typedef typename nth_result_of::csv_array<0, U>::type result_;
return result_();
}
@@ -44,7 +44,7 @@
template<array_size_type N, typename /*<<U& has to be a reference>>*/U>
struct /*<<Meta-function>>*/csv_array
//<-
- : array_aux::nth_result_of::csv_array<N, U>
+ : array_aux::nth_result_of::csv_array<N, U>
//->
{};
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/size_type.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/size_type.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/size_type.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -21,7 +21,7 @@
}// array_aux
- typedef array_aux::size_type array_size_type;
+ typedef array_aux::size_type array_size_type;
}// ref
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/ref/list/as_modulo_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/as_modulo_list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/as_modulo_list.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -65,14 +65,14 @@
namespace result_of{
- // ParList could, in principle, be specified in terms (Tag, H, T), but we
+ // ParList could, in principle, be specified in terms (Tag, H, T), but we
// chose not to (that would be less practical in client code).
template<typename Lhs, typename ParList>
struct as_modulo_list : as_modulo_list_impl<0, Lhs, ParList>{};
}// result_of
- // Warning Parlist is first argument, here, whereas second in result_of::
+ // Warning Parlist is first argument, here, whereas second in result_of::
template<typename ParList, typename Lhs, typename Tag, typename H, typename T>
typename result_of::as_modulo_list<Lhs, ParList>::type
as_modulo_list( Lhs const& lhs, container<Tag, H, T> const& rhs_list )
Modified: sandbox/assign_v2/boost/assign/v2/ref/list/list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list/list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list/list.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -48,17 +48,17 @@
}// result_of
- template<typename Tag>
- typename ::boost::mpl::apply1<
- nth_result_of::list<Tag>,
+ template<typename Tag>
+ typename ::boost::mpl::apply1<
+ nth_result_of::list<Tag>,
::boost::mpl::vector0<>
>::type
list( keyword_aux::nil )
{
- return typename ::boost::mpl::apply1<
- nth_result_of::list<Tag>,
- ::boost::mpl::vector0<>
- >::type();
+ return typename ::boost::mpl::apply1<
+ nth_result_of::list<Tag>,
+ ::boost::mpl::vector0<>
+ >::type();
}
}// list_aux
@@ -71,8 +71,8 @@
template<typename Tag>
struct list
- : list_aux::nth_result_of::list<Tag>
- {};
+ : list_aux::nth_result_of::list<Tag>
+ {};
}// nth_result_of
}// ref
Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/as_args_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/as_args_list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/as_args_list.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -24,7 +24,7 @@
#define BOOST_ASSIGN_V2_params(T) BOOST_PP_ENUM_PARAMS(BOOST_ASSIGN_V2_LIMIT_ARITY,T)
- // --- Implementation --- //
+ // --- Implementation --- //
template<
typename F,
Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/check.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/check.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -54,46 +54,46 @@
typedef std::stack<int> stack_;
typedef std::vector<int> vec_;
- BOOST_MPL_ASSERT(( as2::convert_aux::use_put<ar_, R> ));
- BOOST_MPL_ASSERT(( as2::convert_aux::use_put<stack_, R> ));
- BOOST_MPL_ASSERT(( as2::convert_aux::use_put<queue_, R> ));
- BOOST_MPL_ASSERT_NOT(( as2::convert_aux::use_put<deque_, R> ));
- BOOST_MPL_ASSERT_NOT(( as2::convert_aux::use_put<list_, R> ));
- BOOST_MPL_ASSERT_NOT(( as2::convert_aux::use_put<set_, R> ));
- BOOST_MPL_ASSERT_NOT(( as2::convert_aux::use_put<vec_, R> ));
+ BOOST_MPL_ASSERT(( as2::conversion_aux::use_put<ar_, R> ));
+ BOOST_MPL_ASSERT(( as2::conversion_aux::use_put<stack_, R> ));
+ BOOST_MPL_ASSERT(( as2::conversion_aux::use_put<queue_, R> ));
+ BOOST_MPL_ASSERT_NOT(( as2::conversion_aux::use_put<deque_, R> ));
+ BOOST_MPL_ASSERT_NOT(( as2::conversion_aux::use_put<list_, R> ));
+ BOOST_MPL_ASSERT_NOT(( as2::conversion_aux::use_put<set_, R> ));
+ BOOST_MPL_ASSERT_NOT(( as2::conversion_aux::use_put<vec_, R> ));
BOOST_MPL_ASSERT(( boost::is_same<
- typename as2::convert_aux::deduce_tag<ar_, R>::type,
+ typename as2::conversion_aux::deduce_tag<ar_, R>::type,
convert_tag::put
>
));
BOOST_MPL_ASSERT(( boost::is_same<
- typename as2::convert_aux::deduce_tag<stack_, R>::type,
+ typename as2::conversion_aux::deduce_tag<stack_, R>::type,
convert_tag::put
>
));
BOOST_MPL_ASSERT(( boost::is_same<
- typename as2::convert_aux::deduce_tag<queue_, R>::type,
+ typename as2::conversion_aux::deduce_tag<queue_, R>::type,
convert_tag::put
>
));
BOOST_MPL_ASSERT(( boost::is_same<
- typename as2::convert_aux::deduce_tag<deque_, R>::type,
+ typename as2::conversion_aux::deduce_tag<deque_, R>::type,
convert_tag::copy
>
));
BOOST_MPL_ASSERT(( boost::is_same<
- typename as2::convert_aux::deduce_tag<list_, R>::type,
+ typename as2::conversion_aux::deduce_tag<list_, R>::type,
convert_tag::copy
>
));
BOOST_MPL_ASSERT(( boost::is_same<
- typename as2::convert_aux::deduce_tag<set_, R>::type,
+ typename as2::conversion_aux::deduce_tag<set_, R>::type,
convert_tag::copy
>
));
BOOST_MPL_ASSERT(( boost::is_same<
- typename as2::convert_aux::deduce_tag<vec_, R>::type,
+ typename as2::conversion_aux::deduce_tag<vec_, R>::type,
convert_tag::copy
>
));
Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -16,7 +16,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace convert_aux{
+namespace conversion_aux{
template<typename C, typename R>
C convert(R const& r, convert_tag::put)
@@ -34,32 +34,32 @@
template<typename C, typename R>
C convert(R const& r)
{
- typedef typename convert_aux::deduce_tag<C, R>::type tag_;
- return convert_aux::convert<C>( r, tag_() );
+ typedef typename conversion_aux::deduce_tag<C, R>::type tag_;
+ return conversion_aux::convert<C>( r, tag_() );
}
- template<typename C>
- struct convert_adapter{};
+ template<typename C>
+ struct convert_adapter{};
template<typename R, typename C>
C operator|( R const& r, convert_adapter<C> )
{
- return convert<C>( r );
+ return convert<C>( r );
}
-}// convert_aux
-using convert_aux::convert;
+}// conversion_aux
+using conversion_aux::convert;
namespace result_of{
- template<typename /*<<Container>>*/ C, typename /*<<Range>>*/R>
+ template<typename /*<<Container>>*/ C, typename /*<<Range>>*/R>
struct convert{ typedef C type; };
}//result_of
template<typename C>
-convert_aux::convert_adapter<C> _convert()
+conversion_aux::convert_adapter<C> _convert()
{
- return convert_aux::convert_adapter<C>();
+ return conversion_aux::convert_adapter<C>();
}
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/converter.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -18,7 +18,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace convert_aux{
+namespace conversion_aux{
template<typename R>
class converter
@@ -43,7 +43,7 @@
template<typename C>
C type()const
{
- return convert_aux::convert<C>( this->w.get() );
+ return conversion_aux::convert<C>( this->w.get() );
}
private:
@@ -56,20 +56,20 @@
template<typename R>
converter<R> operator|( R const& r, converter_adapter )
{
- return converter<R>( r );
+ return converter<R>( r );
}
-}// convert_aux
+}// conversion_aux
namespace{
- convert_aux::converter_adapter const _converter
- = convert_aux::converter_adapter();
+ conversion_aux::converter_adapter const _converter
+ = conversion_aux::converter_adapter();
}
namespace result_of{
template<typename R>
struct converter
{
- typedef convert_aux::converter<R> type;
+ typedef conversion_aux::converter<R> type;
};
}//result_of
Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/deduce_tag.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/deduce_tag.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/deduce_tag.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -31,17 +31,17 @@
template<>
struct case_<switch_tag::deduce_convert, 0> :
- convert_aux::helper<
+ conversion_aux::helper<
v2::convert_tag::put,
- v2::convert_aux::use_put
+ v2::conversion_aux::use_put
>{};
template<>
struct case_<switch_tag::deduce_convert, 1> :
- convert_aux::helper<v2::convert_tag::copy>{};
+ conversion_aux::helper<v2::convert_tag::copy>{};
}// switch_aux
-namespace convert_aux{
+namespace conversion_aux{
template<typename C, typename R>
struct deduce_tag : v2::switch_aux::result<
@@ -50,7 +50,7 @@
>
{};
-}// convert_aux
+}// conversion_aux
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/helper.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/helper.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/helper.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -14,7 +14,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace convert_aux{
+namespace conversion_aux{
// This is in replacement of switch_aux::helper since here we need
// two arguments.
@@ -23,7 +23,7 @@
struct default_f : ::boost::mpl::true_{};
template<typename Tag,
- template<typename, typename> class F = convert_aux::default_f>
+ template<typename, typename> class F = conversion_aux::default_f>
struct helper
{
typedef Tag tag;
@@ -34,7 +34,7 @@
};
};
-}// convert_aux
+}// conversion_aux
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/predicate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/predicate.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/predicate.hpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -16,7 +16,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace convert_aux{
+namespace conversion_aux{
template<typename C, typename R>
struct use_put : ::boost::mpl::or_<
@@ -24,7 +24,7 @@
v2::container_traits::has_push<C>
>{};
-}// convert_aux
+}// conversion_aux
}// v2
}// assign
}// boost
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-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -21,29 +21,29 @@
{
// Do not put libs/assign/v2/test/unit_testing in this project
- {
+ {
std::string cpp0x = "RVALUE_REFERENCES : ";
- #ifdef BOOST_NO_RVALUE_REFERENCES
- cpp0x += "NO";
- #else
- cpp0x += "YES";
- #endif
+ #ifdef BOOST_NO_RVALUE_REFERENCES
+ cpp0x += "NO";
+ #else
+ cpp0x += "YES";
+ #endif
cpp0x += ", VARIADIC_TEMPLATES : ";
- #ifdef BOOST_NO_VARIADIC_TEMPLATES
- cpp0x += "NO";
+ #ifdef BOOST_NO_VARIADIC_TEMPLATES
+ cpp0x += "NO";
#else
- cpp0x += "YES";
- #endif
+ cpp0x += "YES";
+ #endif
cpp0x += ", 0X_HDR_TUPLE : ";
- #ifdef BOOST_NO_0X_HDR_TUPLE
- cpp0x += "NO";
+ #ifdef BOOST_NO_0X_HDR_TUPLE
+ cpp0x += "NO";
#else
- cpp0x += "YES";
- #endif
+ cpp0x += "YES";
+ #endif
cpp0x += ", ENABLE_CPP0X : " + std::string(BOOST_ASSIGN_V2_ENABLE_CPP0X ? "YES" : "NO");
- std::cout << cpp0x << std::endl;
- }
+ std::cout << cpp0x << std::endl;
+ }
{
using namespace test_assign_v2;
xxx_put::test();
Modified: sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -28,58 +28,58 @@
#endif
#endif
- // Primarily tests whether a functor is overloaded on any combination of
+ // Primarily tests whether a functor is overloaded on any combination of
// non-const/cont within BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY
// (relevant only for CPP03) and on all-non-const and all-const above
// this limit.
- {
- typedef int e_; e_ x = -1, y = 1;
+ {
+ typedef int e_; e_ x = -1, y = 1;
typedef boost::tuple<e_&, e_&> tuple_;
- BOOST_ASSIGN_V2_CHECK( &get<0>( as2::constructor<tuple_>()( x, y ) ) == &x );
- BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( x, y ) ) == &y );
+ BOOST_ASSIGN_V2_CHECK( &get<0>( as2::constructor<tuple_>()( x, y ) ) == &x );
+ BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( x, y ) ) == &y );
}
- {
- typedef int e_; e_ x = -1;
+ {
+ typedef int e_; e_ x = -1;
{
- typedef boost::tuple<e_&, e_ const&> tuple_;
+ typedef boost::tuple<e_&, e_ const&> tuple_;
- BOOST_ASSIGN_V2_CHECK( &get<0>( as2::constructor<tuple_>()( x, 1 ) ) == &x );
- BOOST_ASSIGN_V2_CHECK( get<1>( as2::constructor<tuple_>()( x, 1 ) ) == 1 );
- }
+ BOOST_ASSIGN_V2_CHECK( &get<0>( as2::constructor<tuple_>()( x, 1 ) ) == &x );
+ BOOST_ASSIGN_V2_CHECK( get<1>( as2::constructor<tuple_>()( x, 1 ) ) == 1 );
+ }
{
- typedef boost::tuple< e_ const&, e_&> tuple_;
+ typedef boost::tuple< e_ const&, e_&> tuple_;
- BOOST_ASSIGN_V2_CHECK( get<0>( as2::constructor<tuple_>()( 1, x ) ) == 1 );
- BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( 1, x ) ) == &x );
- }
+ BOOST_ASSIGN_V2_CHECK( get<0>( as2::constructor<tuple_>()( 1, x ) ) == 1 );
+ BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( 1, x ) ) == &x );
+ }
}
- {
- typedef int e_; e_ x = -1, y = 0, z = 1;
+ {
+ typedef int e_; e_ x = -1, y = 0, z = 1;
typedef boost::tuple<e_&, e_&, e_&> tuple_;
- BOOST_ASSIGN_V2_CHECK( &get<0>( as2::constructor<tuple_>()( x, y, z ) ) == &x );
- BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( x, y, z ) ) == &y );
+ BOOST_ASSIGN_V2_CHECK( &get<0>( as2::constructor<tuple_>()( x, y, z ) ) == &x );
+ BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( x, y, z ) ) == &y );
}
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
- {
- typedef int e_; int y = 0;
+ {
+ typedef int e_; int y = 0;
typedef boost::tuple<e_ const&, e_ &, e_ const&> tuple_;
- BOOST_ASSIGN_V2_CHECK( get<0>( as2::constructor<tuple_>()( -1, y, 1 ) ) == -1 );
- BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( -1, y, 1 ) ) == &y );
- BOOST_ASSIGN_V2_CHECK( get<2>( as2::constructor<tuple_>()( -1, y, 1 ) ) == 1 );
+ BOOST_ASSIGN_V2_CHECK( get<0>( as2::constructor<tuple_>()( -1, y, 1 ) ) == -1 );
+ BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( -1, y, 1 ) ) == &y );
+ BOOST_ASSIGN_V2_CHECK( get<2>( as2::constructor<tuple_>()( -1, y, 1 ) ) == 1 );
}
#endif
- {
- typedef int e_;
+ {
+ typedef int e_;
typedef boost::tuple<e_ const&, e_ const&, e_ const&> tuple_;
- BOOST_ASSIGN_V2_CHECK( get<0>( as2::constructor<tuple_>()( -1, 0, 1 ) ) == -1 );
- BOOST_ASSIGN_V2_CHECK( get<1>( as2::constructor<tuple_>()( -1, 0, 1 ) ) == 0 );
- BOOST_ASSIGN_V2_CHECK( get<2>( as2::constructor<tuple_>()( -1, 0, 1 ) ) == 1 );
+ BOOST_ASSIGN_V2_CHECK( get<0>( as2::constructor<tuple_>()( -1, 0, 1 ) ) == -1 );
+ BOOST_ASSIGN_V2_CHECK( get<1>( as2::constructor<tuple_>()( -1, 0, 1 ) ) == 0 );
+ BOOST_ASSIGN_V2_CHECK( get<2>( as2::constructor<tuple_>()( -1, 0, 1 ) ) == 1 );
}
}
Modified: sandbox/assign_v2/libs/assign/v2/test/mix.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/mix.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/mix.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -38,7 +38,7 @@
void test(){
- using namespace boost;
+ using namespace boost;
using namespace lambda;
namespace as2 = assign::v2;
@@ -58,43 +58,43 @@
));
//]
}
- {
- //[mix_bitset_revisited
- typedef std::string str_; typedef std::bitset<3> data_;
+ {
+ //[mix_bitset_revisited
+ typedef std::string str_; typedef std::bitset<3> data_;
std::vector<data_> consecutive; as2::put( consecutive )( as2::as_arg_list( as2::csv_deque</*Explicit template argument `std::string` is required, because the deduced argument would be `const char*`, and only the former is a valid argument to `data_`'s constructor*/std::string>( "000", "001", "010", "011", "100", "101", "110", "111" ) ) );
-
+
for(int i = 0; i < consecutive.size(); i++)
{
- BOOST_ASSIGN_V2_CHECK( consecutive[i].to_ulong() == i );
+ BOOST_ASSIGN_V2_CHECK( consecutive[i].to_ulong() == i );
}
//]
}
{
//[mix_maxtrix3x3
const int sz = 3;
- typedef array<int, sz> row_;
- array<row_, sz> matrix3x3 = converter(
- as2::ref::array
- ( as2::ref::csv_array( 1, 2, 3 ) | as2::_convert<row_>() )
- ( as2::ref::csv_array( 4, 5, 6 ) | as2::_convert<row_>() )
- ( as2::ref::csv_array( 7, 8, 9 ) | as2::_convert<row_>() )
+ typedef array<int, sz> row_;
+ array<row_, sz> matrix3x3 = converter(
+ as2::ref::array
+ ( as2::ref::csv_array( 1, 2, 3 ) | as2::_convert<row_>() )
+ ( as2::ref::csv_array( 4, 5, 6 ) | as2::_convert<row_>() )
+ ( as2::ref::csv_array( 7, 8, 9 ) | as2::_convert<row_>() )
);
for(int i = 0; i < 9; i++)
{
- BOOST_ASSIGN_V2_CHECK( matrix3x3[ i / 3 ][ i % 3 ] == i + 1 );
+ BOOST_ASSIGN_V2_CHECK( matrix3x3[ i / 3 ][ i % 3 ] == i + 1 );
}
- //]
+ //]
}
- {
- //[mix_ragged
+ {
+ //[mix_ragged
typedef double data_; typedef std::list<data_> variable_size_; typedef std::vector<variable_size_> ragged_;
- ragged_ ragged = converter(
- as2::deque<variable_size_>
- ( as2::ref::csv_array( 0.71, 0.63, 0.85 ) | as2::_convert<variable_size_>() )
- ( as2::ref::csv_array( 0.61, 0.69, 0.92, 0.55 ) | as2::_convert<variable_size_>() )
- ( 1, -99.99 )
- ( )
+ ragged_ ragged = converter(
+ as2::deque<variable_size_>
+ ( as2::ref::csv_array( 0.71, 0.63, 0.85 ) | as2::_convert<variable_size_>() )
+ ( as2::ref::csv_array( 0.61, 0.69, 0.92, 0.55 ) | as2::_convert<variable_size_>() )
+ ( 1, -99.99 )
+ ( )
);
BOOST_ASSIGN_V2_CHECK( ragged[0].size() == 3 );
@@ -102,18 +102,18 @@
BOOST_ASSIGN_V2_CHECK( ragged[2].size() == 1 );
BOOST_ASSIGN_V2_CHECK( ragged[3].size() == 0 );
//]
- data_ eps = numeric::bounds<data_>::smallest();
+ data_ eps = numeric::bounds<data_>::smallest();
BOOST_ASSIGN_V2_CHECK( fabs( ragged.front().front() - 0.71 ) < eps );
BOOST_ASSIGN_V2_CHECK( fabs( ragged.front().back() - 0.85 ) < eps );
BOOST_ASSIGN_V2_CHECK( fabs( ragged[2].front() + 99.99 ) < eps );
BOOST_ASSIGN_V2_CHECK( fabs( ragged[2].back() + 99.99 ) < eps );
}
- {
+ {
//[mix_fun_iterate
typedef int T; array<T, 5> powers; powers[0] = 1; powers[1] = 10;
int i = 2, k = powers[ i - 1 ];
- /*<<Calls `powers[i] = ( k *= 10 )` for [^ i = 2, 3, 4 ] >>*/
+ /*<<Calls `powers[i] = ( k *= 10 )` for [^ i = 2, 3, 4 ] >>*/
( as2::put( powers ) % ( as2::_fun = var( k ) *= 10 ) % ( as2::_iterate = var( i )++ ) )()()();
BOOST_ASSIGN_V2_CHECK( powers[0] == 1 );
@@ -122,22 +122,7 @@
BOOST_ASSIGN_V2_CHECK( powers[3] == 1000 );
BOOST_ASSIGN_V2_CHECK( powers[4] == 10000 );
//]
- }
- {
- //[deque_chain_put
- typedef const char state_ [3]; state_ ct = "CT", nj = "NJ", ny = "NY", ca = "CA", /* ore = "OR",*/ wa = "WA";
- typedef int code_; typedef tuple<state_/*<<Notice the reference>>*/&, code_> area_code_;
- /*<<Brings && for chaining into scope>>*/using namespace assign::v2;
- std::deque<area_code_> pacific;
-
- //copy(
- as2::deque<area_code_>( nj, 201 )( ct, 203 )( ny, 212 )( ny, 315 )( ny, 347 )( nj, 551 )
- && ( pacific | as2::_put( wa, 206 )( ca, 209 )( ca, 213 )( wa, 253 ) );//,
- //std::cout << get<1>( _1 ) << std::endl;
- //);
- //]
-
- }
+ }
}
}// xxx_mix
Modified: sandbox/assign_v2/libs/assign/v2/test/put/container.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/container.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/container.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -19,7 +19,6 @@
#include <string>
#include <utility>
#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/detail/functor/identity.hpp>
#include <boost/assign/v2/put/container/put.hpp>
#include <boost/assign/v2/put/deque/csv_deque.hpp>
#include <boost/tuple/tuple.hpp>
@@ -38,44 +37,48 @@
void test(){
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
- {
- //[put_bitset
- typedef std::string str_; typedef std::bitset<3> data_;
+ {
+ //[put_bitset
+ typedef std::string str_; typedef std::bitset<3> data_;
/*<<Keep in mind that although `data_( str_( "011" ) )`, for instance, is valid, `consecutive.push_back( str_( "011" ) )` isn't (GCC4.2)>>*/ std::vector<data_> consecutive; /*<<Calls `consecutive.push_back( data_( t ) );` for [^t = str_( "000" ), ..., str_( "111" )]`>>*/as2::put( consecutive )( str_( "000" ) )( str_( "001" ) )( str_( "010" ) )( str_( "011" ) )( str_( "100" ) )( str_( "101" ) )( str_( "110" ) )( str_( "111" ) );
-
+
for(int i = 0; i < consecutive.size(); i++)
{
- BOOST_ASSIGN_V2_CHECK( consecutive[i].to_ulong() == i );
+ assert( consecutive[i].to_ulong() == i );
}
//]
+ for(int i = 0; i < consecutive.size(); i++)
+ {
+ BOOST_ASSIGN_V2_CHECK( consecutive[i].to_ulong() == i );
+ }
}
{
- //[put_as_arg_list
+ //[put_as_arg_list
std::vector<int> numeric( 10 ); iota( numeric, 0 ); typedef std::string str_;
- typedef variant< int, str_ > data_; array<data_, 10 + 4> numeric_kb;
- as2::put( numeric_kb )/*<<The next 6 calls have the following side effect `numeric_kb[i] = t` for [^( i, t ) = ( 0, "+" ), ( 1, "-" ), ( 2, "*" ), ( 3, "/" ), ( 4, "=" ), ( 5, "." )]>>*/( "+" )( "-" )( "*" )( "/" )( "=" )( "." )/*<<Equivalent to calling `( *( i + begin( numeric ) ) )` for [^i = 0, ..., size( numeric ) - 1]>>*/( as2::as_arg_list( numeric ) );
-
- using namespace boost;
- BOOST_ASSIGN_V2_CHECK( get<str_>( numeric_kb[ 0 ] ) == "+" );
- BOOST_ASSIGN_V2_CHECK( get<str_>( numeric_kb[ 5 ] ) == "." );
- for(int i = 0; i< numeric.size(); i++){
- BOOST_ASSIGN_V2_CHECK( get<int>( numeric_kb[ i + 4 ] ) == i );
- }
+ typedef variant< int, str_ > data_; array<data_, 16> numeric_kb;
+ as2::put( numeric_kb )/*<<[^{`numeric_kb[ i ] = data_( t )` : ( i, t ) = ( 0, "+" ), ..., ( 5, "." )}]>>*/( "+" )( "-" )( "*" )( "/" )( "=" )( "." )/*<<[^{`numeric_kb[ 6 + i ] = data_( *( b + i ) )` : i = 0, ..., 9; b = `boost::begin( numeric )` }]>>*/( as2::as_arg_list( numeric ) );
+
+ assert( get<str_>( numeric_kb.front() ) == "+" );
+ assert( get<int>( numeric_kb.back() ) == 9 );
//]
+ BOOST_ASSIGN_V2_CHECK( get<str_>( numeric_kb.front() ) == "+" );
+ BOOST_ASSIGN_V2_CHECK( get<str_>( numeric_kb[ 5 ] ) == "." );
+ BOOST_ASSIGN_V2_CHECK( get<int>( numeric_kb[ 6 ] ) == 0 );
+ BOOST_ASSIGN_V2_CHECK( get<int>( numeric_kb.back() ) == 9 );
}
- {
- //[put_variable_size
+ {
+ //[put_variable_size
typedef double data_; typedef std::vector<data_> variable_size_;
- variable_size_ a( 3 ); a[0] = 0.71; a[1] = 0.63; a[2] = 0.85;
- variable_size_ b( 4 ); b[0] = 0.61; b[1] = 0.69; b[2] = 0.92; b[3] = 0.55;
- array<variable_size_, 4> ragged;
+ variable_size_ a( 3 ); a[0] = 0.71; a[1] = 0.63; a[2] = 0.85;
+ variable_size_ b( 4 ); b[0] = 0.61; b[1] = 0.69; b[2] = 0.92; b[3] = 0.55;
+ array<variable_size_, 4> ragged;
as2::put( ragged )
- /*<<Calls `ragged.push_back( variable_size_( begin( a ), end( a ) ) )`>>*/( begin( a ), end( a ) )
- /*<<Calls `ragged.push_back( variable_size_( b ) )`>>*/( b )
- /*<<Calls `ragged.push_back( variable_size_( 1, -99.99 ) )`>>*/( 1, -99.99 )
+ /*<<Calls `ragged.push_back( variable_size_( begin( a ), end( a ) ) )`>>*/( begin( a ), end( a ) )
+ /*<<Calls `ragged.push_back( variable_size_( b ) )`>>*/( b )
+ /*<<Calls `ragged.push_back( variable_size_( 1, -99.99 ) )`>>*/( 1, -99.99 )
/*<<Calls `ragged.push_back( variable_size_( ) )`>>*/( );
BOOST_ASSIGN_V2_CHECK( ragged[0].size() == a.size() );
@@ -83,32 +86,32 @@
BOOST_ASSIGN_V2_CHECK( ragged[2].size() == 1 );
BOOST_ASSIGN_V2_CHECK( ragged[3].size() == 0 );
//]
- data_ eps = numeric::bounds<data_>::smallest();
+ data_ eps = numeric::bounds<data_>::smallest();
BOOST_ASSIGN_V2_CHECK( fabs( ragged[0].front() - a.front() ) < eps );
BOOST_ASSIGN_V2_CHECK( fabs( ragged[0].back() - a.back() ) < eps );
BOOST_ASSIGN_V2_CHECK( fabs( ragged[1].front() - b.front() ) < eps );
BOOST_ASSIGN_V2_CHECK( fabs( ragged[1].back() - b.back() ) < eps );
BOOST_ASSIGN_V2_CHECK( fabs( ragged[2].front() + 99.99 ) < eps );
BOOST_ASSIGN_V2_CHECK( fabs( ragged[2].back() + 99.99 ) < eps );
- }
+ }
{
//[put_deduce
std::queue<int> adapter; /*<<Calls `fifo.push( t )` for [^t = 72, 31, 48]>>*/as2::put( adapter )( 72 )( 31 )( 48 );
array<int, 3> array; /*<<Calls `array[i] = t` for [^( i, t ) = ( 0, 72 ), ( 1, 31 ), ( 2, 48 )]>>*/as2::put( array )( 72 )( 31 )( 48 );
std::set<int> assoc; /*<<Calls `assoc.insert( t )` for [^t = 72, 31, 48]>>*/as2::put( assoc )( 72 )( 31 )( 48 );
std::list<int> seq; /*<<Calls `seq.push_back( t )` for [^t = 72, 31, 48]>>*/as2::put( seq )( 72 )( 31 )( 48 );
- //]
+ //]
BOOST_ASSIGN_V2_CHECK( adapter.front() == 72 );
BOOST_ASSIGN_V2_CHECK( adapter.back() == 48 );
BOOST_ASSIGN_V2_CHECK( array.front() == 72 );
BOOST_ASSIGN_V2_CHECK( array.back() == 48 );
BOOST_ASSIGN_V2_CHECK( assoc.count( 48 ) == 1 );
- BOOST_ASSIGN_V2_CHECK( assoc.count( 72 ) == 71 );
+ BOOST_ASSIGN_V2_CHECK( assoc.count( 72 ) == 1 );
BOOST_ASSIGN_V2_CHECK( seq.front() == 72 );
BOOST_ASSIGN_V2_CHECK( seq.back() == 48 );
}
{
- // http://bioinfo.mbb.yale.edu/~mbg/dom/fun3/area-codes/
+ // http://bioinfo.mbb.yale.edu/~mbg/dom/fun3/area-codes/
//[put_seq_tuple_ref
typedef const char us_state_ [3]; us_state_ ct = "CT", nj = "NJ", ny = "NY";
typedef int area_code_; typedef tuple<us_state_/*<<Notice the reference>>*/&, area_code_> data_;
Modified: sandbox/assign_v2/libs/assign/v2/test/put/deduce.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/deduce.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/deduce.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -30,13 +30,13 @@
namespace xxx_put{
namespace xxx_deduce{
- // --User may skip this file-- //
+ // --User may skip this file-- //
// It checks internal details. //
// --------------------------- //
void test()
{
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
{
Modified: sandbox/assign_v2/libs/assign/v2/test/put/deque.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/deque.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/deque.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -22,10 +22,10 @@
void test()
{
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
{
- // http://bioinfo.mbb.yale.edu/~mbg/dom/fun3/area-codes/
+ // http://bioinfo.mbb.yale.edu/~mbg/dom/fun3/area-codes/
//[deque_tuple_ref
typedef const char us_state_ [3]; us_state_ ct = "CT", nj = "NJ", ny = "NY";
typedef int area_code_; typedef boost::tuple<us_state_/*<<Notice the reference>>*/&, area_code_> data_;
@@ -37,9 +37,9 @@
BOOST_ASSIGN_V2_CHECK( get<0>( tri_state_area.back() ) == ct );
BOOST_ASSIGN_V2_CHECK( get<1>( tri_state_area.back() ) == 203 );
//]
- }
+ }
{
- //[deque_str
+ //[deque_str
typedef std::string str_;
BOOST_ASSIGN_V2_CHECK(
str_( as2::deque<const char*>( "x" )( "y" )( "z" )[1] ) == "y"
@@ -50,17 +50,17 @@
//[csv_deque
typedef as2::result_of::csv_deque<int>::type C;
{
- C cont = as2::csv_deque( 72, 31, 48 );
+ C cont = as2::csv_deque( 72, 31, 48 );
- BOOST_ASSIGN_V2_CHECK( cont.front() == 72 );
- BOOST_ASSIGN_V2_CHECK( cont.back() == 48 );
+ BOOST_ASSIGN_V2_CHECK( cont.front() == 72 );
+ BOOST_ASSIGN_V2_CHECK( cont.back() == 48 );
}
{
- C cont = as2::csv_deque( 72, 31 )/* Thanks to `result_of::csv_deque<int>::type == result_of::deque<int>::type`*/( 48 );
+ C cont = as2::csv_deque( 72, 31 )/* Thanks to `result_of::csv_deque<int>::type == result_of::deque<int>::type`*/( 48 );
- BOOST_ASSIGN_V2_CHECK( cont.front() == 72 );
- BOOST_ASSIGN_V2_CHECK( cont.back() == 48 );
- }
+ BOOST_ASSIGN_V2_CHECK( cont.front() == 72 );
+ BOOST_ASSIGN_V2_CHECK( cont.back() == 48 );
+ }
//]
}
{
Modified: sandbox/assign_v2/libs/assign/v2/test/put/fun.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/fun.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/fun.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -62,7 +62,7 @@
void test()
{
- using namespace boost;
+ using namespace boost;
using namespace lambda;
namespace as2 = assign::v2;
{
@@ -70,11 +70,11 @@
std::vector<double> exponent;
typedef function<double(double)> f_;
(
- as2::put( exponent ) % ( as2::_fun = f_( log10 ) )
+ as2::put( exponent ) % ( as2::_fun = f_( log10 ) )
)/*<<Calls `exponent.push_back( log10( 1000.0 ) )`>>*/( 1000.0 )( 10.0 )( 10000.0 )( 1.0 )( 100.0 );
- double eps = numeric::bounds<double>::smallest();
+ double eps = numeric::bounds<double>::smallest();
BOOST_ASSIGN_V2_CHECK( fabs( exponent.front() - 3.0 ) < eps );
BOOST_ASSIGN_V2_CHECK( fabs( exponent.back() - 2.0 ) < eps );
//]
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modifier.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modifier.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -18,10 +18,10 @@
namespace xxx_modifier{
void test(){
- xxx_iterate::test();
- xxx_lookup::test();
- xxx_repeat::test();
- xxx_standard::test();
+ xxx_iterate::test();
+ xxx_lookup::test();
+ xxx_repeat::test();
+ xxx_standard::test();
}
}// xxx_modifier
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modifier/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modifier/iterate.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modifier/iterate.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -16,7 +16,6 @@
#include <boost/type_traits/is_same.hpp>
#include <boost/typeof/typeof.hpp>
-#include <boost/assign/v2/detail/functor/post_increment.hpp>
#include <boost/assign/v2/detail/config/check.hpp>
#include <boost/assign/v2/put/modifier/iterate.hpp>
#include <boost/assign/v2/put/container/put.hpp>
@@ -32,13 +31,13 @@
void test()
{
- using namespace boost;
+ using namespace boost;
using namespace lambda;
namespace as2 = assign::v2;
{
- //[iterate_meta
+ //[iterate_meta
typedef as2::put_aux::keyword_iterate keyword_;
- typedef as2::modifier_tag::iterate_arg arg_;
+ typedef as2::modifier_tag::iterate_arg arg_;
typedef as2::put_aux::modulo_modifier<keyword_, arg_> modulo_;
typedef array<int, 4> cont_;
typedef as2::result_of::put<cont_>::type put_;
@@ -63,9 +62,9 @@
//]
}
{
- //[iterate_meta_deque
+ //[iterate_meta_deque
typedef as2::put_aux::keyword_iterate keyword_;
- typedef as2::modifier_tag::iterate_arg arg_;
+ typedef as2::modifier_tag::iterate_arg arg_;
typedef as2::put_aux::modulo_modifier<keyword_, arg_> modulo_;
typedef as2::result_of::deque<int>::type put_;
typedef as2::result_of::modulo_modifier<put_> meta1_;
@@ -78,12 +77,12 @@
}
{
//[iterate_deque
- as2::result_of::deque<int>::type missing_tail = as2::deque<int>( 1 )( 10 )( -1 )( -1 );
+ as2::result_of::deque<int>::type missing_tail = as2::deque<int>( 1 )( 10 )( -1 )( -1 );
int i = 2;
BOOST_AUTO(
- powers,
- ( missing_tail % ( as2::_iterate = var( i )++ ) )( 100 )( 1000 )
+ powers,
+ ( missing_tail % ( as2::_iterate = var( i )++ ) )( 100 )( 1000 )
);
BOOST_ASSIGN_V2_CHECK( powers[0] == 1 );
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modifier/lookup.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modifier/lookup.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modifier/lookup.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -31,11 +31,11 @@
void test()
{
- using namespace boost;
+ using namespace boost;
using namespace lambda;
namespace as2 = assign::v2;
{
- //[lookup_meta
+ //[lookup_meta
typedef BOOST_TYPEOF(_1) arg_;
typedef as2::put_aux::keyword_lookup keyword_;
typedef as2::put_aux::modulo_modifier<keyword_, arg_> modulo_;
@@ -53,15 +53,15 @@
//[lookup
typedef std::map<std::string, int> C; C cal;
(
- as2::put( cal )/*<<Calls `cal.insert( C::value_type( "feb", 28 ) )`>>*/( "feb", 28 )( "apr", 30 )( "jun", 30 )( "sep", 30 )( "nov", 30 )/*<<Without this parameter, the compiler would complain that the subsequent argument (`"jan"`) is not convertible to `C::key_type`>>*/% ( as2::_fun = _1 ) % ( as2::_lookup = (_1 = 31) )
+ as2::put( cal )/*<<Calls `cal.insert( C::value_type( "feb", 28 ) )`>>*/( "feb", 28 )( "apr", 30 )( "jun", 30 )( "sep", 30 )( "nov", 30 )/*<<Without this parameter, the compiler would complain that the subsequent argument (`"jan"`) is not convertible to `C::key_type`>>*/% ( as2::_fun = _1 ) % ( as2::_lookup = (_1 = 31) )
)/*<<Calls `cal["jan"] = 31`>>*/( "jan" )( "mar" )( "may" )( "jul" )( "aug" )( "oct" )( "dec" );
BOOST_ASSIGN_V2_CHECK( cal["jan"] == 31 );
BOOST_ASSIGN_V2_CHECK( cal["dec"] == 31 );
- //]
+ //]
}
{
- //[lookup_meta_deque
+ //[lookup_meta_deque
typedef BOOST_TYPEOF(_1) arg_;
typedef as2::put_aux::keyword_lookup keyword_;
typedef as2::put_aux::modulo_modifier<keyword_, arg_> modulo_;
@@ -77,10 +77,10 @@
{
//[lookup_deque
BOOST_AUTO(
- days_in_first_quater,
- (
- as2::deque<int>( 31 )( 31 )( 31 ) % ( as2::_lookup = ( _1 -= 3 ) )
- )( 1 )
+ days_in_first_quater,
+ (
+ as2::deque<int>( 31 )( 31 )( 31 ) % ( as2::_lookup = ( _1 -= 3 ) )
+ )( 1 )
);
BOOST_ASSIGN_V2_CHECK( days_in_first_quater[0] == 31 );
BOOST_ASSIGN_V2_CHECK( days_in_first_quater[1] == 28 );
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modifier/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modifier/repeat.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modifier/repeat.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -23,8 +23,8 @@
void test()
{
- using namespace boost;
- namespace as2 = assign::v2;
+ using namespace boost;
+ namespace as2 = assign::v2;
{
//[repeat_simple
std::vector<int> cont;
@@ -47,7 +47,7 @@
BOOST_ASSIGN_V2_CHECK( cont.front() == 48 );
BOOST_ASSIGN_V2_CHECK( cont.back() == 72 );
}
- }
+ }
}// xxx_repeat
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modifier/standard.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modifier/standard.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modifier/standard.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -34,27 +34,27 @@
void test()
{
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
- // ------------------------------ WARNING ---------------------------- //
+ // ------------------------------ WARNING ---------------------------- //
// Don't misconstrue the commands in the tests below as *necessary* to //
// obtain particular implementation. In most cases, the default is //
- // already set at that invoked with operator% //
+ // already set at that invoked with operator% //
// ------------------------------------------------------------------- //
- // PUT
- {
- //[modifier_meta
- typedef as2::result_of::put<std::vector<int> >::type put_;
+ // PUT
+ {
+ //[modifier_meta
+ typedef as2::result_of::put<std::vector<int> >::type put_;
typedef as2::put_aux::keyword_modifier keyword_;
typedef as2::modifier_tag::push_front tag_;
typedef as2::result_of::modulo_modifier<put_> meta1_;
- typedef ::boost::mpl::apply2<meta1_, keyword_, tag_>::type result1_;
+ typedef ::boost::mpl::apply2<meta1_, keyword_, tag_>::type result1_;
typedef as2::put_aux::replace_modifier_tag<put_> meta2_;
typedef ::boost::mpl::apply1<meta2_, tag_>::type result2_;
BOOST_MPL_ASSERT(( boost::is_same<result1_, result2_> ));
- //]
+ //]
}
{
//[modifier_push_front
@@ -90,19 +90,19 @@
BOOST_ASSIGN_V2_CHECK( list.back() == 48 );
//]
}
- // DEQUE
- {
- //[modifier_meta_deque
- typedef as2::result_of::deque<int>::type put_;
+ // DEQUE
+ {
+ //[modifier_meta_deque
+ typedef as2::result_of::deque<int>::type put_;
typedef as2::put_aux::keyword_modifier keyword_;
typedef as2::modifier_tag::push_front tag_;
typedef as2::result_of::modulo_modifier<put_> meta1_;
- typedef ::boost::mpl::apply2<meta1_, keyword_, tag_>::type result1_;
+ typedef ::boost::mpl::apply2<meta1_, keyword_, tag_>::type result1_;
typedef as2::put_aux::replace_modifier_tag<put_> meta2_;
typedef ::boost::mpl::apply1<meta2_, tag_>::type result2_;
BOOST_MPL_ASSERT(( boost::is_same<result1_, result2_> ));
- //]
+ //]
}
{
//[modifier_push_front_deque
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/args_list.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/args_list.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/args_list.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -22,20 +22,20 @@
namespace xxx_pipe{
namespace xxx_args_list{
- // --User may skip this file-- //
+ // --User may skip this file-- //
// It checks internal details. //
// --------------------------- //
void test()
{
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
typedef boost::mpl::int_<0> zero_;
{
typedef as2::put_pipe_aux::args_list<> args_list_;
int x = -1;
BOOST_AUTO(
- args_list,
+ args_list,
( ( args_list_() % ( as2::_repeat = 3 ) )( x ) )
);
int n = as2::ref::at<0>( args_list.par_list_cont() ).arg();
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/fun.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/fun.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/fun.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -20,7 +20,7 @@
#include <boost/range/algorithm/for_each.hpp>
-
+
#include <iostream>
namespace test_assign_v2{
@@ -30,22 +30,22 @@
void test()
{
- using namespace boost;
+ using namespace boost;
using namespace lambda;
namespace as2 = assign::v2;
{
//[csv_pipe_modulo_fun_math
int i = 0, k = 1; std::list<int> factorials;
BOOST_ASSIGN_V2_CHECK(
- range::equal(
- factorials | (
- as2::_put % ( as2::_fun = ( var(k) *= ( ++var(i) ) ) )
+ range::equal(
+ factorials | (
+ as2::_put % ( as2::_fun = ( var(k) *= ( ++var(i) ) ) )
)/*Equivalent to calling `factorials.push_back( k *= ++i )`*/()()()()(),
as2::csv_deque<int>( 1 )( 2 )( 6 )( 24 )( 120 )
)
);
//]
- }
+ }
}
}// xxx_fun
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -20,10 +20,10 @@
void test()
{
- xxx_iterate::test();
- xxx_lookup::test();
- xxx_repeat::test();
- xxx_standard::test();
+ xxx_iterate::test();
+ xxx_lookup::test();
+ xxx_repeat::test();
+ xxx_standard::test();
}
}// xxx_modifier
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/iterate.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/iterate.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -33,11 +33,11 @@
typedef int T; boost::array<T, 4> powers; powers[0] = 1; powers[1] = 10;
int i = 2;
BOOST_ASSIGN_V2_CHECK(
- boost::range::equal(
- powers | ( as2::_csv_put % ( as2::_iterate = var( i )++ ) )( 100, 1000 ),
- as2::csv_deque<T>( 1, 10, 100, 1000 )
+ boost::range::equal(
+ powers | ( as2::_csv_put % ( as2::_iterate = var( i )++ ) )( 100, 1000 ),
+ as2::csv_deque<T>( 1, 10, 100, 1000 )
)
- );
+ );
//]
}
}
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/lookup.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/lookup.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/lookup.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -12,7 +12,6 @@
#include <boost/lambda/lambda.hpp>
#include <boost/typeof/typeof.hpp>
#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/detail/functor/identity.hpp>
#include <boost/assign/v2/put/modulo/fun.hpp>
#include <boost/assign/v2/put/modifier/lookup.hpp>
#include <boost/assign/v2/put/pipe/put.hpp>
@@ -27,7 +26,7 @@
void test()
{
- using namespace boost;
+ using namespace boost;
using namespace lambda;
namespace as2 = assign::v2;
{
@@ -35,9 +34,9 @@
std::map<std::string, int> cal;
BOOST_AUTO( _local, ( as2::_fun = _1 ) );
BOOST_ASSIGN_V2_CHECK(
- (
- cal
- | as2::_put( "feb", 28 )
+ (
+ cal
+ | as2::_put( "feb", 28 )
| ( as2::_csv_put % _local % ( as2::_lookup = (_1 = 30) ) )( "apr", "jun", "sep", "nov" )
| ( as2::_csv_put % _local % ( as2::_lookup = (_1 = 31) ) )( "jan", "mar", "may", "jul", "aug", "oct", "dec" )
@@ -45,7 +44,7 @@
);
BOOST_ASSIGN_V2_CHECK( cal["jun"] == 30 );
BOOST_ASSIGN_V2_CHECK( cal["mar"] == 31 );
- //]
+ //]
}
}
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/repeat.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/repeat.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -24,20 +24,20 @@
void test()
{
- using namespace boost;
- namespace as2 = assign::v2;
+ using namespace boost;
+ namespace as2 = assign::v2;
{
//[pipe_repeat
std::vector<int> cont;
BOOST_ASSIGN_V2_CHECK(
- range::equal(
- cont | ( as2::_put % ( as2::_repeat = 2 ) )( 72 )( 31 )( 48 ),
- as2::csv_deque<int>( 72, 72, 31, 31, 48, 48 )
- )
- );
+ range::equal(
+ cont | ( as2::_put % ( as2::_repeat = 2 ) )( 72 )( 31 )( 48 ),
+ as2::csv_deque<int>( 72, 72, 31, 31, 48, 48 )
+ )
+ );
//]
}
- }
+ }
}// xxx_repeat
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/standard.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/standard.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/modifier/standard.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -29,19 +29,19 @@
void test()
{
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
- // ------------------------------ WARNING ---------------------------- //
+ // ------------------------------ WARNING ---------------------------- //
// Don't misconstrue the commands in the tests below as *necessary* to //
// obtain particular implementation. Most of the time the default is //
- // already set at that invoked with operator% //
+ // already set at that invoked with operator% //
// ------------------------------------------------------------------- //
{
//[pipe_modifier_push_front
std::deque<int> powers; int front = (
- powers | ( as2::_put % as2::_push_front )( 16 )( 8 )( 4 )( 2 )( 1 )
+ powers | ( as2::_put % as2::_push_front )( 16 )( 8 )( 4 )( 2 )( 1 )
).front();
BOOST_ASSIGN_V2_CHECK( front == 1 );
@@ -51,7 +51,7 @@
{
//[pipe_modifier_push
typedef int int_; std::queue<int_> fifo; int_ front = (
- fifo | ( as2::_put % as2::_push )( 72 )( 31 )( 48 )
+ fifo | ( as2::_put % as2::_push )( 72 )( 31 )( 48 )
).front();
BOOST_ASSIGN_V2_CHECK( front == 72 );
@@ -60,9 +60,9 @@
}
{
//[pipe_modifier_insert
- typedef std::set<double> doubles_; doubles_ sqrt2;
+ typedef std::set<double> doubles_; doubles_ sqrt2;
range_iterator<doubles_>::type lower = (
- sqrt2 | ( as2::_put % as2::_insert )( 1.414 )( 1.41421 )( 1.41 )( 1.4142 )
+ sqrt2 | ( as2::_put % as2::_insert )( 1.414 )( 1.41421 )( 1.41 )( 1.4142 )
).lower_bound( 1.41 );
BOOST_ASSIGN_V2_CHECK( lower == begin( sqrt2 ) );
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/put.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -27,33 +27,33 @@
namespace xxx_put{
void test(){
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
- {
- //pipe_put_str_literal
- typedef const char* T; typedef std::string str_; std::deque<T> cont;
- BOOST_ASSIGN_V2_CHECK(
- boost::range::equal(
- cont | as2::_put( "x" )( "y" )( "z" ),
+ {
+ //pipe_put_str_literal
+ typedef const char* T; typedef std::string str_; std::deque<T> cont;
+ BOOST_ASSIGN_V2_CHECK(
+ boost::range::equal(
+ cont | as2::_put( "x" )( "y" )( "z" ),
as2::csv_deque( "x" )( "y" )( "z" )
)
- );
- BOOST_ASSIGN_V2_CHECK( str_( cont[1] ) == "y" );
- BOOST_ASSIGN_V2_CHECK( str_( cont[2] ) == "z" );
- }
- {
+ );
+ BOOST_ASSIGN_V2_CHECK( str_( cont[1] ) == "y" );
+ BOOST_ASSIGN_V2_CHECK( str_( cont[2] ) == "z" );
+ }
+ {
//[pipe_put_as_arg_list
- boost::array<int, 2> interval; boost::array<int, 6> all6;
- BOOST_ASSIGN_V2_CHECK(
- boost::range::equal(
- all6 | as2::_put( 1 )( 2 )( as2::as_arg_list( interval | as2::_csv_put( 3, 4 ) ) )( 5 )( 6 ),
+ boost::array<int, 2> interval; boost::array<int, 6> all6;
+ BOOST_ASSIGN_V2_CHECK(
+ boost::range::equal(
+ all6 | as2::_put( 1 )( 2 )( as2::as_arg_list( interval | as2::_csv_put( 3, 4 ) ) )( 5 )( 6 ),
as2::csv_deque( 1, 2, 3, 4, 5, 6 )
)
);
- BOOST_ASSIGN_V2_CHECK(
- boost::range::equal( interval, as2::csv_deque( 3, 4 ) )
+ BOOST_ASSIGN_V2_CHECK(
+ boost::range::equal( interval, as2::csv_deque( 3, 4 ) )
);
- //]
+ //]
}
}// test()
Modified: sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -23,7 +23,7 @@
void test()
{
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
{
//[ref_array_r
Modified: sandbox/assign_v2/libs/assign/v2/test/ref/convert_traits.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/convert_traits.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/convert_traits.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -14,13 +14,13 @@
namespace xxx_ref{
namespace xxx_convert_traits{
- // --User may skip this file-- //
+ // --User may skip this file-- //
// It checks internal details. //
// --------------------------- //
void test()
{
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
namespace ns = as2::ref::convert_traits::checking;
{
Modified: sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -22,7 +22,7 @@
void test()
{
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
{
//[ref_csv_array
Modified: sandbox/assign_v2/libs/assign/v2/test/ref/list.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/list.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/list.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -23,13 +23,13 @@
namespace xxx_ref{
namespace xxx_list{
- // --User may skip this file-- //
+ // --User may skip this file-- //
// It checks internal details. //
// --------------------------- //
void test()
{
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
typedef use_default tag_;
typedef std::string str_;
Modified: sandbox/assign_v2/libs/assign/v2/test/ref/list_tuple.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/list_tuple.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/list_tuple.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -20,7 +20,7 @@
namespace xxx_ref{
namespace xxx_list_tuple{
- // --User may skip this file-- //
+ // --User may skip this file-- //
// It checks internal details. //
// --------------------------- //
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-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -60,7 +60,7 @@
BOOST_ASSIGN_V2_CHECK( fa_si.back() == "si" );
//]
}
- // Boost.Assign.v2 containers
+ // Boost.Assign.v2 containers
{
//[chain_ref_array
/*<< Needed to bring && into scope >>*/ using namespace assign::v2;
Modified: sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -30,11 +30,11 @@
namespace as2 = boost::assign::v2;
as2::check_aux::equal_container( cont, r );
}
- //]
+ //]
void test()
{
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
namespace ns = as2::check_aux;
@@ -63,30 +63,30 @@
}
{
{
- typedef int T;
- typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
+ typedef int T;
+ typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
typedef std::vector<T> C; f<C>( as2::converter( r ), r );
}
{
- typedef int T;
- typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
+ typedef int T;
+ typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
typedef std::deque<T> C; f<C>( as2::converter( r ), r );
}
{
- typedef int T;
- typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
+ typedef int T;
+ typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
typedef std::list<T> C; f<C>( as2::converter( r ), r );
}
{
- //[convert_f_invoke
- typedef int T;
- typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
+ //[convert_f_invoke
+ typedef int T;
+ typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
typedef std::stack<T> C; f<C>( as2::converter( r ), r );
//]
}
{
- typedef int T;
- typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
+ typedef int T;
+ typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
typedef std::queue<T> C; f<C>( as2::converter( r ), r );
}
}
Modified: sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp 2011-03-11 19:23:42 EST (Fri, 11 Mar 2011)
@@ -21,7 +21,7 @@
void test(){
- using namespace boost;
+ using namespace boost;
namespace as2 = assign::v2;
{
//[csv_put
@@ -44,8 +44,8 @@
{
//[csv_deque_modulo
BOOST_AUTO(
- cont,
- as2::csv( as2::deque<int>( as2::_nil ) % as2::_push_front, 72, 31, 48 )
+ cont,
+ as2::csv( as2::deque<int>( as2::_nil ) % as2::_push_front, 72, 31, 48 )
);
BOOST_ASSIGN_V2_CHECK( cont.front() == 48 );
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