|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r66845 - in sandbox/statistics/support/boost/assign/v2: . anon chain/aux_ chain/checking chain/traits detail detail/checking detail/mpl detail/type_traits put put/compose/functor put/generic put/modifier put/modifier/ext put/range put/range/modifier ref/detail/unwrap ref/fusion_matrix ref/static_array
From: erwann.rogard_at_[hidden]
Date: 2010-11-29 13:37:18
Author: e_r
Date: 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
New Revision: 66845
URL: http://svn.boost.org/trac/boost/changeset/66845
Log:
routine update to boost/assign/v2
Text files modified:
sandbox/statistics/support/boost/assign/v2/anon/cont.hpp | 7 +
sandbox/statistics/support/boost/assign/v2/chain.hpp | 2
sandbox/statistics/support/boost/assign/v2/chain/aux_/logical_and.hpp | 18 +++-
sandbox/statistics/support/boost/assign/v2/chain/aux_/sub.hpp | 7 +
sandbox/statistics/support/boost/assign/v2/chain/checking/twin_values.hpp | 1
sandbox/statistics/support/boost/assign/v2/chain/traits/iterator.hpp | 2
sandbox/statistics/support/boost/assign/v2/detail/checking/check_convert.hpp | 14 +--
sandbox/statistics/support/boost/assign/v2/detail/mpl.hpp | 1
sandbox/statistics/support/boost/assign/v2/detail/mpl/always.hpp | 2
sandbox/statistics/support/boost/assign/v2/detail/mpl/uniform_vector.hpp | 2
sandbox/statistics/support/boost/assign/v2/detail/type_traits.hpp | 2
sandbox/statistics/support/boost/assign/v2/detail/type_traits/decay.hpp | 2
sandbox/statistics/support/boost/assign/v2/put.hpp | 1
sandbox/statistics/support/boost/assign/v2/put/compose/functor/composer.hpp | 2
sandbox/statistics/support/boost/assign/v2/put/generic.hpp | 3
sandbox/statistics/support/boost/assign/v2/put/generic/crtp.hpp | 28 +++++++
sandbox/statistics/support/boost/assign/v2/put/generic/result_of_modulo.hpp | 3
sandbox/statistics/support/boost/assign/v2/put/modifier.hpp | 3
sandbox/statistics/support/boost/assign/v2/put/modifier/ext/incr_lookup.hpp | 89 +++++++-----------------
sandbox/statistics/support/boost/assign/v2/put/modifier/ext/repeat.hpp | 142 ++++++++++++++-------------------------
sandbox/statistics/support/boost/assign/v2/put/modifier/ext/xxx.hpp | 60 ++++------------
sandbox/statistics/support/boost/assign/v2/put/modifier/xxx.hpp | 1
sandbox/statistics/support/boost/assign/v2/put/range.hpp | 2
sandbox/statistics/support/boost/assign/v2/put/range/adaptor.hpp | 29 +++++--
sandbox/statistics/support/boost/assign/v2/put/range/convert.hpp | 20 +++-
sandbox/statistics/support/boost/assign/v2/put/range/modifier.hpp | 3
sandbox/statistics/support/boost/assign/v2/put/range/modifier/copy.hpp | 5 +
sandbox/statistics/support/boost/assign/v2/put/range/modifier/deduce.hpp | 3
sandbox/statistics/support/boost/assign/v2/put/range/modifier/put.hpp | 3
sandbox/statistics/support/boost/assign/v2/put/range/modifier/range.hpp | 3
sandbox/statistics/support/boost/assign/v2/put/range/range.hpp | 6 +
sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/iterator.hpp | 3
sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/range.hpp | 6 -
sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/reference.hpp | 3
sandbox/statistics/support/boost/assign/v2/ref/fusion_matrix/container.hpp | 1
sandbox/statistics/support/boost/assign/v2/ref/static_array/interface.hpp | 10 +-
36 files changed, 223 insertions(+), 266 deletions(-)
Modified: sandbox/statistics/support/boost/assign/v2/anon/cont.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/anon/cont.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/anon/cont.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -17,7 +17,7 @@
#include <boost/range/size_type.hpp>
#include <boost/range/iterator_range.hpp> //iterator_range_detail::
#include <boost/assign/v2/put.hpp>
-#include <boost/assign/v2/put/range.hpp>
+//#include <boost/assign/v2/put/range.hpp> // TODO remove
#include <boost/assign/v2/put/generic/result_of_modulo.hpp>
#include <boost/assign/v2/put/generic/crtp.hpp>
#include <boost/assign/v2/detail/relational_op.hpp>
@@ -159,8 +159,9 @@
// Convert
- BOOST_ASSIGN_V2_CONVERT_CONVERT_MF
- BOOST_ASSIGN_V2_CONVERT_OPERATOR_MF
+ // TODO remove
+ // BOOST_ASSIGN_V2_CONVERT_CONVERT_MF
+ // BOOST_ASSIGN_V2_CONVERT_OPERATOR_MF
impl_& unwrap()const{ return this->impl; }
Modified: sandbox/statistics/support/boost/assign/v2/chain.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/chain.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/chain.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -11,7 +11,7 @@
#define BOOST_ASSIGN_V2_CHAIN_ER_2010_HPP
#include <boost/assign/v2/chain/traits/result.hpp>
#include <boost/assign/v2/chain/aux_/bitwise_or.hpp>
-#include <boost/assign/v2/chain/aux_/logical_and.hpp>
+// #include <boost/assign/v2/chain/aux_/logical_and.hpp> // TODO remove
// Usage
// using namespace boost::assign::v2;
Modified: sandbox/statistics/support/boost/assign/v2/chain/aux_/logical_and.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/chain/aux_/logical_and.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/chain/aux_/logical_and.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -8,6 +8,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
+// TODO (maybe) remove file
+/*
#ifndef BOOST_ASSIGN_V2_CHAIN_FUNCTION_LOGICAL_AND_ER_2010_HPP
#define BOOST_ASSIGN_V2_CHAIN_FUNCTION_LOGICAL_AND_ER_2010_HPP
#include <boost/assign/v2/chain/aux_/bitwise_or.hpp>
@@ -19,7 +21,7 @@
namespace assign{
namespace v2{
-#define BOOST_ASSIGN_V2_CHAIN_OPERATOR(U1, U2) \
+#define MACRO(U1, U2) \
template<typename R1,typename R2> \
typename chain_aux::result< \
U1, \
@@ -29,16 +31,18 @@
{ \
return r1 | adaptor::_chain( r2 ); \
} \
+*/
/**/
-
-BOOST_ASSIGN_V2_CHAIN_OPERATOR( R1 , R2 )
-BOOST_ASSIGN_V2_CHAIN_OPERATOR( R1 , R2 const )
-BOOST_ASSIGN_V2_CHAIN_OPERATOR( R1 const, R2 )
-BOOST_ASSIGN_V2_CHAIN_OPERATOR( R1 const, R2 const )
-#undef BOOST_ASSIGN_V2_CHAIN_OPERATOR
+/*
+MACRO( R1 , R2 )
+MACRO( R1 , R2 const )
+MACRO( R1 const, R2 )
+MACRO( R1 const, R2 const )
+#undef MACRO
}// v2
}// assign
}// boost
#endif
+*/
\ No newline at end of file
Modified: sandbox/statistics/support/boost/assign/v2/chain/aux_/sub.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/chain/aux_/sub.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/chain/aux_/sub.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -11,7 +11,7 @@
#ifndef BOOST_ASSIGN_V2_RANGE_CHAIN_AUX_SUB_ER_2010_HPP
#define BOOST_ASSIGN_V2_RANGE_CHAIN_AUX_SUB_ER_2010_HPP
#include <boost/range/iterator_range.hpp> //iterator_range_detail::
-#include <boost/assign/v2/put/range/convert.hpp>
+//#include <boost/assign/v2/put/range/convert.hpp> // TODO remove
#include <boost/assign/v2/detail/relational_op.hpp>
namespace boost{
@@ -32,8 +32,9 @@
sub(){}
sub(super_t const& s):super_t( s ){}
- BOOST_ASSIGN_V2_CONVERT_CONVERT_MF
- BOOST_ASSIGN_V2_CONVERT_OPERATOR_MF
+ // TODO remove
+ //BOOST_ASSIGN_V2_CONVERT_CONVERT_MF
+ //BOOST_ASSIGN_V2_CONVERT_OPERATOR_MF
// Relational op
//template<typename R1>
Modified: sandbox/statistics/support/boost/assign/v2/chain/checking/twin_values.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/chain/checking/twin_values.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/chain/checking/twin_values.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -13,6 +13,7 @@
#include <vector>
#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/identity.hpp>
+#include <boost/range/algorithm/copy.hpp>
#include <boost/assign/v2/detail/checking/range.hpp>
#include <boost/assign/v2/ref/detail/unwrap/range.hpp>
#include <boost/assign/v2/ref/wrapper/copy.hpp>
Modified: sandbox/statistics/support/boost/assign/v2/chain/traits/iterator.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/chain/traits/iterator.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/chain/traits/iterator.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -12,7 +12,7 @@
#include <boost/mpl/apply.hpp>
#include <boost/type_traits/remove_reference.hpp>
#include <boost/iterator/iterator_traits.hpp>
-#include <boost/range/detail/chain_iterator.hpp>
+#include <boost/assign/v2/temporary/chain_iterator.hpp> // TODO temporary
#include <boost/range/detail/demote_iterator_traversal_tag.hpp>
#include <boost/assign/v2/detail/type_traits/meta_convert.hpp>
Modified: sandbox/statistics/support/boost/assign/v2/detail/checking/check_convert.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/checking/check_convert.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/checking/check_convert.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -1,19 +1,17 @@
-#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
+// TODO remove file
-// TODO find out why c++0x won't allow to = from;
-// Usage:
-// using checking::container; // or maybe checking::array
-// BOOST_ASSIGN_V2_check_convert
+/*
+#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
#ifndef BOOST_ASSIGN_V2_check_convert
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-#define BOOST_ASSIGN_V2_check_convert do_check( from.convert<to_>() );
+#define BOOST_ASSIGN_V2_check_convert do_check( from | adaptor::put_convert<to_>() );
#else
#define BOOST_ASSIGN_V2_check_convert \
- do_check( from.convert<to_>() ); \
+ do_check( from | adaptor::put_convert<to_>() ); \
to_ to; to = from; \
do_check( to ); \
-/**/
#endif
#endif
+*/
Modified: sandbox/statistics/support/boost/assign/v2/detail/mpl.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/mpl.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/mpl.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -10,7 +10,6 @@
#ifndef BOOST_ASSIGN_V2_TYPE_TRAITS_MPL_ER_2010_HPP
#define BOOST_ASSIGN_V2_TYPE_TRAITS_MPL_ER_2010_HPP
-#include <boost/assign/v2/detail/mpl/always.hpp>
#include <boost/assign/v2/detail/mpl/switch.hpp>
#endif
Modified: sandbox/statistics/support/boost/assign/v2/detail/mpl/always.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/mpl/always.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/mpl/always.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -13,6 +13,8 @@
#include <boost/mpl/apply.hpp>
#include <boost/mpl/identity.hpp>
+// TODO remove file
+
namespace boost{
namespace assign{
namespace v2{
Modified: sandbox/statistics/support/boost/assign/v2/detail/mpl/uniform_vector.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/mpl/uniform_vector.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/mpl/uniform_vector.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -13,6 +13,8 @@
#include <boost/mpl/vector.hpp>
#include <boost/mpl/push_back.hpp>
+// TODO remove file
+
namespace boost{
namespace assign{
namespace v2{
Modified: sandbox/statistics/support/boost/assign/v2/detail/type_traits.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/type_traits.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/type_traits.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -10,7 +10,7 @@
#ifndef BOOST_ASSIGN_V2_TYPE_TRAITS_ER_2010_HPP
#define BOOST_ASSIGN_V2_TYPE_TRAITS_ER_2010_HPP
-#include <boost/assign/v2/detail/type_traits/decay.hpp>
+// #include <boost/assign/v2/detail/type_traits/decay.hpp> // TODO (maybe) remove
#include <boost/assign/v2/detail/type_traits/has_value_type.hpp>
#include <boost/assign/v2/detail/type_traits/is_stl_pair.hpp>
#include <boost/assign/v2/detail/type_traits/meta_convert.hpp>
Modified: sandbox/statistics/support/boost/assign/v2/detail/type_traits/decay.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/type_traits/decay.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/type_traits/decay.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -13,6 +13,8 @@
#include <boost/type_traits/is_array.hpp>
#include <boost/type_traits/decay.hpp>
+// TODO (maybe) remove file
+
namespace boost{
namespace assign{
namespace v2{
Modified: sandbox/statistics/support/boost/assign/v2/put.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -10,6 +10,7 @@
#ifndef BOOST_ASSIGN_V2_PUT_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_ER_2010_HPP
+//#include <boost/assign/v2/put/concept.hpp>
#include <boost/assign/v2/put/compose.hpp>
#include <boost/assign/v2/put/generic.hpp>
#include <boost/assign/v2/put/modifier.hpp>
Modified: sandbox/statistics/support/boost/assign/v2/put/compose/functor/composer.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/compose/functor/composer.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/compose/functor/composer.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -31,7 +31,7 @@
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
#include <utility>
#include <boost/assign/v2/ref/wrapper/cpp0x.hpp>
-#include <boost/mpl/detail/variadic_vector.hpp>
+#include <boost/boost/assign/v2/temporary/variadic_vector.hpp>
#else
#include <boost/preprocessor/arithmetic/inc.hpp>
#include <boost/preprocessor/cat.hpp>
Modified: sandbox/statistics/support/boost/assign/v2/put/generic.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/generic.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/generic.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -10,11 +10,14 @@
#ifndef BOOST_ASSIGN_V2_PUT_GENERIC_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_GENERIC_ER_2010_HPP
+#include <boost/assign/v2/put/generic/concept_modifier.hpp>
+#include <boost/assign/v2/put/generic/concept_sub.hpp>
#include <boost/assign/v2/put/generic/crtp.hpp>
#include <boost/assign/v2/put/generic/expose_fun.hpp>
#include <boost/assign/v2/put/generic/expose_modifier.hpp>
#include <boost/assign/v2/put/generic/new_fun.hpp>
#include <boost/assign/v2/put/generic/new_modifier.hpp>
+#include <boost/assign/v2/put/generic/parameter.hpp>
#include <boost/assign/v2/put/generic/result_of_modulo.hpp>
#endif
Modified: sandbox/statistics/support/boost/assign/v2/put/generic/crtp.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/generic/crtp.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/generic/crtp.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -18,12 +18,14 @@
#include <boost/assign/v2/detail/type_traits/container/is_ptr_container.hpp>
#include <boost/assign/v2/detail/functor.hpp>
#include <boost/assign/v2/detail/keyword.hpp>
+#include <boost/assign/v2/detail/pp/forward.hpp>
#include <boost/assign/v2/put/modifier.hpp>
#include <boost/assign/v2/put/generic/result_of_modulo.hpp>
#include <boost/assign/v2/put/generic/expose_modifier.hpp>
#include <boost/assign/v2/put/generic/expose_fun.hpp>
#include <boost/assign/v2/put/generic/base.hpp>
+#include <boost/assign/v2/put/generic/concept_modifier.hpp>
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
@@ -62,9 +64,10 @@
};
- // Requirements:
- // d.unwrap() returns a reference to V&
- // D d(U v, F const& f); Constructs an object, d, of type D.
+ // In order for a class X, to derive from put_aux::crtp<>, it has to model
+ // concept_sub::Pre3, with respect to container V, functor F and Tag. It
+ // then models concept_sub::Post
+ //
// Usually, f is passed to the crtp. U = V& or V const& depending on need.
// Traits are deprecated but a use may be find in the future.
template<typename V,typename F, typename Tag, typename D, typename Traits>
@@ -178,14 +181,31 @@
template<typename T>
result_type arg_deduct(T* t)const
{
+ typedef put_concept::ModifierImpl<modifier_, V, T*> concept_;
+ BOOST_CONCEPT_ASSERT(( concept_ ));
this->modifier.impl( this->derived().unwrap(), t );
return this->derived();
}
+ template<typename T>
+ void check_modifier( BOOST_ASSIGN_V2_forward_param(T, t) )const
+ {
+ typedef put_concept::ModifierImpl<modifier_, V,
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
+ T&&
+#else
+ T&
+#endif
+ > concept_;
+ BOOST_CONCEPT_ASSERT(( concept_ ));
+ }
+
+#if BOOST_ASSIGN_V2_ENABLE_CPP0X
+
template<typename T>
result_type arg_deduct(T&& t)const
{
+ check_modifier( t );
this->modifier.impl(
this->derived().unwrap(),
std::forward<T>( t )
@@ -196,6 +216,7 @@
template<typename T>
result_type arg_deduct(T& t)const
{
+ check_modifier( t );
this->modifier.impl( this->derived().unwrap(), t );
return this->derived();
}
@@ -203,6 +224,7 @@
template<typename T>
result_type arg_deduct(T const& t)const
{
+ check_modifier( t );
this->modifier.impl( this->derived().unwrap(), t );
return this->derived();
}
Modified: sandbox/statistics/support/boost/assign/v2/put/generic/result_of_modulo.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/generic/result_of_modulo.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/generic/result_of_modulo.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -18,17 +18,20 @@
namespace v2{
namespace result_of_modulo{
+ // Specialize on T's that derives from crtp
template<typename T> struct new_fun{
template<typename F> struct apply{};
};
+ // Specialize on T's that derives from crtp
template<typename T> struct new_modifier{
template<typename Tag> struct apply{};
};
+
template<typename T> struct new_fun_modifier
{
Modified: sandbox/statistics/support/boost/assign/v2/put/modifier.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/modifier.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/modifier.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -12,11 +12,10 @@
#include <boost/assign/v2/put/modifier/at_next.hpp>
#include <boost/assign/v2/put/modifier/deduce.hpp>
-#include <boost/assign/v2/put/modifier/incr_lookup.hpp>
#include <boost/assign/v2/put/modifier/insert.hpp>
#include <boost/assign/v2/put/modifier/push.hpp>
#include <boost/assign/v2/put/modifier/push_back.hpp>
#include <boost/assign/v2/put/modifier/push_front.hpp>
-#include <boost/assign/v2/put/modifier/repeat.hpp>
+#include <boost/assign/v2/put/modifier/ext.hpp>
#endif
Modified: sandbox/statistics/support/boost/assign/v2/put/modifier/ext/incr_lookup.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/modifier/ext/incr_lookup.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/modifier/ext/incr_lookup.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -9,56 +9,66 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_PUT_MODIFIER_INCR_LOOKUP_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_MODIFIER_INCR_LOOKUP_ER_2010_HPP
-#include <boost/mpl/apply.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/accumulators/framework/accumulator_base.hpp>
#include <boost/assign/v2/put/modifier/def.hpp>
-#include <boost/assign/v2/detail/type_traits/value.hpp>
#include <boost/assign/v2/detail/functor/identity.hpp>
#include <boost/assign/v2/detail/pp/forward.hpp>
-#include <boost/assign/v2/put/generic/new_fun.hpp>
-#include <boost/assign/v2/put/generic/new_modifier.hpp>
+#include <boost/assign/v2/put/generic/parameter.hpp>
#include <boost/assign/v2/put/generic/result_of_modulo.hpp>
-#include <boost/assign/v2/put/generic/base.hpp>
+#include <boost/assign/v2/put/modifier/ext/xxx.hpp>
namespace boost{
namespace assign{
namespace v2{
-namespace modifier_tag{ struct incr_lookup{}; }
+namespace modifier_tag{
+
+ struct incr_lookup{};
+
+}// modifier_tag
+namespace put_parameter{
+
+ template<typename OldFun,typename OldTag>
+ struct incr_lookup : put_parameter::helper<
+ functor_aux::identity,
+ modifier_tag::incr_lookup
+ >{};
+
+}// put_parameter
namespace put_aux{
template<>
- struct modifier<v2::modifier_tag::incr_lookup>
+ struct modifier<modifier_tag::incr_lookup>
{
typedef std::size_t size_type;
modifier():n( 0 ){}
modifier(size_type const& m):n( m ){};
template<typename V,typename T>
- void impl(V& v, BOOST_ASSIGN_V2_forward_param(T, t) )const{
+ void impl(V& v, BOOST_ASSIGN_V2_forward_param(T, t) )const
+ {
v[ BOOST_ASSIGN_V2_forward_arg(T, t) ] += this->n;
}
+ // TODO T*, but is there a use for it?
+
private:
size_type n;
};
- struct param_incr_lookup
+ struct incr_lookup
{
typedef std::size_t size_type;
- param_incr_lookup() : n( 1 ){}
- param_incr_lookup(std::size_t m) : n( m ){}
+ incr_lookup() : n( 1 ){}
+ incr_lookup(size_type const& m) : n( m ){}
- param_incr_lookup
+ incr_lookup
operator=(size_type const& m)const{
- typedef param_incr_lookup result_;
+ typedef incr_lookup result_;
return result_( m );
}
- size_type const& pop()const{ return this->n; }
+ size_type const& get()const{ return this->n; }
private:
@@ -66,52 +76,9 @@
};
}// put_aux
-namespace result_of_modulo{
-
- template<typename T>
- struct incr_lookup
- {
- typedef result_of_modulo::new_fun_modifier<T> meta_;
- typedef functor_aux::identity fun_;
- typedef v2::modifier_tag::incr_lookup tag_;
- typedef typename boost::mpl::apply2<
- meta_,
- fun_,
- tag_
- >::type type;
- typedef put_aux::modifier<tag_> new_modifier_;
+BOOST_ASSIGN_V2_PUT_MODIFIER_EXT_XXX(incr_lookup)
- typedef put_aux::param_incr_lookup param_;
- static type call(const T& t, param_ const& p)
- {
- return type( t.unwrap(), _identity, param.pop() );
- }
-
- };
-
-}// result_of_modulo
-namespace put_aux{
-
- template<typename T>
- typename boost::lazy_enable_if<
- boost::is_base_of<put_aux::put_base, T>,
- result_of_modulo::incr_lookup<T>
- >::type
- operator%(
- T const& t,
- put_aux::param_incr_lookup const& kwd
- )
- {
- typedef result_of_modulo::incr_lookup<T> caller_;
- return caller_::call( t, kwd );
- }
-
-}// put_aux
-namespace{
- put_aux::param_incr_lookup const _incr_lookup
- = put_aux::param_incr_lookup();
-}
}// v2
}// assign
}// boost
Modified: sandbox/statistics/support/boost/assign/v2/put/modifier/ext/repeat.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/modifier/ext/repeat.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/modifier/ext/repeat.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -7,57 +7,69 @@
// 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_MODIFIER_REPEAT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_MODIFIER_REPEAT_ER_2010_HPP
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/accumulators/framework/accumulator_base.hpp>
-#include <boost/assign/v2/put/modifier/def.hpp>
-#include <boost/assign/v2/put/generic/base.hpp>
-#include <boost/assign/v2/put/generic/new_modifier.hpp>
-//#include <boost/assign/v2/ref/wrapper/copy.hpp>
+#ifndef BOOST_ASSIGN_V2_PUT_MODIFIER_EXT_REPEAT_ER_2010_HPP
+#define BOOST_ASSIGN_V2_PUT_MODIFIER_EXT_REPEAT_ER_2010_HPP
#include <boost/assign/v2/detail/pp/forward.hpp>
+#include <boost/assign/v2/put/modifier/def.hpp>
+#include <boost/assign/v2/put/generic/parameter.hpp>
+#include <boost/assign/v2/put/modifier/ext/xxx.hpp>
namespace boost{
namespace assign{
namespace v2{
namespace modifier_tag{
- template<typename Tag> struct repeat{};
-}// modifier_tag
+
+ template<typename OldTag> struct repeat{};
+
+}// put_aux
+namespace put_parameter{
+
+ template<typename OldFun,typename OldTag>
+ struct repeat : put_parameter::helper<
+ OldFun,
+ modifier_tag::repeat<OldTag>
+ >{ };
+
+}// put_parameter
namespace put_aux{
template<typename Tag>
- class modifier<v2::modifier_tag::repeat<Tag> >
- /*: v2::ref::wrapper<
- v2::ref::assign_tag::copy,
- std::size_t const
- >*/
+ class modifier<modifier_tag::repeat<Tag> >
{
typedef modifier<Tag> inner_;
- /*typedef v2::ref::wrapper<
- v2::ref::assign_tag::copy,
- std::size_t const
- > super_t;*/
public:
typedef std::size_t size_type;
- modifier() : n( 1 ){}
- // explicit modifier( size_type const& n ):super_t( n ){};
- explicit modifier( size_type const& n_ ) : n( n ){};
+ modifier() : n( 0 ){}
+ explicit modifier( size_type const& n_ )
+ : n( n_ )
+ {
+ }
+#define MACRO(arg)\
+ size_type m = this->n;\
+ while(m--) this->inner.impl(\
+ v,\
+ arg\
+ );\
+/**/
template<typename V, typename T>
void impl(V& v, BOOST_ASSIGN_V2_forward_param(T, t) )const
{
- size_type m = this->n; //static_cast<super_t const&>(*this).unwrap();
- while(m--) this->inner.impl(
- v,
- BOOST_ASSIGN_V2_forward_arg(T, t)
- );
+ MACRO( BOOST_ASSIGN_V2_forward_arg(T, t) )
}
+ template<typename V, typename T>
+ void impl(V& v, T* t)const
+ {
+ MACRO( t )
+ }
+
+#undef MACRO
+
size_type const& size()const{ return this->n; }
protected:
@@ -65,40 +77,25 @@
size_type n;
};
- class param_repeat
- /*: v2::ref::wrapper<
- v2::ref::assign_tag::copy,
- std::size_t const
- >*/
+ class repeat
{
- /*typedef v2::ref::wrapper<
- v2::ref::assign_tag::copy,
- std::size_t const
- > super_t;*/
-
public:
typedef std::size_t size_type;
- param_repeat(){}
- /*param_repeat( size_type const& n) : super_t( n ){}*/
- param_repeat( size_type const& n_) : n( n_ ){}
+ repeat(){}
+ repeat( size_type const& n_)
+ : n( n_ )
+ {}
- param_repeat operator=( size_type const& n_)const
+ repeat operator=( size_type const& n_)const
{
- param_repeat result( n_ );
- return result;
+ typedef repeat result_;
+ return result_( n_ );
}
- /*
- size_type const& unwrap()const
- {
- return static_cast<super_t const&>(*this).unwrap();
- }
- */
-
- size_type const& pop()const{ return this->n; }
+ size_type const& get()const{ return this->n; }
protected:
size_type n;
@@ -106,48 +103,9 @@
};
}// put_aux
-namespace result_of_modulo{
- template<typename T>
- struct repeat
- {
- typedef typename T::modifier_tag old_tag_;
- typedef v2::modifier_tag::repeat<old_tag_> new_tag_;
- typedef put_aux::modifier<new_tag_> modifier_;
- typedef typename boost::mpl::apply1<
- result_of_modulo::new_modifier<T>,
- new_tag_
- >::type type;
+BOOST_ASSIGN_V2_PUT_MODIFIER_EXT_XXX(repeat)
- typedef put_aux::param_repeat param_;
- static type call(const T& t, param_ const& p)
- {
- return type( t.unwrap(), t.fun, p.pop() );
- }
-
- };
-
-}// result_of_modulo
-namespace put_aux{
-
- template<typename T>
- typename boost::lazy_enable_if<
- boost::is_base_of<put_aux::put_base, T>,
- result_of_modulo::repeat<T>
- >::type
- operator%(
- T const& t,
- put_aux::param_repeat const& h
- )
- {
- typedef result_of_modulo::repeat<T> caller_;
- return caller_::call( t, h );
- }
-
-}// put_aux
-namespace{
- put_aux::param_repeat const _repeat = put_aux::param_repeat();
-}
}// v2
}// assign
}// boost
Modified: sandbox/statistics/support/boost/assign/v2/put/modifier/ext/xxx.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/modifier/ext/xxx.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/modifier/ext/xxx.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -7,50 +7,27 @@
// 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_MODIFIER_XXX_EXT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_MODIFIER_XXX_EXT_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_PUT_MODIFIER_EXT_XXX_ER_2010_HPP
+#define BOOST_ASSIGN_V2_PUT_MODIFIER_EXT_XXX_ER_2010_HPP
+#include <boost/preprocessor/cat.hpp>
+#include <boost/mpl/apply.hpp>
+#include <boost/mpl/quote.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_base_of.hpp>
+#include <boost/assign/v2/put/generic/base.hpp>
+#include <boost/assign/v2/put/modifier/ext/result_of_modulo.hpp>
-namespace boost{
-namespace assign{
-namespace v2{
-namespace result_of_modulo_ext{
-
- template<typename T, template<typename> class Tag>
- struct same_fun : result_of_modulo_aux::traits<T, Tag>{
-
- typedef traits<T,Tag> super_t;
- typedef result_of_modulo::new_modifier<T> meta_;
-
- typedef typename boost::mpl::apply1<meta_,
- typename super_t::new_tag_
- >::type type;
-
- template<typename P>
- static type call(const T& t, P const& p)
- {
- return type(
- t.unwrap(),
- t.fun,
- p.pop()
- );
- }
-
- };
-
-}// result_of_modulo_aux
-}// v2
-}// assign
-}// boost
-
-#define BOOST_ASSIGN_V2_PUT_MODIFIER_XXX_EXT(Param)\
-namespace boost{\
-namespace assign{\
-namespace v2{\
+#define BOOST_ASSIGN_V2_PUT_MODIFIER_EXT_XXX(Param)\
namespace result_of_modulo{\
\
template<typename T>\
- struct Param \
- : result_of_modulo_aux::same_fun<T, modulo_tag::Param>\
+ struct Param\
+ : boost::mpl::apply1<\
+ result_of_modulo::ext_generic<T>\
+ , boost::mpl::quote2<\
+ put_parameter::Param\
+ >\
+ >\
{};\
\
}\
@@ -74,9 +51,6 @@
namespace{\
put_aux::Param const BOOST_PP_CAT(_,Param) = put_aux::Param();\
}\
-}\
-}\
-}\
/**/
#endif
Modified: sandbox/statistics/support/boost/assign/v2/put/modifier/xxx.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/modifier/xxx.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/modifier/xxx.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -57,4 +57,3 @@
/**/
#endif
-
Modified: sandbox/statistics/support/boost/assign/v2/put/range.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/range.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/range.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -12,6 +12,6 @@
#include <boost/assign/v2/put/range/adaptor.hpp>
#include <boost/assign/v2/put/range/convert.hpp>
-#include <boost/assign/v2/put/range.hpp>
+// #include <boost/assign/v2/put/range.hpp> // TODO remove
#endif
Modified: sandbox/statistics/support/boost/assign/v2/put/range/adaptor.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/range/adaptor.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/range/adaptor.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -9,7 +9,10 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_PUT_RANGE_ADAPTOR_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_RANGE_ADAPTOR_ER_2010_HPP
-#include <boost/assign/v2/put/range/modifier.hpp>
+//#include <boost/assign/v2/put/range/modifier.hpp> // TODO remove
+#include <boost/range/algorithm/for_each.hpp>
+#include <boost/assign/v2/put/sub/make.hpp>
+#include <boost/assign/v2/ref/wrapper/copy.hpp>
namespace boost{
namespace assign{
@@ -17,10 +20,16 @@
namespace put_range_aux
{
template<typename From>
- struct adaptor1
+ class adaptor1 : ref::wrapper<ref::assign_tag::copy, From const>
{
- adaptor1(From const& from):value(from){}
- mutable From const& value;
+ typedef ref::wrapper<ref::assign_tag::copy, From const> super_t;
+
+ public:
+
+ adaptor1(From const& from):super_t(from){}
+
+ From const& from()const{ return this->unwrap(); }
+
private:
adaptor1();
};
@@ -37,18 +46,20 @@
};
template<typename To,typename From>
- To& operator|(To& to, put_range_aux::adaptor1<From> const& from)
+ To& operator|(To& to, put_range_aux::adaptor1<From> const& h)
{
- typedef typename put_range_aux::deduce_operation<To>::type tag_;
- put_range_aux::put_range( tag_(), from.value, to );
+ // TODO remove
+ // typedef typename put_range_aux::deduce_operation<To>::type tag_;
+ // put_range_aux::put_range( tag_(), h.from(), to );
+
+ ::boost::for_each( h.from(), put( to ) );
return to;
}
}// put_range_aux
namespace adaptor
{
- put_range_aux::adaptor2 const _put_range
- = put_range_aux::adaptor2();
+ put_range_aux::adaptor2 const _put_range = put_range_aux::adaptor2();
}// adaptor
}// v2
Modified: sandbox/statistics/support/boost/assign/v2/put/range/convert.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/range/convert.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/range/convert.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -14,7 +14,7 @@
namespace boost{
namespace assign{
namespace v2{
-namespace convert_aux
+namespace put_convert_aux
{
template<typename To>
struct adaptor
@@ -23,7 +23,7 @@
};
template<typename From,typename To>
- To operator|(From& from, convert_aux::adaptor<To> const& dummy)
+ To operator|(From& from, put_convert_aux::adaptor<To> const& dummy)
{
To to;
return to | v2::adaptor::_put_range( from );
@@ -33,21 +33,27 @@
namespace adaptor{
template<typename To>
- convert_aux::adaptor<To> convert(){ return convert_aux::adaptor<To>(); }
+ put_convert_aux::adaptor<To> put_convert()
+ {
+ return put_convert_aux::adaptor<To>();
+ }
}// adaptor
+// TODO remove
+/*
template<typename To,typename From>
To convert(From const& from){
- return from | adaptor::convert<To>();
+ return from | adaptor::put_convert<To>();
}
-
+*/
}// v2
}// assign
}// boost
#endif
+// TODO remove
// ------ CLASS MEMBER ---- //
#ifndef BOOST_ASSIGN_V2_CONVERT_CONVERT_MF
@@ -56,7 +62,7 @@
To convert()const \
{ \
namespace ns = boost::assign::v2; \
- return (*this) | adaptor::convert<To>(); \
+ return (*this) | ns::adaptor::put_convert<To>(); \
} \
/**/
#endif
@@ -67,7 +73,7 @@
operator To ()const \
{ \
namespace ns = boost::assign::v2; \
- return (*this) | adaptor::convert<To>(); \
+ return (*this) | ns::adaptor::put_convert<To>(); \
} \
/**/
Modified: sandbox/statistics/support/boost/assign/v2/put/range/modifier.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/range/modifier.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/range/modifier.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -7,6 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
+// TODO remove file
+/*
#ifndef BOOST_ASSIGN_V2_PUT_RANGE_MODIFIER_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_RANGE_MODIFIER_ER_2010_HPP
@@ -16,3 +18,4 @@
#include <boost/assign/v2/put/range/modifier/deduce.hpp>
#endif
+*/
Modified: sandbox/statistics/support/boost/assign/v2/put/range/modifier/copy.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/range/modifier/copy.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/range/modifier/copy.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -7,6 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
+// TODO remove file
+/*
#ifndef BOOST_ASSIGN_V2_PUT_RANGE_MODIFIER_COPY_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_RANGE_MODIFIER_COPY_ER_2010_HPP
#include <string>
@@ -31,7 +33,7 @@
if(boost::size( to ) < boost::size( from ) ){
typedef std::string str_;
const str_ str =
- str_("convert<to>(")
+ str_("put_convert<to>(")
+ "convert_tag::copy, from)"
+ "To::size() < boost::size( from )";
std::out_of_range e( str );
@@ -46,3 +48,4 @@
}// boost
#endif
+*/
\ No newline at end of file
Modified: sandbox/statistics/support/boost/assign/v2/put/range/modifier/deduce.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/range/modifier/deduce.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/range/modifier/deduce.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -7,6 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
+// TODO remove file
+/*
#ifndef BOOST_ASSIGN_V2_PUT_RANGE_MODIFIER_DEDUCE_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_RANGE_MODIFIER_DEDUCE_ER_2010_HPP
#include <boost/assign/v2/detail/type_traits/container/has_static_size.hpp>
@@ -60,3 +62,4 @@
}// boost
#endif
+*/
\ No newline at end of file
Modified: sandbox/statistics/support/boost/assign/v2/put/range/modifier/put.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/range/modifier/put.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/range/modifier/put.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -7,6 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
+// TODO remove file
+/*
#ifndef BOOST_ASSIGN_V2_PUT_RANGE_MODIFIER_PUT_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_RANGE_MODIFIER_PUT_ER_2010_HPP
#include <boost/range/algorithm/for_each.hpp>
@@ -38,3 +40,4 @@
}// boost
#endif
+*/
\ No newline at end of file
Modified: sandbox/statistics/support/boost/assign/v2/put/range/modifier/range.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/range/modifier/range.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/range/modifier/range.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -7,6 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
+// TODO remove file
+/*
#ifndef BOOST_ASSIGN_V2_PUT_RANGE_MODIFIER_RANGE_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_RANGE_MODIFIER_RANGE_ER_2010_HPP
#include <boost/range/begin.hpp>
@@ -37,3 +39,4 @@
}// boost
#endif
+*/
\ No newline at end of file
Modified: sandbox/statistics/support/boost/assign/v2/put/range/range.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/range/range.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/range/range.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -7,6 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
+// TODO remove file
+/*
#ifndef BOOST_ASSIGN_V2_PUT_RANGE_RANGE_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_RANGE_RANGE_ER_2010_HPP
#include <boost/assign/v2/put/range/adaptor.hpp>
@@ -15,9 +17,10 @@
namespace assign{
namespace v2{
+ // TODO remove
template<typename From,typename To>
To& put_range(From const& from, To& to)
- {
+ {
return to | adaptor::_put_range( from );
}
@@ -26,3 +29,4 @@
}// boost
#endif
+*/
\ No newline at end of file
Modified: sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/iterator.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/iterator.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/iterator.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -18,9 +18,6 @@
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/assign/v2/ref/detail/unwrap/reference.hpp>
-// Note : In Boost.Assign.v2, this is deprecated but it could be used
-// elsewhere.
-
// Calling
// *unwrap_iterator( it );
// is equivalent to
Modified: sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/range.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/range.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/range.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -16,12 +16,6 @@
#include <boost/range/iterator_range.hpp>
#include <boost/assign/v2/ref/detail/unwrap/iterator.hpp>
-// Note : In Boost.Assign.v2, this is deprecated but it could be used
-// elsewhere.
-
-
-// See iterator.hpp
-
namespace boost{
namespace assign{
namespace v2{
Modified: sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/reference.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/reference.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/detail/unwrap/reference.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -19,9 +19,6 @@
#include <boost/range/reference.hpp>
#include <boost/assign/v2/ref/wrapper/framework.hpp>
-// Note : In Boost.Assign.v2, this is deprecated but it could be used
-// elsewhere.
-
namespace boost{
namespace assign{
namespace v2{
Modified: sandbox/statistics/support/boost/assign/v2/ref/fusion_matrix/container.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/fusion_matrix/container.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/fusion_matrix/container.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -30,7 +30,6 @@
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
#include <utility>
#include <tuple>
-//#include <boost/mpl/detail/variadic_vector.hpp> // TODO remove
#else
#include <boost/preprocessor/arithmetic/dec.hpp>
#include <boost/preprocessor/cat.hpp>
Modified: sandbox/statistics/support/boost/assign/v2/ref/static_array/interface.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/static_array/interface.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/static_array/interface.hpp 2010-11-29 13:37:13 EST (Mon, 29 Nov 2010)
@@ -28,7 +28,7 @@
#include <boost/assign/v2/ref/wrapper/crtp.hpp>
#include <boost/assign/v2/ref/detail/unwrap/range.hpp>
#include <boost/assign/v2/detail/relational_op.hpp>
-#include <boost/assign/v2/put/range/convert.hpp>
+// #include <boost/assign/v2/put/range/convert.hpp> // TODO remove
namespace boost{
namespace assign{
@@ -63,9 +63,6 @@
};
- // Requirements:
- // D.impl() Returns an array of ref-wrappers
- // D.impl()const Returns a const array of ref-wrappers
template<std::size_t N, typename Tag, typename T, typename D>
class interface
: public relational_op_aux::crtp<
@@ -164,8 +161,9 @@
void assign(lvalue_& val){ this->assign_impl<lvalue_>( val ); }
void assign(rvalue_& val){ this->assign_impl<rvalue_>( val ); }
- BOOST_ASSIGN_V2_CONVERT_CONVERT_MF
- BOOST_ASSIGN_V2_CONVERT_OPERATOR_MF
+ // TODO remove
+ // BOOST_ASSIGN_V2_CONVERT_CONVERT_MF
+ // BOOST_ASSIGN_V2_CONVERT_OPERATOR_MF
// Relational op
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