Subject: [Boost-commit] svn:boost r69413 - in sandbox/assign_v2/boost/assign/v2: . put put/container/functor put/deduce put/frame put/pipe put/pipe/csv put/pipe/functor put/pipe/modulo ref ref/wrapper utility/chain utility/convert
From: erwann.rogard_at_[hidden]
Date: 2011-02-28 19:27:03
Author: e_r
Date: 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
New Revision: 69413
URL: http://svn.boost.org/trac/boost/changeset/69413
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/detail.hpp | 5 -
sandbox/assign_v2/boost/assign/v2/put/container/functor/make.hpp | 2
sandbox/assign_v2/boost/assign/v2/put/deduce.hpp | 2
sandbox/assign_v2/boost/assign/v2/put/deduce/modifier.hpp | 77 -------------------------
sandbox/assign_v2/boost/assign/v2/put/deduce/modulo.hpp | 2
sandbox/assign_v2/boost/assign/v2/put/frame/crtp.hpp | 4
sandbox/assign_v2/boost/assign/v2/put/frame/modifier.hpp | 13 ++--
sandbox/assign_v2/boost/assign/v2/put/pipe.hpp | 2
sandbox/assign_v2/boost/assign/v2/put/pipe/csv.hpp | 34 +----------
sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp | 4 -
sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp | 8 +-
sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp | 1
sandbox/assign_v2/boost/assign/v2/put/pipe/functor/operator.hpp | 10 +-
sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp | 31 +++++++++
sandbox/assign_v2/boost/assign/v2/put/pipe/modulo/traits.hpp | 3 +
sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp | 2
sandbox/assign_v2/boost/assign/v2/ref/wrapper/adaptor_get.hpp | 120 ---------------------------------------
sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp | 30 +++++-----
sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp | 2
sandbox/assign_v2/boost/assign/v2/utility/chain/short.hpp | 42 -------------
sandbox/assign_v2/boost/assign/v2/utility/convert/deduce.hpp | 4
sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp | 16 +++--
sandbox/assign_v2/boost/assign/v2/utility/convert/predicate.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/utility/convert/tag.hpp | 2
24 files changed, 96 insertions(+), 326 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/detail.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -16,8 +16,7 @@
#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/detail/traits.hpp>
-// Don't include
-// /checking/checking.hpp
-// /config/config
+// /config.hpp is not to be defined
+// Don't include /checking/checking.hpp
#endif
Modified: sandbox/assign_v2/boost/assign/v2/put/container/functor/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/functor/make.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/functor/make.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -10,7 +10,7 @@
#ifndef BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_MAKE_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_MAKE_ER_2010_HPP
#include <boost/assign/v2/put/deduce/fun.hpp>
-#include <boost/assign/v2/put/deduce/modifier.hpp>
+#include <boost/assign/v2/put/deduce/modifier_tag.hpp>
#include <boost/assign/v2/put/deduce/dependee.hpp>
#include <boost/assign/v2/put/container/functor/adapter.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/put/deduce.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deduce.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/deduce.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -13,7 +13,7 @@
#include <boost/assign/v2/put/deduce/dependee.hpp>
#include <boost/assign/v2/put/deduce/fwd.hpp>
#include <boost/assign/v2/put/deduce/fun.hpp>
-#include <boost/assign/v2/put/deduce/modifier.hpp>
+#include <boost/assign/v2/put/deduce/modifier_tag.hpp>
#include <boost/assign/v2/put/deduce/modulo.hpp>
//#include <boost/assign/v2/put/deduce/traits.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/put/deduce/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deduce/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/deduce/modifier.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -1,76 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2010 Erwann Rogard //
-// Use, modification and distribution are subject to the //
-// Boost Software License, Version 1.0. (See accompanying file //
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_PUT_DEDUCE_MODIFIER_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_DEDUCE_MODIFIER_ER_2010_HPP
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-#include <boost/assign/v2/detail/traits/switch.hpp>
-#include <boost/assign/v2/detail/traits/container/is_array.hpp>
-#include <boost/assign/v2/detail/traits/container/has_push.hpp>
-#include <boost/assign/v2/detail/traits/container/is_associative.hpp>
-
-#include <boost/assign/v2/put/deduce/fwd.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace switch_tag{
- struct deduce_put{};
-}// switch_tag
-namespace switch_aux{
-
- template<>
- struct case_<switch_tag::deduce_put, 0> :
- switch_aux::helper<
- v2::modifier_tag::insert,
- v2::container_traits::is_associative
- >{};
-
- template<>
- struct case_<switch_tag::deduce_put, 1> :
- switch_aux::helper<
- v2::modifier_tag::iterate,
- v2::container_traits::is_array
- >{};
-
- template<>
- struct case_<switch_tag::deduce_put, 2> :
- switch_aux::helper<
- v2::modifier_tag::push,
- container_traits::has_push_deduced_value
- >{};
-
- template<>
- struct case_<switch_tag::deduce_put, 3> :
- switch_aux::helper<v2::modifier_tag::push_back>{};
-
-}// switch_aux
-namespace put_aux{
-
- template<typename T>
- struct deduce_modifier_tag
- : switch_aux::result< switch_tag::deduce_put, T>
- {};
-
- // For testing purposes
- template<typename C, typename X>
- void check_deduce()
- {
- typedef typename put_aux::deduce_modifier_tag<C>::type found_;
- BOOST_MPL_ASSERT(( boost::is_same<found_, X> ));
- }
-
-}// put_aux
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/put/deduce/modulo.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deduce/modulo.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/deduce/modulo.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -14,7 +14,7 @@
#include <boost/mpl/identity.hpp>
#include <boost/type_traits/is_same.hpp>
-#include <boost/assign/v2/put/deduce/modifier.hpp>
+#include <boost/assign/v2/put/deduce/modifier_tag.hpp>
namespace boost{
struct use_default;
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-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -178,7 +178,7 @@
template<typename T>
result_type modify(T* t,typename ptr_enabler<T>::type* = 0)const
{
- typedef put_concept::ModifierImpl<modifier_, C, T*> concept_;
+ typedef put_concept::Modifier<Tag, C, T*> concept_;
BOOST_CONCEPT_ASSERT(( concept_ ));
this->modifier.impl( this->derived().container(), t );
return this->derived();
@@ -187,7 +187,7 @@
template<typename T>
void check_modifier( BOOST_ASSIGN_V2_forward_param(T, t) )const
{
- typedef put_concept::ModifierImpl<modifier_, C,
+ typedef put_concept::Modifier<Tag, C,
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
T&&
#else
Modified: sandbox/assign_v2/boost/assign/v2/put/frame/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/frame/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/frame/modifier.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -29,21 +29,22 @@
}// put_aux
namespace put_concept{
- // M models ModifierImpl with respect to container V and type T
- template<typename M, typename C, typename T>
- struct ModifierImpl
+ //[concept_modifier
+ template<typename Tag, typename C, typename T>
+ struct Modifier
{
- BOOST_CONCEPT_USAGE(ModifierImpl)
+ BOOST_CONCEPT_USAGE(Modifier)
{
- //m.impl( cont, t ); // TODO
+ m.impl( cont, t );
}
private:
- static M& m;
+ static put_aux::modifier<Tag>& m;
static C& cont;
static T t;
};
+ //]
}// put_concept
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -10,8 +10,8 @@
#ifndef BOOST_ASSIGN_V2_PUT_PIPE_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_PIPE_ER_2010_HPP
-#include <boost/assign/v2/put/pipe/csv.hpp>
#include <boost/assign/v2/put/pipe/functor.hpp>
+#include <boost/assign/v2/put/pipe/csv.hpp>
#include <boost/assign/v2/put/pipe/range.hpp>
#endif // BOOST_ASSIGN_V2_PUT_PIPE_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -9,34 +9,8 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_PUT_PIPE_CSV_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_PIPE_CSV_ER_2010_HPP
+#include <boost/assign/v2/put/pipe/csv/operator.hpp>
+#include <boost/assign/v2/put/pipe/csv/generator.hpp>
+#include <boost/assign/v2/put/pipe/csv/keyword.hpp>
-/*#include <boost/assign/v2/put/pipe/csv/rhs.hpp>
-#include <boost/assign/v2/put/pipe/csv/generator.hpp>
-#include <boost/assign/v2/put/pipe/csv/keyword.hpp>
-#include <boost/assign/v2/put/pipe/csv/operator.hpp>*/
-
-#include <boost/assign/v2/put/pipe/functor.hpp>
-#include <boost/assign/v2/utility/csv.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace csv_aux{
-
- template<typename C, typename Pars, typename SeqArgs, bool enable_pars>
- C& operator|(
- C& cont,
- csv_aux::adapter<
- v2::put_pipe_aux::rhs<Pars, SeqArgs, enable_pars>
- > const& rhs
- )
- {
- cont | rhs.functor();
- }
-
-}// csv_aux
-}// v2
-}// assign
-}// boost
-
-#endif
+#endif
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv/generator.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -46,9 +46,6 @@
class csv_generator
{
- //typedef boost::use_default tag2_;
- //typedef v2::ref::assign_copy::nth_result_of::fusion<tag2_> meta1_;
-
typedef ::boost::mpl::na na_;
typedef modulo_traits<Pars> modulo_traits_;
@@ -133,7 +130,6 @@
ref::csv_array<U>( BOOST_PP_ENUM_PARAMS(N, _) ) \
);\
/**/
-
#define BOOST_ASSIGN_V2_MACRO2(z, N, data)\
template<typename T>\
typename result<N, T>::type\
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv/operator.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -20,18 +20,18 @@
namespace v2{
namespace put_pipe_aux{
- template<typename V,
+ template<typename C,
typename Pars, csv_size_type N, typename U>
- V& operator|(V& v, put_pipe_aux::csv_rhs<Pars, N, U> const& c){
+ C& operator|(C& cont, put_pipe_aux::csv_rhs<Pars, N, U> const& c){
csv_forward(
forward_pars<Pars>(
- put( v ),
+ put( cont ),
c.pars()
),
c.seq_args()
);
- return v;
+ return cont;
}
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv/rhs.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -63,4 +63,3 @@
}// boost
#endif
-
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/functor/operator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/functor/operator.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/functor/operator.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -20,23 +20,23 @@
namespace put_pipe_aux{
template<
- typename V,
+ typename C,
typename Pars,
typename SeqArgs,
bool enable_pars
>
- V& operator|(
- V& v,
+ C& operator|(
+ C& cont,
put_pipe_aux::rhs<Pars, SeqArgs, enable_pars> const& c
){
forward(
forward_pars<Pars>(
- put( v ),
+ put( cont ),
c.pars()
),
c.seq_args()
);
- return v;
+ return cont;
}
}// put_pipe_aux
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/functor/rhs.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -9,7 +9,9 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_RHS_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_PIPE_FUNCTOR_RHS_ER_2010_HPP
+#include <iostream>
#include <boost/mpl/vector/vector0.hpp>
+#include <boost/mpl/int.hpp>
#include <boost/mpl/size.hpp>
#include <boost/mpl/apply.hpp>
@@ -35,9 +37,11 @@
namespace v2{
namespace put_pipe_aux{
+ typedef ::boost::mpl::vector0<> empty_seq_args_;
+
template<
- typename Pars = ::boost::mpl::vector0<>,
- typename SeqArgs = ::boost::mpl::vector0<>,
+ typename Pars = empty_pars_,
+ typename SeqArgs = empty_seq_args_,
bool enable_pars = (boost::mpl::size<SeqArgs>::value == 0)
>
class rhs;
@@ -265,6 +269,29 @@
};
+ // For testing purposes
+ template<int i, int j, typename T, typename P, typename U>
+ void check_rhs(T const& rhs, P const& pred, U const& u)
+ {
+ #if BOOST_ASSIGN_V2_ENABLE_CPP0X
+ using namespace boost::assign::v2::ref; // tuple (cpp0x)
+ #else
+ using namespace boost; // tuple<> (cpp03)
+ #endif
+
+ //std::cout << "(i,j)->" << get<j>(
+ // rhs.seq_args().get( boost::mpl::int_<i>() )
+ // ) << std::endl;
+
+ pred(
+ get<j>(
+ rhs.seq_args().get( boost::mpl::int_<i>() )
+ ),
+ u
+ );
+ }
+
+
}// put_pipe_aux
}// 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-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -12,6 +12,7 @@
#include <boost/mpl/apply.hpp>
#include <boost/mpl/size.hpp>
#include <boost/mpl/push_back.hpp>
+#include <boost/mpl/vector/vector0.hpp>
#include <boost/assign/v2/ref/list/at.hpp>
#include <boost/assign/v2/ref/list/container.hpp>
#include <boost/assign/v2/ref/list/nth_result_of.hpp>
@@ -23,6 +24,8 @@
namespace v2{
namespace put_pipe_aux{
+ typedef ::boost::mpl::vector0<> empty_pars_;
+
template<typename Pars>
struct modulo_traits
{
Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -13,6 +13,6 @@
#include <boost/assign/v2/ref/wrapper/copy.hpp>
#include <boost/assign/v2/ref/wrapper/cpp0x.hpp>
#include <boost/assign/v2/ref/wrapper/get.hpp>
-#include <boost/assign/v2/ref/wrapper/adaptor_get.hpp>
+#include <boost/assign/v2/ref/wrapper/range_get.hpp>
#endif
Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/adaptor_get.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/adaptor_get.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/adaptor_get.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -1,119 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2010 Erwann Rogard //
-// Use, modification and distribution are subject to the //
-// Boost Software License, Version 1.0. (See accompanying file //
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_REF_WRAPPER_ADAPTOR_GET_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_WRAPPER_ADAPTOR_GET_ER_2010_HPP
-#include <boost/config.hpp>
-#include <boost/range/reference.hpp>
-#include <boost/range/value_type.hpp>
-
-#ifdef BOOST_MSVC
-#include <boost/range/begin.hpp>
-#include <boost/range/end.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/iterator/transform_iterator.hpp>
-#else
-#include <boost/range/adaptor/transformed.hpp>
-#endif
-
-#include <boost/assign/v2/ref/wrapper/get.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace ref{
-namespace range_aux{
-namespace result_of{
-
- template<typename R>
- struct range_get{
-
- typedef ref::get_functor f_;
- #ifdef BOOST_MSVC
- typedef boost::iterator_range<
- boost::transform_iterator< f_,
- BOOST_DEDUCED_TYPENAME boost::range_iterator<R>::type
- >
- > type;
- #else
- typedef boost::range_detail::transform_range<f_, R> type;
- #endif
- };
-
-}// result_of
-
- template<typename R>
- typename range_aux::result_of::range_get<R>::type
- range_get(R& r)
- {
- typedef typename range_aux::result_of::range_get<R>::type result_;
- #ifdef BOOST_MSVC
- return result_(
- boost::make_transform_iterator( boost::begin(r), get_functor() ),
- boost::make_transform_iterator( boost::end(r), get_functor() )
- );
- #else
- return result_(get_functor(), r);
- #endif
- }
- template<typename R>
- typename range_aux::result_of::range_get<R const>::type
- range_get(R const& r)
- {
- typedef typename range_aux::result_of::range_get<R const>::type result_;
- #ifdef BOOST_MSVC
- return result_(
- boost::make_transform_iterator( boost::begin(r), get_functor() ),
- boost::make_transform_iterator( boost::end(r), get_functor() )
- );
- #else
- return result_(get_functor(), r);
- #endif
- }
-
- struct get_adaptor{};
-
- template<typename R>
- typename range_aux::result_of::range_get<R>::type
- operator|(R& r, get_adaptor){
- return range_get( r );
- }
-
- template<typename R>
- typename range_aux::result_of::range_get<R const>::type
- operator|(R const& r, get_adaptor){
- return range_get( r );
- }
-
-}// range_aux
-namespace result_of{
-
-
- template<typename R>
- struct range_get : boost::lazy_enable_if<
- boost::is_reference_wrapper<
- typename boost::range_value<
- typename boost::remove_cv<R>::type
- >::type
- >,
- range_aux::result_of::range_get<R>
- >{};
-
-}// result_of
-
-namespace{
- range_aux::get_adaptor const _get = range_aux::get_adaptor();
-}
-
-}// ref
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/crtp.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -55,12 +55,12 @@
public:
- void operator=(lvalue_& r ){ this->derived().assign( r ); }
- void operator=(rvalue_& r ){ this->derived().assign( r ); }
+ void operator=(lvalue_& t ){ this->derived().assign( t ); }
+ void operator=(rvalue_& t ){ this->derived().assign( t ); }
- void swap( wrapper_crtp& r )
+ void swap( wrapper_crtp& that )
{
- return this->derived().swap( r );
+ return this->derived().swap( that );
}
operator T&() const
@@ -68,29 +68,29 @@
return this->derived().get();
}
- bool operator==( const wrapper_crtp& r )const
+ bool operator==( const wrapper_crtp& that )const
{
- return this->derived().get() == r.derived().get();
+ return this->derived().get() == that.derived().get();
}
- bool operator<( const wrapper_crtp& r )const
+ bool operator<( const wrapper_crtp& that )const
{
- return this->derived().get() < r.derived().get();
+ return this->derived().get() < that.derived().get();
}
- bool operator==( typename boost::call_traits<T>::param_type r )const
+ bool operator==( typename boost::call_traits<T>::param_type t )const
{
- return this->derived().get() == r;
+ return this->derived().get() == t;
}
- bool operator<( typename boost::call_traits<T>::param_type r )const
+ bool operator<( typename boost::call_traits<T>::param_type t )const
{
- return this->derived().get() < r;
+ return this->derived().get() < t;
}
- bool operator>( typename boost::call_traits<T>::param_type r )const
+ bool operator>( typename boost::call_traits<T>::param_type t )const
{
- return this->derived().get() > r;
+ return this->derived().get() > t;
}
template<class CharT, class Traits>
@@ -105,7 +105,7 @@
template<typename D,typename T>
- void rebind( wrapper_crtp<D,T>& a, T& r ){ a.rebind( r ); }
+ void rebind( wrapper_crtp<D,T>& a, T& t ){ a.rebind( t ); }
template<typename D,typename T>
inline void swap( wrapper_crtp<D,T>& l, wrapper_crtp<D,T>& r )
Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -20,7 +20,7 @@
#include <boost/range/algorithm/copy.hpp>
#include <boost/range/algorithm/equal.hpp>
#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/ref/wrapper/adaptor_get.hpp>
+#include <boost/assign/v2/ref/wrapper/range_get.hpp>
#include <boost/assign/v2/ref/wrapper/copy.hpp>
#include <boost/assign/v2/utility/chain/use_lvalue.hpp>
#include <boost/assign/v2/utility/chain/pipe.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/short.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/short.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/short.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -1,41 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2009 Neil Groves //
-// Copyright (C) 2010 Erwann Rogard //
-// Use, modification and distribution are subject to the //
-// Boost Software License, Version 1.0. (See accompanying file //
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_CHAIN_SHORT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_CHAIN_SHORT_ER_2010_HPP
-#include <boost/assign/v2/utility/chain/pipe.hpp>
-#include <boost/assign/v2/utility/chain/result.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-
-#define BOOST_ASSIGN_V2_MACRO(U1, U2) \
-template<typename R1,typename R2> \
-typename chain_aux::result< \
- U1,\
- U2 \
->::type \
-operator&&(U1& r1, U2 & r2) \
-{ \
- return r1 | _chain( r2 ); \
-} \
-/**/
-BOOST_ASSIGN_V2_MACRO( R1 , R2 )
-BOOST_ASSIGN_V2_MACRO( R1 , R2 const )
-BOOST_ASSIGN_V2_MACRO( R1 const, R2 )
-BOOST_ASSIGN_V2_MACRO( R1 const, R2 const )
-#undef BOOST_ASSIGN_V2_MACRO
-
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
Modified: sandbox/assign_v2/boost/assign/v2/utility/convert/deduce.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/convert/deduce.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/convert/deduce.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -38,10 +38,10 @@
}// switch_aux
namespace convert_aux{
- template<typename T, typename U>
+ template<typename C, typename R>
struct deduce_tag : v2::switch_aux::result<
v2::switch_tag::deduce_convert,
- boost::mpl::pair<T, U>
+ boost::mpl::pair<C, R>
>
{};
Modified: sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -20,23 +20,25 @@
namespace boost{
namespace assign{
namespace v2{
+//[convert_dispatch
namespace convert_aux{
- template<typename T, typename U>
- T dispatch(U const& u, convert_tag::put)
+ template<typename C, typename R>
+ C dispatch(R const& r, convert_tag::put)
{
- T t;
- return (t | v2::_put_range( u ) );
+ C cont;
+ return (cont | v2::_put_range( r ) );
}
- template<typename T, typename U>
- T dispatch(U const& u, convert_tag::copy)
+ template<typename C, typename R>
+ C dispatch(R const& r, convert_tag::copy)
{
- return T( boost::begin( u ), boost::end( u ) );
+ return C( boost::begin( r ), boost::end( r ) );
}
}// convert_aux
+//]
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/utility/convert/predicate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/convert/predicate.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/convert/predicate.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -18,10 +18,10 @@
namespace v2{
namespace convert_aux{
- template<typename T, typename U>
+ template<typename C, typename R>
struct use_put : ::boost::mpl::or_<
- v2::container_traits::is_array<T>,
- v2::container_traits::has_push<T>
+ v2::container_traits::is_array<C>,
+ v2::container_traits::has_push<C>
>{};
}// convert_aux
Modified: sandbox/assign_v2/boost/assign/v2/utility/convert/tag.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/convert/tag.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/convert/tag.hpp 2011-02-28 19:27:00 EST (Mon, 28 Feb 2011)
@@ -13,12 +13,14 @@
namespace boost{
namespace assign{
namespace v2{
+//[convert_tag
namespace convert_tag{
struct put{};
struct copy{};
}// convert_tag
+//]
}// v2
}// assign
}// boost