Subject: [Boost-commit] svn:boost r68231 - in sandbox/statistics/support/boost/assign/v2: detail/checking detail/functor detail/traits detail/traits/container detail/traits/type put/generic put/modifier put/modifier/ext put/pipe put/pipe/csv put/pipe/functor put/pipe/functor/cpp03 put/pipe/functor/cpp0x ref/array ref/array/alloc ref/convert_traits ref/fusion ref/list_tuple ref/list_tuple/cpp03 ref/list_tuple/cpp0x ref/wrapper temporary utility/chain utility/chain/checking utility/convert
From: erwann.rogard_at_[hidden]
Date: 2011-01-18 12:48:20
Author: e_r
Date: 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
New Revision: 68231
URL: http://svn.boost.org/trac/boost/changeset/68231
Log:
upd boost/assign/v2
Text files modified:
sandbox/statistics/support/boost/assign/v2/detail/checking/array.hpp | 4 +-
sandbox/statistics/support/boost/assign/v2/detail/checking/deduce_check.hpp | 6 +-
sandbox/statistics/support/boost/assign/v2/detail/functor/constructor.hpp | 4 +-
sandbox/statistics/support/boost/assign/v2/detail/functor/crtp_unary_and_up.hpp | 10 ++--
sandbox/statistics/support/boost/assign/v2/detail/functor/identity.hpp | 6 +-
sandbox/statistics/support/boost/assign/v2/detail/functor/new.hpp | 4 +-
sandbox/statistics/support/boost/assign/v2/detail/traits/container.hpp | 3 -
sandbox/statistics/support/boost/assign/v2/detail/traits/container/has_push.hpp | 2
sandbox/statistics/support/boost/assign/v2/detail/traits/container/has_static_size.hpp | 48 -------------------------
sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_array.hpp | 26 ++++---------
sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_associative.hpp | 2
sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_fifo.hpp | 21 +++-------
sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_lifo.hpp | 22 ++++-------
sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_map.hpp | 26 +++++--------
sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_set.hpp | 26 +++++--------
sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_sorted.hpp | 23 ++++-------
sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_static_array.hpp | 48 -------------------------
sandbox/statistics/support/boost/assign/v2/detail/traits/container/ptr_to_value.hpp | 12 +++---
sandbox/statistics/support/boost/assign/v2/detail/traits/container/static_size.hpp | 4 +-
sandbox/statistics/support/boost/assign/v2/detail/traits/container/value.hpp | 2
sandbox/statistics/support/boost/assign/v2/detail/traits/container/value_container.hpp | 4 +-
sandbox/statistics/support/boost/assign/v2/detail/traits/switch.hpp | 6 +-
sandbox/statistics/support/boost/assign/v2/detail/traits/type/decay.hpp | 2
sandbox/statistics/support/boost/assign/v2/detail/traits/type/has_value_type.hpp | 2
sandbox/statistics/support/boost/assign/v2/detail/traits/type/is_stl_pair.hpp | 4 +-
sandbox/statistics/support/boost/assign/v2/detail/traits/type/or_const.hpp | 6 +-
sandbox/statistics/support/boost/assign/v2/detail/traits/type/value.hpp | 2
sandbox/statistics/support/boost/assign/v2/put/generic/crtp.hpp | 6 +-
sandbox/statistics/support/boost/assign/v2/put/generic/new_fun.hpp | 4 +-
sandbox/statistics/support/boost/assign/v2/put/generic/new_modifier.hpp | 4 +-
sandbox/statistics/support/boost/assign/v2/put/generic/result_of_modulo.hpp | 6 +-
sandbox/statistics/support/boost/assign/v2/put/modifier/deduce.hpp | 6 +-
sandbox/statistics/support/boost/assign/v2/put/modifier/ext/iterate.hpp | 2
sandbox/statistics/support/boost/assign/v2/put/modifier/ext/repeat.hpp | 2
sandbox/statistics/support/boost/assign/v2/put/modifier/ext/result_of_modulo.hpp | 12 +++---
sandbox/statistics/support/boost/assign/v2/put/modifier/ext/xxx.hpp | 2
sandbox/statistics/support/boost/assign/v2/put/pipe/csv/container.hpp | 2
sandbox/statistics/support/boost/assign/v2/put/pipe/csv/generator.hpp | 10 ++--
sandbox/statistics/support/boost/assign/v2/put/pipe/forward_pars.hpp | 10 ++--
sandbox/statistics/support/boost/assign/v2/put/pipe/functor/container.hpp | 24 ++++++------
sandbox/statistics/support/boost/assign/v2/put/pipe/functor/cpp03/forward.hpp | 10 ++--
sandbox/statistics/support/boost/assign/v2/put/pipe/functor/cpp0x/forward.hpp | 10 ++--
sandbox/statistics/support/boost/assign/v2/ref/array/alloc/lazy.hpp | 2
sandbox/statistics/support/boost/assign/v2/ref/array/interface.hpp | 8 ++--
sandbox/statistics/support/boost/assign/v2/ref/convert_traits/value.hpp | 2
sandbox/statistics/support/boost/assign/v2/ref/fusion/assign_array.hpp | 16 ++++----
sandbox/statistics/support/boost/assign/v2/ref/fusion/container.hpp | 20 +++++-----
sandbox/statistics/support/boost/assign/v2/ref/fusion/head_holder.hpp | 2
sandbox/statistics/support/boost/assign/v2/ref/fusion/make.hpp | 4 +-
sandbox/statistics/support/boost/assign/v2/ref/fusion/nil_arg.hpp | 2
sandbox/statistics/support/boost/assign/v2/ref/fusion/nth_result_of.hpp | 6 +-
sandbox/statistics/support/boost/assign/v2/ref/fusion/policy.hpp | 2
sandbox/statistics/support/boost/assign/v2/ref/fusion/root.hpp | 2
sandbox/statistics/support/boost/assign/v2/ref/list_tuple/cpp03/container.hpp | 13 ++----
sandbox/statistics/support/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp | 6 +-
sandbox/statistics/support/boost/assign/v2/ref/list_tuple/extraction.hpp | 8 ++--
sandbox/statistics/support/boost/assign/v2/ref/list_tuple/nth_result_of.hpp | 6 +-
sandbox/statistics/support/boost/assign/v2/ref/wrapper/get.hpp | 40 ++++++++++++++++++---
sandbox/statistics/support/boost/assign/v2/temporary/variadic_sequence.hpp | 2
sandbox/statistics/support/boost/assign/v2/utility/chain/adaptor.hpp | 2
sandbox/statistics/support/boost/assign/v2/utility/chain/checking/twin_values.hpp | 10 +++--
sandbox/statistics/support/boost/assign/v2/utility/chain/iterator.hpp | 2
sandbox/statistics/support/boost/assign/v2/utility/chain/result.hpp | 2
sandbox/statistics/support/boost/assign/v2/utility/chain/use_lvalue.hpp | 4 +-
sandbox/statistics/support/boost/assign/v2/utility/convert/check.hpp | 74 ++++++++++++++++++++++++++++++++++++---
sandbox/statistics/support/boost/assign/v2/utility/convert/convert.hpp | 39 --------------------
sandbox/statistics/support/boost/assign/v2/utility/convert/converter.hpp | 2
sandbox/statistics/support/boost/assign/v2/utility/convert/deduce.hpp | 3 -
sandbox/statistics/support/boost/assign/v2/utility/convert/dispatch.hpp | 22 ++++++++++-
sandbox/statistics/support/boost/assign/v2/utility/convert/helper.hpp | 2
sandbox/statistics/support/boost/assign/v2/utility/convert/predicate.hpp | 8 ++--
71 files changed, 338 insertions(+), 408 deletions(-)
Modified: sandbox/statistics/support/boost/assign/v2/detail/checking/array.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/checking/array.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/checking/array.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -11,7 +11,7 @@
#define BOOST_ASSIGN_V2_CHECKING_ARRAY_ER_2010_HPP
#include <boost/assign/v2/detail/checking/check.hpp>
#include <boost/assign/v2/detail/checking/constants.hpp>
-#include <boost/assign/v2/detail/traits/container/is_static_array.hpp>
+#include <boost/assign/v2/detail/traits/container/is_array.hpp>
namespace boost{
namespace assign{
@@ -19,7 +19,7 @@
namespace checking{
template<typename V>
- void do_check(v2::container_tag::static_array, V const& ar1)
+ void do_check(v2::container_tag::array, V const& ar1)
{
BOOST_ASSIGN_V2_CHECK( !ar1.empty() );
V ar = ar1;
Modified: sandbox/statistics/support/boost/assign/v2/detail/checking/deduce_check.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/checking/deduce_check.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/checking/deduce_check.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -13,7 +13,7 @@
#include <boost/assign/v2/detail/traits/container/is_lifo.hpp>
#include <boost/assign/v2/detail/traits/container/is_map.hpp>
#include <boost/assign/v2/detail/traits/container/is_sorted.hpp>
-#include <boost/assign/v2/detail/traits/container/is_static_array.hpp>
+#include <boost/assign/v2/detail/traits/container/is_array.hpp>
#include <boost/assign/v2/detail/traits/container/is_range.hpp>
#include <boost/assign/v2/detail/traits/switch.hpp>
@@ -56,8 +56,8 @@
template<>
struct case_<switch_tag::deduce_check, 4> :
switch_aux::helper<
- v2::container_tag::static_array,
- v2::container_traits::is_static_array
+ v2::container_tag::array,
+ v2::container_traits::is_array
>{};
template<>
Modified: sandbox/statistics/support/boost/assign/v2/detail/functor/constructor.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/functor/constructor.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/functor/constructor.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -36,7 +36,7 @@
#else
: public functor_aux::crtp_unary_and_up<
functor_aux::constructor<T>,
- boost::mpl::always<T>
+ ::boost::mpl::always<T>
>
#endif
{
@@ -56,7 +56,7 @@
}
#else
protected:
- typedef boost::mpl::always<T> meta_result_;
+ typedef ::boost::mpl::always<T> meta_result_;
typedef functor_aux::crtp_unary_and_up<this_, meta_result_> super_;
public:
Modified: sandbox/statistics/support/boost/assign/v2/detail/functor/crtp_unary_and_up.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/functor/crtp_unary_and_up.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/functor/crtp_unary_and_up.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -89,9 +89,9 @@
#define MACRO1(r, SeqU) \
template<BOOST_ASSIGN_V2_decl_params(SeqU)> \
- typename boost::mpl::apply1< \
+ typename ::boost::mpl::apply1< \
F, \
- boost::mpl::vector<BOOST_ASSIGN_V2_params(SeqU)> \
+ ::boost::mpl::vector<BOOST_ASSIGN_V2_params(SeqU)> \
>::type \
operator()( BOOST_ASSIGN_V2_decl_args(SeqU) )const{ \
return this->derived().template impl<BOOST_ASSIGN_V2_params(SeqU)>( \
@@ -117,7 +117,7 @@
#define MACRO(z, N, data) \
template<BOOST_PP_ENUM_PARAMS(N, typename T)> \
- typename boost::mpl::apply1< \
+ typename ::boost::mpl::apply1< \
F, \
BOOST_PP_CAT(boost::mpl::vector,N)<BOOST_PP_ENUM_PARAMS(N, T)> \
>::type \
@@ -128,9 +128,9 @@
} \
\
template<BOOST_PP_ENUM_PARAMS(N, typename T)> \
- typename boost::mpl::apply1< \
+ typename ::boost::mpl::apply1< \
F, \
- boost::mpl::vector<BOOST_PP_ENUM_PARAMS(N, const T)> \
+ ::boost::mpl::vector<BOOST_PP_ENUM_PARAMS(N, const T)> \
>::type \
operator()( BOOST_PP_ENUM_BINARY_PARAMS(N, T, const &_) )const{ \
return this->derived().template impl< \
Modified: sandbox/statistics/support/boost/assign/v2/detail/functor/identity.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/functor/identity.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/functor/identity.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -33,7 +33,7 @@
struct result_of_identity{
template<typename V>
- struct is_ok : boost::mpl::equal_to<
+ struct is_ok : ::boost::mpl::equal_to<
boost::mpl::int_<1>,
boost::mpl::size<V>
>{};
@@ -41,7 +41,7 @@
template<typename V>
struct enable
{
- typedef typename boost::mpl::at_c<V, 0>::type t_;
+ typedef typename ::boost::mpl::at_c<V, 0>::type t_;
typedef typename boost::add_reference<t_>::type type;
};
@@ -49,7 +49,7 @@
struct disable{};
template<typename V>
- struct apply : boost::mpl::eval_if<
+ struct apply : ::boost::mpl::eval_if<
is_ok<V>,
enable<V>,
disable<V>
Modified: sandbox/statistics/support/boost/assign/v2/detail/functor/new.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/functor/new.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/functor/new.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -36,7 +36,7 @@
#else
: public functor_aux::crtp_unary_and_up<
functor_aux::new_<T>,
- boost::mpl::always<T*>
+ ::boost::mpl::always<T*>
>
#endif
{
@@ -59,7 +59,7 @@
}
#else
protected:
- typedef boost::mpl::always< ptr_ > meta_result_;
+ typedef ::boost::mpl::always< ptr_ > meta_result_;
typedef functor_aux::crtp_unary_and_up<this_, meta_result_> super_;
public:
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -11,7 +11,6 @@
#define BOOST_ASSIGN_V2_TRAITS_CONTAINER_ER_2010_HPP
#include <boost/assign/v2/detail/traits/container/has_push.hpp>
-#include <boost/assign/v2/detail/traits/container/has_static_size.hpp>
#include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
#include <boost/assign/v2/detail/traits/container/is_associative.hpp>
#include <boost/assign/v2/detail/traits/container/is_fifo.hpp>
@@ -21,7 +20,7 @@
#include <boost/assign/v2/detail/traits/container/is_range.hpp>
#include <boost/assign/v2/detail/traits/container/is_set.hpp>
#include <boost/assign/v2/detail/traits/container/is_sorted.hpp>
-#include <boost/assign/v2/detail/traits/container/is_static_array.hpp> // TODO
+#include <boost/assign/v2/detail/traits/container/is_array.hpp>
#include <boost/assign/v2/detail/traits/container/ptr_to_value.hpp>
#include <boost/assign/v2/detail/traits/container/ptr_to_value_container.hpp>
#include <boost/assign/v2/detail/traits/container/static_size.hpp>
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/has_push.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/has_push.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/has_push.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -41,7 +41,7 @@
value = sizeof( test((V*)0) ) == sizeof( yes_ )
);
- typedef boost::mpl::bool_<value> type;
+ typedef ::boost::mpl::bool_<value> type;
};
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/has_static_size.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/has_static_size.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/has_static_size.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -1,47 +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_TRAITS_CONTAINER_HAS_STATIC_SIZE_ER_2010_HPP
-#define BOOST_ASSIGN_V2_TRAITS_CONTAINER_HAS_STATIC_SIZE_ER_2010_HPP
-#include <boost/assign/v2/detail/fwd/ptr_container.hpp>
-#include <boost/mpl/bool.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace container_traits{
-
- template<typename T>
- struct has_static_size{
- typedef typename T::size_type size_type;
- typedef char yes;
- typedef char (&no)[2];
- typedef const size_type sig;
-
- template<typename U,sig> struct sfinae { };
- template<typename U> static yes test(sfinae<U, U::static_size>*);
- template<typename U> static no test(...);
-
- BOOST_STATIC_CONSTANT(
- bool,
- value = sizeof( test<T>(0) ) == sizeof( yes )
- );
-
- typedef boost::mpl::bool_<value> type;
- };
-
- template<typename T,std::size_t N,typename C>
- struct has_static_size< boost::ptr_array<T, N, C> > : boost::mpl::true_{};
-
-}// container_traits
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_array.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_array.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_array.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -9,11 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_ARRAY_ER_2010_HPP
#define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_ARRAY_ER_2010_HPP
-/*
-#include <boost/mpl/bool.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-//#include <boost/assign/v2/detail/traits/container/has_static_size.hpp>
-#include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
+#include <boost/assign/v2/detail/traits/container/is.hpp>
namespace boost{
@@ -25,27 +21,21 @@
namespace assign{
namespace v2{
namespace container_tag{
- struct static_array{};
+ struct array{};
}// container_tag
-namespace container_type_aux{
+namespace container_traits_aux{
- template<typename V> struct is_array : boost::mpl::false_{};
- template<typename V> struct is_array<
+ template<typename V> struct is_array : ::boost::mpl::false_{};
+ template<typename T, std::size_t sz> struct is_array<
boost::array<T, sz>
- > : boost::mpl::true_{};
+ > : ::boost::mpl::true_{};
}// containert_type_aux
-namespace container_traits{
- template<typename V>
- struct is_array : forward_to_value<
- is_array_impl,
- typename boost::remove_cv<V>::type
- >{};
+ BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS(array)
-}// container_traits
}// v2
}// assign
}// boost
-*/
+
#endif
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_associative.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_associative.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_associative.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -22,7 +22,7 @@
namespace container_traits{
template<typename V>
- struct is_associative : boost::mpl::or_<
+ struct is_associative : ::boost::mpl::or_<
container_traits::is_set<V>,
container_traits::is_map<V>
>{};
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_fifo.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_fifo.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_fifo.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -9,11 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_FIFO_ER_2010_HPP
#define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_FIFO_ER_2010_HPP
-#include <boost/mpl/bool.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/assign/v2/detail/fwd/container.hpp>
-#include <boost/assign/v2/detail/traits/container/is_ptr_container.hpp>
-#include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
+#include <boost/assign/v2/detail/traits/container/is.hpp>
namespace boost{
namespace assign{
@@ -21,22 +17,19 @@
namespace container_tag{
struct fifo{};
}// container_tag
-namespace container_traits{
+namespace container_traits_aux{
template<typename V>
- struct is_fifo_impl : boost::mpl::false_{};
+ struct is_fifo : ::boost::mpl::false_{};
template<typename T,typename A>
- struct is_fifo_impl< std::queue<T,A> > : boost::mpl::true_{};
+ struct is_fifo< std::queue<T,A> > : ::boost::mpl::true_{};
- template<typename V>
- struct is_fifo : forward_to_value<
- is_fifo_impl,
- typename boost::remove_cv<V>::type
- >{};
+}// container_traits_aux
-}// container_traits
+ BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS(fifo)
+
}// v2
}// assign
}// boost
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_lifo.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_lifo.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_lifo.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -9,11 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_LIFO_ER_2010_HPP
#define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_LIFO_ER_2010_HPP
-#include <boost/mpl/bool.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/assign/v2/detail/fwd/container.hpp>
-#include <boost/assign/v2/detail/traits/container/is_ptr_container.hpp>
-#include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
+#include <boost/assign/v2/detail/traits/container/is.hpp>
namespace boost{
namespace assign{
@@ -21,21 +17,19 @@
namespace container_tag{
struct lifo{};
}// container_tag
-namespace container_traits{
+namespace container_traits_aux{
template<typename V>
- struct is_lifo_impl : boost::mpl::false_{};
+ struct is_lifo : ::boost::mpl::false_{};
template<typename T,typename A>
- struct is_lifo_impl< std::stack<T,A> > : boost::mpl::true_{};
+ struct is_lifo< std::stack<T,A> > : ::boost::mpl::true_{};
- template<typename V>
- struct is_lifo : forward_to_value<
- is_lifo_impl,
- typename boost::remove_cv<V>::type
- >{};
+}// container_traits_aux
+
+
+ BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS(lifo)
-}// container_traits
}// v2
}// assign
}// boost
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_map.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_map.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_map.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -9,11 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_MAP_ER_2010_HPP
#define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_MAP_ER_2010_HPP
-#include <boost/mpl/bool.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/assign/v2/detail/fwd/container.hpp>
-#include <boost/assign/v2/detail/traits/container/is_ptr_container.hpp>
-#include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
+#include <boost/assign/v2/detail/traits/container/is.hpp>
namespace boost{
namespace assign{
@@ -21,23 +17,21 @@
namespace container_tag{
struct map{};
}// container_tag
-namespace container_traits{
+namespace container_traits_aux{
template<typename V>
- struct is_map_impl : boost::mpl::false_{};
+ struct is_map : ::boost::mpl::false_{};
template<typename K,typename D,typename C,typename A>
- struct is_map_impl<
+ struct is_map<
std::map<K,D,C,A>
- > : boost::mpl::true_{};
-
- template<typename V>
- struct is_map : forward_to_value<
- is_map_impl,
- typename boost::remove_cv<V>::type
- >{};
+ > : ::boost::mpl::true_{};
-}// container_traits
+}// container_traits_aux
+
+
+ BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS(map)
+
}// v2
}// assign
}// boost
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_set.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_set.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_set.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -9,11 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_SET_ER_2010_HPP
#define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_SET_ER_2010_HPP
-#include <boost/mpl/bool.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/assign/v2/detail/fwd/container.hpp>
-#include <boost/assign/v2/detail/traits/container/is_ptr_container.hpp>
-#include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
+#include <boost/assign/v2/detail/traits/container/is.hpp>
namespace boost{
namespace assign{
@@ -21,23 +17,21 @@
namespace container_tag{
struct set{};
}// container_tag
-namespace container_traits{
+namespace container_traits_aux{
template<typename V>
- struct is_set_impl : boost::mpl::false_{};
+ struct is_set : ::boost::mpl::false_{};
template<typename K,typename C,typename A>
- struct is_set_impl<
+ struct is_set<
std::set<K,C,A>
- > : boost::mpl::true_{};
+ > : ::boost::mpl::true_{};
+
+}// container_traits_aux
+
+
+ BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS(set)
- template<typename V>
- struct is_set : forward_to_value<
- is_set_impl,
- typename boost::remove_cv<V>::type
- >{};
-
-}// container_traits
}// v2
}// assign
}// boost
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_sorted.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_sorted.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_sorted.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -9,10 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_SORTED_ER_2010_HPP
#define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_SORTED_ER_2010_HPP
-#include <boost/mpl/bool.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/assign/v2/detail/fwd/container.hpp>
-#include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
+#include <boost/assign/v2/detail/traits/container/is.hpp>
namespace boost{
namespace assign{
@@ -20,24 +17,22 @@
namespace container_tag{
struct sorted{};
}// container_tag
-namespace container_traits{
+namespace container_traits_aux{
template<typename V>
- struct is_sorted_impl : boost::mpl::false_{};
+ struct is_sorted : ::boost::mpl::false_{};
template<typename T,typename C,typename A>
- struct is_sorted_impl< std::set<T,C,A> > : boost::mpl::true_{};
+ struct is_sorted< std::set<T,C,A> > : ::boost::mpl::true_{};
template<typename K,typename T,typename C,typename A>
- struct is_sorted_impl< std::map<K,T,C,A> > : boost::mpl::true_{};
+ struct is_sorted< std::map<K,T,C,A> > : ::boost::mpl::true_{};
- template<typename V>
- struct is_sorted : forward_to_value<
- is_sorted_impl,
- typename boost::remove_cv<V>::type
- >{};
+}// container_traits_aux
+
+
+ BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS(sorted)
-}// container_traits
}// v2
}// assign
}// boost
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_static_array.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_static_array.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/is_static_array.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -1,47 +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_TRAITS_CONTAINER_IS_STATIC_ARRAY_ER_2010_HPP
-#define BOOST_ASSIGN_V2_TRAITS_CONTAINER_IS_STATIC_ARRAY_ER_2010_HPP
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/assign/v2/detail/traits/container/has_static_size.hpp>
-#include <boost/assign/v2/detail/traits/container/forward_to_value.hpp>
-
-namespace boost{
-
-// this here is necessary to avoid compiler error in <boost/array.hpp>
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
- template< class T, std::size_t sz >
- class array;
-#endif
-
-namespace assign{
-namespace v2{
-namespace container_tag{
- struct static_array{};
-}// container_tag
-namespace container_traits{
-
- // TODO also check that operator[] exists
-
- template<typename T>
- struct is_static_array_impl : has_static_size<T>{};
-
- template<typename V>
- struct is_static_array : forward_to_value<
- is_static_array_impl,
- typename boost::remove_cv<V>::type
- >{};
-
-}// container_traits
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/ptr_to_value.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/ptr_to_value.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/ptr_to_value.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -25,7 +25,7 @@
template<typename V>
struct ptr_to_value{
- struct is_applicable : boost::mpl::false_{};
+ struct is_applicable : ::boost::mpl::false_{};
};
@@ -43,7 +43,7 @@
struct common
{
- struct is_applicable : boost::mpl::true_{};
+ struct is_applicable : ::boost::mpl::true_{};
typedef typename boost::remove_reference<
typename V::reference
@@ -56,18 +56,18 @@
};
template<typename V,template<typename, std::size_t> class F>
- struct static_array_like{
+ struct array_like{
// there is no allocator, hence can't derive from common<V>
- struct is_applicable : boost::mpl::true_{};
+ struct is_applicable : ::boost::mpl::true_{};
typedef typename boost::remove_reference<
typename V::reference
>::type value_type;
typedef F<
- typename static_array_like::value_type,
+ typename array_like::value_type,
container_traits::static_size<V>::value
> container_type;
@@ -145,7 +145,7 @@
>
struct ptr_to_value<
boost::ptr_array<T,N,A>
- > : ptr_to_value_aux::static_array_like<
+ > : ptr_to_value_aux::array_like<
boost::ptr_array<T,N,A>,
boost::array
>{};
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/static_size.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/static_size.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/static_size.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -28,13 +28,13 @@
template<typename T,std::size_t N>
struct static_size< boost::array<T,N> >
- : boost::mpl::size_t<
+ : ::boost::mpl::size_t<
boost::array<T,N>::static_size
>{};
template<typename T,std::size_t N,typename C>
struct static_size< boost::ptr_array<T, N, C> >
- : boost::mpl::size_t<
+ : ::boost::mpl::size_t<
N
>{};
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/value.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/value.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/value.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -28,7 +28,7 @@
// range_value<V>, is available.
// Think about ptr_container in making this change.
template<typename V>
- struct value : forward_to_value<
+ struct value : container_traits::forward_to_value<
type_traits::value,
V
>{};
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/container/value_container.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/container/value_container.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/container/value_container.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -20,10 +20,10 @@
namespace container_traits{
template<typename V>
- struct value_container : boost::mpl::eval_if<
+ struct value_container : ::boost::mpl::eval_if<
is_ptr_container<V>,
ptr_to_value_container<V>,
- boost::mpl::identity<V>
+ ::boost::mpl::identity<V>
>{};
}// container_traits
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/switch.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/switch.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/switch.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -31,7 +31,7 @@
template<typename SwitchTag, int k> struct case_{};
template<typename T>
- struct default_f : boost::mpl::true_{};
+ struct default_f : ::boost::mpl::true_{};
template<typename Tag, template<typename> class F = switch_aux::default_f>
struct helper
@@ -50,8 +50,8 @@
};
template<typename SwitchTag, typename T, int k = 0>
- struct result : boost::mpl::eval_if<
- boost::mpl::apply1< switch_aux::case_<SwitchTag, k>, T >,
+ struct result : ::boost::mpl::eval_if<
+ ::boost::mpl::apply1< switch_aux::case_<SwitchTag, k>, T >,
switch_aux::extract_tag< switch_aux::case_<SwitchTag, k> >,
switch_aux::result< SwitchTag, T, k + 1>
>{};
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/type/decay.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/type/decay.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/type/decay.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -21,7 +21,7 @@
// To support string literals properly
template< class T >
- struct decay : boost::mpl::eval_if<
+ struct decay : ::boost::mpl::eval_if<
::boost::is_array<T>,
::boost::decay<const T>,
::boost::decay<T> >
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/type/has_value_type.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/type/has_value_type.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/type/has_value_type.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -33,7 +33,7 @@
bool,
value = sizeof( test((T*)0) ) == sizeof( yes_ )
);
- typedef boost::mpl::bool_<value> type;
+ typedef ::boost::mpl::bool_<value> type;
};
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/type/is_stl_pair.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/type/is_stl_pair.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/type/is_stl_pair.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -23,10 +23,10 @@
// boost::type_traits::no_type is_pair( ... );
template<typename T>
- struct is_stl_pair : boost::mpl::false_{};
+ struct is_stl_pair : ::boost::mpl::false_{};
template<typename T,typename U>
- struct is_stl_pair< std::pair<T, U> > : boost::mpl::true_{};
+ struct is_stl_pair< std::pair<T, U> > : ::boost::mpl::true_{};
}// type_traits
}// v2
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/type/or_const.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/type/or_const.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/type/or_const.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -18,16 +18,16 @@
namespace v2{
namespace type_traits{
-template<typename ...Args> struct or_const : boost::mpl::false_{};
+template<typename ...Args> struct or_const : ::boost::mpl::false_{};
template<typename T, typename ...Args>
-struct or_const<T, Args...> : boost::mpl::or_<
+struct or_const<T, Args...> : ::boost::mpl::or_<
boost::is_const<T>,
or_const<Args...>
>{};
template<typename T, typename ...Args>
-struct or_const<T const, Args...> : boost::mpl::true_{};
+struct or_const<T const, Args...> : ::boost::mpl::true_{};
}// type_traits
}// v2
Modified: sandbox/statistics/support/boost/assign/v2/detail/traits/type/value.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/detail/traits/type/value.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/detail/traits/type/value.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -18,7 +18,7 @@
namespace type_traits{
template<typename V>
- struct value_impl : boost::mpl::identity<
+ struct value_impl : ::boost::mpl::identity<
typename V::value_type
>{};
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 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -55,7 +55,7 @@
typedef typename v2::container_traits::value<
V
>::type value_type;
- typedef typename boost::mpl::eval_if<
+ typedef typename ::boost::mpl::eval_if<
container_traits::is_ptr_container<V>,
functor_aux::deduce_new_<V>,
functor_aux::deduce_constructor<V>
@@ -125,7 +125,7 @@
protected:
typedef functor_aux::crtp_unary_and_up<
crtp,
- boost::mpl::always<result_type>
+ ::boost::mpl::always<result_type>
> super_t;
public:
@@ -155,7 +155,7 @@
{
typedef functor_aux::deduce_constructor<V> caller_;
typedef typename caller_::type cons_;
- typedef typename boost::mpl::apply1<
+ typedef typename ::boost::mpl::apply1<
v2::result_of_modulo::new_fun<D>,
cons_
>::type type;
Modified: sandbox/statistics/support/boost/assign/v2/put/generic/new_fun.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/generic/new_fun.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/generic/new_fun.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -30,13 +30,13 @@
};
template<typename T,typename F1>
- typename boost::mpl::apply1<result_of_modulo::new_fun<T>, F1>::type
+ typename ::boost::mpl::apply1<result_of_modulo::new_fun<T>, F1>::type
operator%(
T const& t,
put_aux::new_fun<F1> const& h
)
{
- typedef typename boost::mpl::apply1<
+ typedef typename ::boost::mpl::apply1<
result_of_modulo::new_fun<T>,
F1
>::type result_;
Modified: sandbox/statistics/support/boost/assign/v2/put/generic/new_modifier.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/generic/new_modifier.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/generic/new_modifier.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -41,7 +41,7 @@
};
template<typename T,typename NewTag>
- typename boost::mpl::apply1<
+ typename ::boost::mpl::apply1<
v2::result_of_modulo::new_modifier<T>,
NewTag
>::type
@@ -50,7 +50,7 @@
put_aux::set_modifier<NewTag> const& h
)
{
- typedef typename boost::mpl::apply1<
+ typedef typename ::boost::mpl::apply1<
v2::result_of_modulo::new_modifier<T>,
NewTag
>::type result_;
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 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -38,12 +38,12 @@
template<typename F,typename Tag>
struct apply
{
- typedef typename boost::mpl::apply1<
+ typedef typename ::boost::mpl::apply1<
new_fun<T>,
F
>::type new_fun_;
typedef result_of_modulo::new_modifier<new_fun_> new_modifier_;
- typedef typename boost::mpl::apply1<
+ typedef typename ::boost::mpl::apply1<
new_modifier_,
Tag
>::type type;
@@ -52,7 +52,7 @@
};
template<typename T>
- struct generic
+ struct generic_
{
template<typename P>
Modified: sandbox/statistics/support/boost/assign/v2/put/modifier/deduce.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/modifier/deduce.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/modifier/deduce.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -16,7 +16,7 @@
#include <boost/assign/v2/detail/traits/switch.hpp>
-#include <boost/assign/v2/detail/traits/container/is_static_array.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>
@@ -46,7 +46,7 @@
struct case_<switch_tag::deduce_put, 1> :
switch_aux::helper<
v2::modifier_tag::iterate,
- v2::container_traits::is_static_array
+ v2::container_traits::is_array
>{};
template<>
@@ -81,7 +81,7 @@
}
template<typename Option1,typename Option2>
- struct deduce : boost::mpl::eval_if<
+ struct deduce : ::boost::mpl::eval_if<
boost::is_same<Option1, boost::use_default>,
boost::mpl::identity<Option2>,
boost::mpl::identity<Option1>
Modified: sandbox/statistics/support/boost/assign/v2/put/modifier/ext/iterate.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/modifier/ext/iterate.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/modifier/ext/iterate.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -69,7 +69,7 @@
mutable std::size_t i;
};
- template<typename Arg = boost::mpl::na>
+ template<typename Arg = ::boost::mpl::na>
class iterate
{
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 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -82,7 +82,7 @@
size_type n;
};
- template<typename Arg = boost::mpl::na>
+ template<typename Arg = ::boost::mpl::na>
class repeat
{
Modified: sandbox/statistics/support/boost/assign/v2/put/modifier/ext/result_of_modulo.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/modifier/ext/result_of_modulo.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/modifier/ext/result_of_modulo.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -34,7 +34,7 @@
typedef typename T::fun_type old_fun_;
typedef typename T::modifier_tag old_tag;
- typedef typename boost::mpl::apply2<
+ typedef typename ::boost::mpl::apply2<
FParameter,
old_fun_,
old_tag
@@ -44,13 +44,13 @@
typedef typename boost::is_same<fun_, old_fun_>::type is_same_fun;
- typedef typename boost::mpl::eval_if<
+ typedef typename ::boost::mpl::eval_if<
is_same_fun,
- boost::mpl::apply1<
+ ::boost::mpl::apply1<
v2::result_of_modulo::new_modifier<T>,
tag
>,
- boost::mpl::apply2<
+ ::boost::mpl::apply2<
v2::result_of_modulo::new_fun_modifier<T>,
fun_,
tag
@@ -64,11 +64,11 @@
{
return type( v, f, m );
}
- static fun_ make_fun(const T& t, boost::mpl::false_)
+ static fun_ make_fun(const T& t, ::boost::mpl::false_)
{
return fun_();
}
- static fun_ make_fun(const T& t, boost::mpl::true_)
+ static fun_ make_fun(const T& t, ::boost::mpl::true_)
{
return t.fun;
}
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 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -22,7 +22,7 @@
\
template<typename T, typename Arg>\
struct Param\
- : boost::mpl::apply1<\
+ : ::boost::mpl::apply1<\
result_of_modulo::ext_generic<T>\
, put_parameter::Param<Arg>\
>\
Modified: sandbox/statistics/support/boost/assign/v2/put/pipe/csv/container.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/pipe/csv/container.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/pipe/csv/container.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -24,7 +24,7 @@
{
typedef boost::use_default tag2_;
typedef v2::ref::assign_copy::nth_result_of::fusion<tag2_> meta1_;
- typedef typename boost::mpl::apply1<
+ typedef typename ::boost::mpl::apply1<
meta1_,
Pars
>::type pars_cont_type;
Modified: sandbox/statistics/support/boost/assign/v2/put/pipe/csv/generator.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/pipe/csv/generator.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/pipe/csv/generator.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -43,23 +43,23 @@
namespace v2{
namespace put_pipe_aux{
- template<typename Pars = boost::mpl::vector0<> >
+ template<typename Pars = ::boost::mpl::vector0<> >
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 ::boost::mpl::na na_;
public:
BOOST_STATIC_CONSTANT(
std::size_t,
- static_parameters_size = boost::mpl::size<Pars>::value
+ static_parameters_size = ::boost::mpl::size<Pars>::value
);
- typedef typename boost::mpl::apply1<
+ typedef typename ::boost::mpl::apply1<
meta1_,
Pars
>::type pars_cont_type;
@@ -71,7 +71,7 @@
template<typename T>
struct modulo_result
{
- typedef typename boost::mpl::push_back<
+ typedef typename ::boost::mpl::push_back<
Pars,
T const
>::type new_;
Modified: sandbox/statistics/support/boost/assign/v2/put/pipe/forward_pars.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/pipe/forward_pars.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/pipe/forward_pars.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -21,12 +21,12 @@
namespace put_pipe_aux{
template<std::size_t N, typename Pars, typename T,
- bool exit = (N == boost::mpl::size<Pars>::value)>
+ bool exit = (N == ::boost::mpl::size<Pars>::value)>
struct result_of_forward_pars
{
- typedef typename boost::mpl::at_c<Pars, N>::type at_;
- typedef result_of_modulo::generic<T> meta_;
- typedef typename boost::mpl::apply1<meta_, at_>::type new_t_;
+ typedef typename ::boost::mpl::at_c<Pars, N>::type at_;
+ typedef result_of_modulo::generic_<T> meta_;
+ typedef typename ::boost::mpl::apply1<meta_, at_>::type new_t_;
typedef result_of_forward_pars<N+1, Pars, new_t_> next_;
@@ -35,7 +35,7 @@
template<typename H>
static type call(H const& h, T const& t)
{
- typedef boost::mpl::int_<N> int_;
+ typedef ::boost::mpl::int_<N> int_;
return next_::call(
h,
t % h.static_lookup( int_() )
Modified: sandbox/statistics/support/boost/assign/v2/put/pipe/functor/container.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/pipe/functor/container.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/pipe/functor/container.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -37,8 +37,8 @@
namespace put_pipe_aux{
template<
- typename Pars = boost::mpl::vector0<>,
- typename SeqArgs = boost::mpl::vector0<>,
+ typename Pars = ::boost::mpl::vector0<>,
+ typename SeqArgs = ::boost::mpl::vector0<>,
bool enable_pars = (boost::mpl::size<SeqArgs>::value == 0)
>
class container;
@@ -50,7 +50,7 @@
template<typename V>
struct apply
{
- typedef typename boost::mpl::push_back<
+ typedef typename ::boost::mpl::push_back<
SeqArgs,
V
>::type new_;
@@ -79,7 +79,7 @@
template<typename...Args>
struct apply : helper_::template apply<
- typename boost::mpl::detail::variadic_vector<
+ typename ::boost::mpl::detail::variadic_vector<
Args...
>::type
>
@@ -114,19 +114,19 @@
BOOST_STATIC_CONSTANT(
std::size_t,
- static_pars_size = boost::mpl::size<Pars>::value
+ static_pars_size = ::boost::mpl::size<Pars>::value
);
BOOST_STATIC_CONSTANT(
std::size_t,
- seq_args_size = boost::mpl::size<SeqArgs>::value
+ seq_args_size = ::boost::mpl::size<SeqArgs>::value
);
- typedef typename boost::mpl::apply1<
+ typedef typename ::boost::mpl::apply1<
meta1_,
Pars
>::type pars_cont_type;
- typedef typename boost::mpl::apply1<
+ typedef typename ::boost::mpl::apply1<
meta2_,
SeqArgs
>::type seq_args_cont_type;
@@ -143,7 +143,7 @@
template<typename T>
struct modulo_result
{
- typedef typename boost::mpl::push_back<
+ typedef typename ::boost::mpl::push_back<
Pars,
T const
>::type new_;
@@ -210,7 +210,7 @@
container_result<Pars, SeqArgs, enable_pars>
> super_t;
- typedef boost::mpl::vector0<> v0_;
+ typedef ::boost::mpl::vector0<> v0_;
public:
@@ -232,12 +232,12 @@
#define MACRO2(z, N1, data)\
template<BOOST_PP_ENUM_PARAMS(N1, typename U)>\
typename result<\
- boost::mpl::vector<\
+ ::boost::mpl::vector<\
BOOST_PP_ENUM_PARAMS(N1, U)\
>\
>::type\
impl( BOOST_PP_ENUM_BINARY_PARAMS(N1, U, &_) )const{\
- typedef boost::mpl::vector<\
+ typedef ::boost::mpl::vector<\
BOOST_PP_ENUM_PARAMS(N1, U)\
> v_;\
typedef typename result<v_>::type result_;\
Modified: sandbox/statistics/support/boost/assign/v2/put/pipe/functor/cpp03/forward.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/pipe/functor/cpp03/forward.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/pipe/functor/cpp03/forward.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -52,7 +52,7 @@
>
void forward(
F const& f ,
- boost::mpl::int_<N>,
+ ::boost::mpl::int_<N>,
ref::list_tuple_aux::container<N, L, params(T)> const& list
)
{}
@@ -63,16 +63,16 @@
>
void forward(
F const& f ,
- boost::mpl::int_<I>,
+ ::boost::mpl::int_<I>,
ref::list_tuple_aux::container<N, L, params(T)> const& list
)
{
{
- typedef boost::mpl::int_<I> int_;
+ typedef ::boost::mpl::int_<I> int_;
forward( f, list.get( int_() ) );
}
{
- typedef boost::mpl::int_<I+1> next_;
+ typedef ::boost::mpl::int_<I+1> next_;
forward( f, next_(), list );
}
}
@@ -94,7 +94,7 @@
ref::list_tuple_aux::container<N, L, params(T)> const& list
)
{
- typedef boost::mpl::int_<0> int_;
+ typedef ::boost::mpl::int_<0> int_;
forward(f, int_(), list);
}
Modified: sandbox/statistics/support/boost/assign/v2/put/pipe/functor/cpp0x/forward.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/put/pipe/functor/cpp0x/forward.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/put/pipe/functor/cpp0x/forward.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -52,7 +52,7 @@
>
void forward(
F const& f ,
- boost::mpl::int_<N>,
+ ::boost::mpl::int_<N>,
ref::list_tuple_aux::container<N, L, Args...> const& list
)
{}
@@ -63,16 +63,16 @@
>
void forward(
F const& f ,
- boost::mpl::int_<I>,
+ ::boost::mpl::int_<I>,
ref::list_tuple_aux::container<N, L, Args...> const& list
)
{
{
- typedef boost::mpl::int_<I> int_;
+ typedef ::boost::mpl::int_<I> int_;
forward( f, list.get( int_() ) );
}
{
- typedef boost::mpl::int_<I+1> next_;
+ typedef ::boost::mpl::int_<I+1> next_;
forward( f, next_(), list );
}
}
@@ -91,7 +91,7 @@
ref::list_tuple_aux::container<N, L, Args...> const& list
)
{
- typedef boost::mpl::int_<0> int_;
+ typedef ::boost::mpl::int_<0> int_;
forward(f, int_(), list);
}
Modified: sandbox/statistics/support/boost/assign/v2/ref/array/alloc/lazy.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/array/alloc/lazy.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/array/alloc/lazy.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -33,7 +33,7 @@
T
>::array_type impl_;
- typedef boost::mpl::int_<N> size_;
+ typedef ::boost::mpl::int_<N> size_;
void alloc_if()const{
if(!this->ptr){
Modified: sandbox/statistics/support/boost/assign/v2/ref/array/interface.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/array/interface.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/array/interface.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -149,22 +149,22 @@
void assign(param_type val)
{
- typedef boost::mpl::int_<0> int_;
+ typedef ::boost::mpl::int_<0> int_;
this->assign_impl( val, int_() );
}
protected:
- void assign_impl(param_type val, boost::mpl::int_<static_size>)
+ void assign_impl(param_type val, ::boost::mpl::int_<static_size>)
{
/* exit */
}
template<int i>
- void assign_impl(param_type val, boost::mpl::int_<i>)
+ void assign_impl(param_type val, ::boost::mpl::int_<i>)
{
this->wrappers()[i] = val;
- typedef boost::mpl::int_<i+1> next_;
+ typedef ::boost::mpl::int_<i+1> next_;
this->assign_impl( val, next_() );
}
Modified: sandbox/statistics/support/boost/assign/v2/ref/convert_traits/value.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/convert_traits/value.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/convert_traits/value.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -32,7 +32,7 @@
// TODO upgrade
// #include <boost/type_traits/is_arithmetic.hpp>
// #include <boost/numeric/conversion/conversion_traits.hpp>
- // struct value : boost::mpl::eval_if<
+ // struct value : ::boost::mpl::eval_if<
// mpl::and_<is_arithmetic<V1>, is_arithmetic<V2> >,
// boost::numeric::conversion_traits<V1, V2>::supertype.
// ... as above ...
Modified: sandbox/statistics/support/boost/assign/v2/ref/fusion/assign_array.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/fusion/assign_array.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/fusion/assign_array.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -29,7 +29,7 @@
std::size_t N, typename L, typename Tag1, typename Tag2, typename T
>
void assign_array(
- boost::mpl::true_ /*exit*/,
+ ::boost::mpl::true_ /*exit*/,
A& a,
const fusion_aux::container<N, L, Tag1, Tag2, T>& f
)
@@ -42,16 +42,16 @@
std::size_t N, typename L, typename Tag1, typename Tag2,typename T
>
void assign_array(
- boost::mpl::false_ /*exit*/,
+ ::boost::mpl::false_ /*exit*/,
A& a,
const fusion_aux::container<N, L, Tag1, Tag2, T>& f
)
{
- typedef boost::mpl::int_<K-1> index_;
+ typedef ::boost::mpl::int_<K-1> index_;
a[ K - 1 ].rebind( f.static_lookup( index_() ) ) ;
typedef index_ next_size_;
- typedef boost::mpl::int_<0> zero_;
- typedef typename boost::mpl::equal_to<next_size_,zero_>::type exit_;
+ typedef ::boost::mpl::int_<0> zero_;
+ typedef typename ::boost::mpl::equal_to<next_size_,zero_>::type exit_;
assign_array<K-1>( exit_(), a, f );
}
@@ -65,9 +65,9 @@
{
// don't replace by size_::value <= N (causes warning)
BOOST_STATIC_ASSERT( A::static_size <= N );
- typedef boost::mpl::int_<0> zero_;
- typedef boost::mpl::int_<A::static_size> size_;
- typedef typename boost::mpl::equal_to<size_, zero_>::type exit_;
+ typedef ::boost::mpl::int_<0> zero_;
+ typedef ::boost::mpl::int_<A::static_size> size_;
+ typedef typename ::boost::mpl::equal_to<size_, zero_>::type exit_;
fusion_aux::assign_array<size_::value>( exit_(), a, f );
}
Modified: sandbox/statistics/support/boost/assign/v2/ref/fusion/container.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/fusion/container.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/fusion/container.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -35,9 +35,9 @@
namespace fusion_aux{
template<std::size_t N, typename L,typename Tag1, typename Tag2, typename T>
- struct interface : boost::mpl::apply4<
+ struct interface : ::boost::mpl::apply4<
fusion_aux::policy<Tag2>,
- boost::mpl::int_<N>, L, Tag1, T
+ ::boost::mpl::int_<N>, L, Tag1, T
>{};
template<
@@ -48,10 +48,10 @@
public fusion_aux::interface<N, L, Tag1, Tag2, T>::type
{
- typedef boost::mpl::int_<0> int0_;
- typedef boost::mpl::int_<1> int1_;
- typedef boost::mpl::int_<N> size_;
- typedef typename boost::mpl::minus<size_,int1_>::type index_;
+ typedef ::boost::mpl::int_<0> int0_;
+ typedef ::boost::mpl::int_<1> int1_;
+ typedef ::boost::mpl::int_<N> size_;
+ typedef typename ::boost::mpl::minus<size_,int1_>::type index_;
typedef Tag1 assign_tag_;
typedef typename fusion_aux::interface<
@@ -73,7 +73,7 @@
typedef std::size_t size_type;
BOOST_STATIC_CONSTANT(std::size_t, static_size = N);
- typedef typename boost::mpl::equal_to<size_,int0_>::type is_empty_;
+ typedef typename ::boost::mpl::equal_to<size_,int0_>::type is_empty_;
explicit container(){}
explicit container(const L& l, T& h)
@@ -114,16 +114,16 @@
// ---- static_lookup ---- //
template<int I>
- struct is_head : boost::mpl::bool_< I + 1 == N >{};
+ struct is_head : ::boost::mpl::bool_< I + 1 == N >{};
template<int I>
struct link_result_static_lookup : L::template
result_static_lookup<I>{};
template<int I>
- struct result_static_lookup : boost::mpl::eval_if<
+ struct result_static_lookup : ::boost::mpl::eval_if<
is_head<I>,
- boost::mpl::identity<T&>,
+ ::boost::mpl::identity<T&>,
link_result_static_lookup<I>
>{};
Modified: sandbox/statistics/support/boost/assign/v2/ref/fusion/head_holder.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/fusion/head_holder.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/fusion/head_holder.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -48,7 +48,7 @@
public:
- typedef boost::mpl::void_ head_value_type;
+ typedef ::boost::mpl::void_ head_value_type;
head_value_type back()const
{
Modified: sandbox/statistics/support/boost/assign/v2/ref/fusion/make.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/fusion/make.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/fusion/make.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -27,9 +27,9 @@
namespace result_of{
template<typename Tag1,typename Tag2,typename Tnil>
- struct fusion_nil : boost::mpl::apply1<
+ struct fusion_nil : ::boost::mpl::apply1<
nth_result_of::fusion<Tag1, Tag2, Tnil>,
- boost::mpl::vector0<>
+ ::boost::mpl::vector0<>
>{};
}// result_of
Modified: sandbox/statistics/support/boost/assign/v2/ref/fusion/nil_arg.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/fusion/nil_arg.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/fusion/nil_arg.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -18,7 +18,7 @@
namespace ref{
namespace fusion_aux{
- typedef boost::mpl::void_ nil_arg_type;
+ typedef ::boost::mpl::void_ nil_arg_type;
}// fusion_aux
}// ref
Modified: sandbox/statistics/support/boost/assign/v2/ref/fusion/nth_result_of.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/fusion/nth_result_of.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/fusion/nth_result_of.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -50,10 +50,10 @@
struct result : State::template result<T>{};
template<typename Vec>
- struct apply : boost::mpl::fold<
+ struct apply : ::boost::mpl::fold<
Vec,
state_,
- result<boost::mpl::_1, boost::mpl::_2>
+ result<boost::mpl::_1, ::boost::mpl::_2>
>{};
};
@@ -67,7 +67,7 @@
struct fusion
{
template<typename Vec>
- struct apply : boost::mpl::apply1<
+ struct apply : ::boost::mpl::apply1<
fusion_aux::nth_result<Tag1, Tag2, Tnil>,
Vec
>{};
Modified: sandbox/statistics/support/boost/assign/v2/ref/fusion/policy.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/fusion/policy.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/fusion/policy.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -26,7 +26,7 @@
struct policy{};
template<>
- struct policy<boost::use_default> : boost::mpl::always<
+ struct policy<boost::use_default> : ::boost::mpl::always<
boost::mpl::empty_base
>{};
Modified: sandbox/statistics/support/boost/assign/v2/ref/fusion/root.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/fusion/root.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/fusion/root.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -17,7 +17,7 @@
namespace ref{
namespace fusion_aux{
- typedef boost::mpl::void_ root_type;
+ typedef ::boost::mpl::void_ root_type;
}// fusion_aux
}// ref
Modified: sandbox/statistics/support/boost/assign/v2/ref/list_tuple/cpp03/container.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/list_tuple/cpp03/container.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/list_tuple/cpp03/container.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -83,13 +83,10 @@
> type;
#undef MACRO
- BOOST_STATIC_CONSTANT(
- int,
- size = ::boost::tuples::length<type>::value
- );
};
+
template<typename NewState>
struct result
{
@@ -132,10 +129,10 @@
cont_,
boost::mpl::unpack_args<meta_result_>
> crtp_;
- typedef typename boost::mpl::eval_if_c<
+ typedef typename ::boost::mpl::eval_if_c<
N == 0,
- boost::mpl::identity< boost::mpl::empty_base >,
- boost::mpl::identity< link<L> >
+ ::boost::mpl::identity< ::boost::mpl::empty_base >,
+ ::boost::mpl::identity< link<L> >
>::type link_;
};
@@ -161,7 +158,7 @@
BOOST_STATIC_CONSTANT( size_type, static_get_size = N );
BOOST_STATIC_CONSTANT(
size_type,
- static_tuple_size = tuple_::size
+ static_tuple_size = ::boost::tuples::length<tuple_>::value
);
container()
Modified: sandbox/statistics/support/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/list_tuple/cpp0x/container.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -57,10 +57,10 @@
template<int N, typename L, typename...Args>
class container :
- boost::mpl::eval_if_c<
+ ::boost::mpl::eval_if_c<
N == 0,
- boost::mpl::identity< boost::mpl::empty_base >,
- boost::mpl::identity< link<L> >
+ ::boost::mpl::identity< ::boost::mpl::empty_base >,
+ ::boost::mpl::identity< link<L> >
>::type,
public list_tuple_aux::extraction<
N, L,
Modified: sandbox/statistics/support/boost/assign/v2/ref/list_tuple/extraction.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/list_tuple/extraction.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/list_tuple/extraction.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -35,15 +35,15 @@
public:
template<int I>
- struct is_head : boost::mpl::bool_< I + 1 == N >{};
+ struct is_head : ::boost::mpl::bool_< I + 1 == N >{};
template<int I>
struct link_get_result : L::template get_result<I>{};
template<int I>
- struct get_result : boost::mpl::eval_if<
+ struct get_result : ::boost::mpl::eval_if<
is_head<I>,
- boost::mpl::identity<
+ ::boost::mpl::identity<
T const&
>,
link_get_result<I>
@@ -64,7 +64,7 @@
is_head<I>,
get_result<I>
>::type
- get( boost::mpl::int_<I> index )const
+ get( ::boost::mpl::int_<I> index )const
{
return this->derived().get_link().unlink.get( index );
}
Modified: sandbox/statistics/support/boost/assign/v2/ref/list_tuple/nth_result_of.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/list_tuple/nth_result_of.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/list_tuple/nth_result_of.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -30,8 +30,8 @@
template<typename NewState, typename Vec>
struct apply{
typedef list_tuple_aux::result<NewState> meta_;
- typedef boost::mpl::unpack_args< meta_ > g_;
- typedef typename boost::mpl::apply1<
+ typedef ::boost::mpl::unpack_args< meta_ > g_;
+ typedef typename ::boost::mpl::apply1<
g_,
Vec
>::type type;
@@ -42,7 +42,7 @@
public:
template<typename VecTypes>
- struct apply : boost::mpl::fold<
+ struct apply : ::boost::mpl::fold<
VecTypes,
state_,
forward_op
Modified: sandbox/statistics/support/boost/assign/v2/ref/wrapper/get.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/ref/wrapper/get.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/ref/wrapper/get.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -9,12 +9,22 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_REF_WRAPPER_GET_ER_2010_HPP
#define BOOST_ASSIGN_V2_REF_WRAPPER_GET_ER_2010_HPP
+#include <boost/config.hpp>
#include <boost/ref.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/remove_reference.hpp>
+#include <boost/type_traits/remove_cv.hpp>
#include <boost/range/reference.hpp>
-#include <boost/range/adaptor/transformed.hpp>
+#include <boost/range/value_type.hpp>
+
+// [ MSVC
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/iterator_range.hpp>
+#include <boost/iterator/transform_iterator.hpp>
+//#include <boost/range/adaptor/transformed.hpp>
+// ]
namespace boost{
namespace assign{
@@ -72,9 +82,15 @@
template<typename R>
struct range_get_impl{
- typedef ref::get_functor functor_;
- typedef boost::range_detail::transform_range<functor_, R> type;
-
+ typedef ref::get_functor f_;
+ // [ MSCV
+ //typedef boost::range_detail::transform_range<f_, R> type;
+ typedef boost::iterator_range<
+ boost::transform_iterator< f_,
+ BOOST_DEDUCED_TYPENAME boost::range_iterator<R>::type
+ >
+ > type;
+ // ]
};
template<typename R>
@@ -94,14 +110,26 @@
range_get(R& r)
{
typedef typename ref::result_of::range_get<R>::type result_;
- return result_(get_functor(), r);
+ // [ MSVC
+// return result_(get_functor(), r);
+ return result_(
+ boost::make_transform_iterator( boost::begin(r), get_functor() ),
+ boost::make_transform_iterator( boost::end(r), get_functor() )
+ );
+ // ]
}
template<typename R>
typename ref::result_of::range_get<R const>::type
range_get(R const& r)
{
typedef typename ref::result_of::range_get<R const>::type result_;
- return result_(get_functor(), r);
+ // [ MSVC
+// return result_(get_functor(), r);
+ return result_(
+ boost::make_transform_iterator( boost::begin(r), get_functor() ),
+ boost::make_transform_iterator( boost::end(r), get_functor() )
+ );
+ // ]_
}
struct get_adaptor{};
Modified: sandbox/statistics/support/boost/assign/v2/temporary/variadic_sequence.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/temporary/variadic_sequence.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/temporary/variadic_sequence.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -43,7 +43,7 @@
}// boost
#define BOOST_MPL_DETAIL_VARIADIC_SEQUENCE_arg(z, n, data) \
- typename boost::mpl::detail::variadic_sequence_aux::nth_arg< \
+ typename ::boost::mpl::detail::variadic_sequence_aux::nth_arg< \
n, data, Args...\
>::type \
/**/
Modified: sandbox/statistics/support/boost/assign/v2/utility/chain/adaptor.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/chain/adaptor.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/chain/adaptor.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -17,7 +17,7 @@
namespace v2{
namespace chain_aux{
- typedef boost::mpl::void_ void_;
+ typedef ::boost::mpl::void_ void_;
// Tag1 controls conversion. Seet traits/type/meta_convert.hpp
Modified: sandbox/statistics/support/boost/assign/v2/utility/chain/checking/twin_values.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/chain/checking/twin_values.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/chain/checking/twin_values.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -14,6 +14,8 @@
#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/is_same.hpp>
#include <boost/range/algorithm/copy.hpp>
#include <boost/assign/v2/detail/checking/range.hpp>
#include <boost/assign/v2/ref/wrapper/get.hpp>
@@ -33,16 +35,16 @@
{
typedef v2::chain_aux::use_lvalue<cr1_, cr2_> use_lvalue_;
BOOST_STATIC_ASSERT( use_lvalue_::value == the_value );
- typedef typename boost::mpl::eval_if_c<
+ typedef typename ::boost::mpl::eval_if_c<
the_value,
- boost::mpl::identity<boost::mpl::void_>, // why?
+ ::boost::mpl::identity<boost::mpl::void_>, // why?
v2::result_of::chain<cr1_, cr2_>
>::type result_;
}
template<bool x, typename T>
-struct add_const_if : boost::mpl::eval_if_c<
- x, boost::add_const<T>, boost::mpl::identity<T>
+struct add_const_if : ::boost::mpl::eval_if_c<
+ x, boost::add_const<T>, ::boost::mpl::identity<T>
>{};
template<typename T, bool qual_v1, bool qual_e2, bool qual_v2, bool the_value>
Modified: sandbox/statistics/support/boost/assign/v2/utility/chain/iterator.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/chain/iterator.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/chain/iterator.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -32,7 +32,7 @@
typedef typename boost::iterator_reference<It2>::type ref2_;
typedef assign::v2::type_traits::meta_convert<Tag> convert_;
- typedef typename boost::mpl::apply2<
+ typedef typename ::boost::mpl::apply2<
convert_,
ref1_,
ref2_
Modified: sandbox/statistics/support/boost/assign/v2/utility/chain/result.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/chain/result.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/chain/result.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -21,7 +21,7 @@
template<typename R1,typename R2,typename Tag = use_default>
struct result{
- typedef typename boost::mpl::eval_if<
+ typedef typename ::boost::mpl::eval_if<
chain_aux::use_lvalue<R1,R2,Tag>,
boost::mpl::identity< chain_aux::range_l<R1, R2, Tag> >,
boost::mpl::identity< chain_aux::range_r<R1, R2, Tag> >
Modified: sandbox/statistics/support/boost/assign/v2/utility/chain/use_lvalue.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/chain/use_lvalue.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/chain/use_lvalue.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -32,10 +32,10 @@
typename boost::remove_reference<U1>::type
>::value
>
- struct use_lvalue_impl : boost::mpl::false_{};
+ struct use_lvalue_impl : ::boost::mpl::false_{};
template<typename U>
- struct use_lvalue_impl<U, U, true, false> : boost::mpl::true_{};
+ struct use_lvalue_impl<U, U, true, false> : ::boost::mpl::true_{};
template<typename R1, typename R2, typename Tag = use_default>
struct use_lvalue : use_lvalue_impl<
Modified: sandbox/statistics/support/boost/assign/v2/utility/convert/check.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/convert/check.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/convert/check.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -16,9 +16,13 @@
#include <set>
#include <stack>
#include <vector>
+#include <boost/mpl/assert.hpp>
#include <boost/type.hpp>
#include <boost/array.hpp>
+#include <boost/type_traits/is_same.hpp>
#include <boost/assign/v2/utility/convert/converter.hpp>
+#include <boost/assign/v2/utility/convert/deduce.hpp>
+#include <boost/assign/v2/utility/convert/predicate.hpp>
#include <boost/assign/v2/detail/checking/fwd.hpp>
// Don't include this file in v2/utility/convert.hpp
@@ -43,15 +47,71 @@
template<typename From>
void do_check(From const& from)
{
+ namespace as2 = boost::assign::v2;
namespace ns = checking::convert;
+
+ typedef boost::array<int, 8> ar_;
+ typedef std::deque<int> deque_;
+ typedef std::list<int> list_;
+ typedef std::queue<int> queue_;
+ typedef std::set<int> set_;
+ typedef std::stack<int> stack_;
+ typedef std::vector<int> vec_;
+
+ BOOST_MPL_ASSERT(( as2::convert_aux::use_put<ar_, From> ));
+ BOOST_MPL_ASSERT(( as2::convert_aux::use_put<stack_, From> ));
+ BOOST_MPL_ASSERT(( as2::convert_aux::use_put<queue_, From> ));
+ BOOST_MPL_ASSERT_NOT(( as2::convert_aux::use_put<deque_, From> ));
+ BOOST_MPL_ASSERT_NOT(( as2::convert_aux::use_put<list_, From> ));
+ BOOST_MPL_ASSERT_NOT(( as2::convert_aux::use_put<set_, From> ));
+ BOOST_MPL_ASSERT_NOT(( as2::convert_aux::use_put<vec_, From> ));
+
+ BOOST_MPL_ASSERT(( boost::is_same<
+ typename as2::convert_aux::deduce_tag<ar_, From>::type,
+ convert_tag::put
+ >
+ ));
+ BOOST_MPL_ASSERT(( boost::is_same<
+ typename as2::convert_aux::deduce_tag<stack_, From>::type,
+ convert_tag::put
+ >
+ ));
+ BOOST_MPL_ASSERT(( boost::is_same<
+ typename as2::convert_aux::deduce_tag<queue_, From>::type,
+ convert_tag::put
+ >
+ ));
+ BOOST_MPL_ASSERT(( boost::is_same<
+ typename as2::convert_aux::deduce_tag<deque_, From>::type,
+ convert_tag::copy
+ >
+ ));
+ BOOST_MPL_ASSERT(( boost::is_same<
+ typename as2::convert_aux::deduce_tag<list_, From>::type,
+ convert_tag::copy
+ >
+ ));
+ BOOST_MPL_ASSERT(( boost::is_same<
+ typename as2::convert_aux::deduce_tag<set_, From>::type,
+ convert_tag::copy
+ >
+ ));
+ BOOST_MPL_ASSERT(( boost::is_same<
+ typename as2::convert_aux::deduce_tag<vec_, From>::type,
+ convert_tag::copy
+ >
+ ));
+
+
// From is specified in case it is either of those in the lhs below.
- ns::do_check<boost::array<int, 8>, From >( from );
- ns::do_check<std::deque<int>, From >( from );
- ns::do_check<std::list<int>, From >( from );
- ns::do_check<std::queue<int>, From >( from );
- ns::do_check<std::set<int>, From >( from );
- ns::do_check<std::stack<int>, From >( from );
- ns::do_check<std::vector<int>, From >( from );
+ ns::do_check<queue_, From >( from );
+ ns::do_check<stack_, From >( from );
+ ns::do_check<ar_, From >( from );
+
+ ns::do_check<deque_, From >( from );
+ ns::do_check<list_, From >( from );
+ ns::do_check<set_, From >( from );
+ ns::do_check<vec_, From >( from );
}
}// convert
Modified: sandbox/statistics/support/boost/assign/v2/utility/convert/convert.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/convert/convert.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/convert/convert.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -1,38 +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_CONVERT_CONVERT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_CONVERT_CONVERT_ER_2010_HPP
-#include <boost/range/begin.hpp>
-#include <boost/range/end.hpp>
-#include <boost/assign/v2/put/pipe/range.hpp>
-#include <boost/assign/v2/utility/convert/tag.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-
- template<typename T, typename U>
- T convert(U const& u, convert_tag::put)
- {
- T t; (t | v2::_put_range( u ) );
- return t;
- }
-
- template<typename T, typename U>
- T convert(U const& u, convert_tag::copy)
- {
- return T( boost::begin( u ), boost::end( u ) );
- }
-
-}// v2
-}// assign
-}// boost
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/statistics/support/boost/assign/v2/utility/convert/converter.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/convert/converter.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/convert/converter.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -42,7 +42,7 @@
T type()const
{
typedef typename convert_aux::deduce_tag<T, U>::type tag_;
- return convert<T>( this->w.get(), tag_() );
+ return convert_aux::dispatch<T>( this->w.get(), tag_() );
}
private:
Modified: sandbox/statistics/support/boost/assign/v2/utility/convert/deduce.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/convert/deduce.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/convert/deduce.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -9,10 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_CONVERT_DEDUCE_ER_2010_HPP
#define BOOST_ASSIGN_V2_CONVERT_DEDUCE_ER_2010_HPP
-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/identity.hpp>
#include <boost/mpl/pair.hpp>
-#include <boost/type_traits/is_same.hpp>
#include <boost/assign/v2/detail/traits/switch.hpp>
#include <boost/assign/v2/utility/convert/tag.hpp>
#include <boost/assign/v2/utility/convert/helper.hpp>
Modified: sandbox/statistics/support/boost/assign/v2/utility/convert/dispatch.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/convert/dispatch.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/convert/dispatch.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -11,26 +11,42 @@
#define BOOST_ASSIGN_V2_CONVERT_DISPATCH_ER_2010_HPP
#include <boost/range/begin.hpp>
#include <boost/range/end.hpp>
+#include <boost/detail/workaround.hpp>
+
+#ifdef BOOST_MSVC
+#include <boost/range/algorithm/for_each.hpp>
+#include <boost/assign/v2/put/sub.hpp>
+#else
#include <boost/assign/v2/put/pipe/range.hpp>
+#endif
+
#include <boost/assign/v2/utility/convert/tag.hpp>
namespace boost{
namespace assign{
namespace v2{
+namespace convert_aux{
template<typename T, typename U>
- T convert(U const& u, convert_tag::put)
+ T dispatch(U const& u, convert_tag::put)
{
- T t; (t | v2::_put_range( u ) );
+ T t;
+ #ifdef BOOST_MSVC
+ ::boost::for_each( u, v2::put( t ) );
+ #else
+ (t | v2::_put_range( u ) );
+ #endif
+
return t;
}
template<typename T, typename U>
- T convert(U const& u, convert_tag::copy)
+ T dispatch(U const& u, convert_tag::copy)
{
return T( boost::begin( u ), boost::end( u ) );
}
+}// convert_aux
}// v2
}// assign
}// boost
Modified: sandbox/statistics/support/boost/assign/v2/utility/convert/helper.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/convert/helper.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/convert/helper.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -20,7 +20,7 @@
// two arguments.
template<typename T, typename U>
- struct default_f : boost::mpl::true_{};
+ struct default_f : ::boost::mpl::true_{};
template<typename Tag,
template<typename, typename> class F = convert_aux::default_f>
Modified: sandbox/statistics/support/boost/assign/v2/utility/convert/predicate.hpp
==============================================================================
--- sandbox/statistics/support/boost/assign/v2/utility/convert/predicate.hpp (original)
+++ sandbox/statistics/support/boost/assign/v2/utility/convert/predicate.hpp 2011-01-18 12:48:10 EST (Tue, 18 Jan 2011)
@@ -10,7 +10,7 @@
#ifndef BOOST_ASSIGN_V2_CONVERT_TRAITS_ER_2010_HPP
#define BOOST_ASSIGN_V2_CONVERT_TRAITS_ER_2010_HPP
#include <boost/mpl/or.hpp>
-#include <boost/assign/v2/detail/traits/container/is_static_array.hpp>
+#include <boost/assign/v2/detail/traits/container/is_array.hpp>
#include <boost/assign/v2/detail/traits/container/has_push.hpp>
namespace boost{
@@ -19,11 +19,11 @@
namespace convert_aux{
template<typename T, typename U>
- struct use_put : boost::mpl::or_<
- v2::container_traits::is_static_array<T>,
+ struct use_put : ::boost::mpl::or_<
+ v2::container_traits::is_array<T>,
v2::container_traits::has_push<T>
>{};
-
+
}// convert_aux
}// v2
}// assign