Subject: [Boost-commit] svn:boost r55572 - in sandbox/SOC/2009/fusion/boost/fusion: . adapted adapted/detail/array adapted/detail/boost_tuple adapted/struct algorithm/iteration algorithm/iteration/detail algorithm/query algorithm/query/detail algorithm/transformation algorithm/transformation/detail algorithm/transformation/detail/pp algorithm/transformation/detail/variadic_templates container/detail container/detail/pp container/detail/variadic_templates container/generation container/generation/detail/pp container/generation/detail/variadic_templates container/list container/list/detail/cons container/map container/set container/vector container/vector/detail/pp container/vector/detail/variadic_templates functional/generation/detail include iterator iterator/detail mpl sequence sequence/comparison sequence/intrinsic sequence/io sequence/io/detail support support/detail support/variadic_templates tuple view/detail view/filter_view view/iterator_range view/joint_view view/reverse_view view/single_view view/transform_view view/transform_view/detail view/zip_view view/zip_view/detail
From: mr.chr.schmidt_at_[hidden]
Date: 2009-08-13 14:47:01
Author: cschmidt
Date: 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
New Revision: 55572
URL: http://svn.boost.org/trac/boost/changeset/55572
Log:
cleanup
Removed:
sandbox/SOC/2009/fusion/boost/fusion/support/assert.hpp
sandbox/SOC/2009/fusion/boost/fusion/support/assign_tags.hpp
sandbox/SOC/2009/fusion/boost/fusion/support/detail/
sandbox/SOC/2009/fusion/boost/fusion/support/dummy_tag.hpp
sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp
sandbox/SOC/2009/fusion/boost/fusion/support/result_of.hpp
sandbox/SOC/2009/fusion/boost/fusion/support/sequence_assign.hpp
sandbox/SOC/2009/fusion/boost/fusion/support/template.hpp
sandbox/SOC/2009/fusion/boost/fusion/support/to_random_access_mpl_seq.hpp
sandbox/SOC/2009/fusion/boost/fusion/support/variadic_templates/
Text files modified:
sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_array.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_tuple.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/tag_of.hpp | 7 ++-
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/tag_of.hpp | 7 ++-
sandbox/SOC/2009/fusion/boost/fusion/adapted/mpl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/adapted/std_array.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/adapted/std_pair.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/adapted/struct/adapt_assoc_struct.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/adapted/struct/adapt_struct.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/accumulate.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/detail/fold.hpp | 25 ++++++--------
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/for_each.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/all.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/any.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/count.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/count_if.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/all.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/none.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/clear.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/filter_key_view.hpp | 9 ++--
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/pp/zip.hpp | 30 +++++++++-------
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/replace_if.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/variadic_templates/zip.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase_key.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/filter.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/filter_if.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert_range.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/join.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_back.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_front.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/push_back.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/push_front.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/remove.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/remove_if.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace_if.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/reverse.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/transform.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/container/detail/convert_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/detail/pp/as_seq.hpp | 13 ++++--
sandbox/SOC/2009/fusion/boost/fusion/container/detail/pp/forward_ctor.hpp | 14 ++++----
sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/as_seq.hpp | 8 ++--
sandbox/SOC/2009/fusion/boost/fusion/container/generation/cons_tie.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/make_map.hpp | 26 +++++++-------
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/make_seq.hpp | 22 ++++++------
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/map_tie.hpp | 28 ++++++++-------
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/seq_tie.hpp | 22 ++++++------
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_map.hpp | 10 ++--
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_seq.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/map_tie.hpp | 10 ++--
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/seq_tie.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/generation/make_cons.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/generation/pair_tie.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/container/list/cons.hpp | 22 ++++++------
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/at_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/cons_iterator.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/container/list/list.hpp | 8 ++--
sandbox/SOC/2009/fusion/boost/fusion/container/list/list_fwd.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/map/map.hpp | 8 ++--
sandbox/SOC/2009/fusion/boost/fusion/container/map/map_fwd.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/set/set.hpp | 8 ++--
sandbox/SOC/2009/fusion/boost/fusion/container/set/set_fwd.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n.hpp | 70 +++++++++++++++++++++------------------
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n_chooser.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector.hpp | 20 ++++++-----
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector_n.hpp | 51 +++++++++++++++-------------
sandbox/SOC/2009/fusion/boost/fusion/container/vector/vector.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/vector/vector_fwd.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/functional/generation/detail/gen_make_adapter.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/include/sequence_assign.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator/advance.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator/basic_iterator.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/iterator/deref.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/iterator/deref_data.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/iterator/detail/distance.hpp | 8 ++--
sandbox/SOC/2009/fusion/boost/fusion/iterator/distance.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator/equal_to.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator/iterator_facade.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/iterator/key_of.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator/next.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator/prior.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of_data.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/mpl/fusion_iterator.hpp | 2 -
sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/equal_to.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/greater.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/greater_equal.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/less.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/less_equal.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/not_equal_to.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/sequence/convert.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/at.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/at_key.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/back.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/begin.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/empty.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/end.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/front.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/has_key.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/size.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/swap.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/value_at.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/value_at_key.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/sequence/io/detail/in.hpp | 2 -
sandbox/SOC/2009/fusion/boost/fusion/sequence/io/in.hpp | 7 ++-
sandbox/SOC/2009/fusion/boost/fusion/sequence/io/out.hpp | 7 ++-
sandbox/SOC/2009/fusion/boost/fusion/sequence/sequence_facade.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/support.hpp | 8 ++--
sandbox/SOC/2009/fusion/boost/fusion/support/category_of.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/support/deduce.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/support/is_iterator.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/support/is_sequence.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/support/is_view.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/support/pair.hpp | 10 ++--
sandbox/SOC/2009/fusion/boost/fusion/support/tag_of.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple_fwd.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/detail/strictest_traversal.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/view/detail/view_storage.hpp | 8 ++--
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/filter_view.hpp | 10 ++--
sandbox/SOC/2009/fusion/boost/fusion/view/iterator_range/iterator_range.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/joint_view.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/reverse_view.hpp | 15 ++-----
sandbox/SOC/2009/fusion/boost/fusion/view/single_view/single_view.hpp | 28 ++++++++--------
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/at_impl.hpp | 10 ++--
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/deref_impl.hpp | 10 ++--
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_at_impl.hpp | 10 ++--
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_of_impl.hpp | 10 ++--
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/zip_view_iterator.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/zip_view.hpp | 10 ++--
138 files changed, 469 insertions(+), 456 deletions(-)
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_array.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_array.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_array.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -6,7 +6,7 @@
#ifndef BOOST_FUSION_ADAPTED_BOOST_ARRAY_HPP
#define BOOST_FUSION_ADAPTED_BOOST_ARRAY_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#define BOOST_FUSION_ADAPTED_ARRAY_TYPE class
#define BOOST_FUSION_ADAPTED_ARRAY_NAMESPACE boost
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_tuple.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_tuple.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_tuple.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,7 +10,7 @@
//TODO adapt std::(tr1::)tuple
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/tuple/tuple.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/tag_of.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/tag_of.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/tag_of.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -24,7 +24,7 @@
namespace traits
{
-#define TAG_OF_SPECIALIZATION(COMBINATION,_)\
+#define BOOST_FUSION_TAG_OF_SPECIALIZATION(COMBINATION,_)\
template<typename T, std::size_t N>\
struct tag_of<\
BOOST_FUSION_ADAPTED_ARRAY_NAMESPACE::array<T,N> COMBINATION>\
@@ -32,8 +32,9 @@
typedef array_tag type;\
};
- BOOST_FUSION_ALL_CV_REF_NON_REF_COMBINATIONS(TAG_OF_SPECIALIZATION,_)
+ BOOST_FUSION_ALL_CV_REF_NON_REF_COMBINATIONS(
+ BOOST_FUSION_TAG_OF_SPECIALIZATION,_)
-#undef TAG_OF_SPECIALIZATION
+#undef BOOST_FUSION_TAG_OF_SPECIALIZATION
}
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/tag_of.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/tag_of.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/tag_of.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -17,7 +17,7 @@
namespace traits
{
-#define TAG_OF_SPECIALIZATION(COMBINATION,_)\
+#define BOOST_FUSION_TAG_OF_SPECIALIZATION(COMBINATION,_)\
template <\
class T0, class T1, class T2, class T3, class T4, \
class T5, class T6, class T7, class T8, class T9\
@@ -41,9 +41,10 @@
typedef boost_tuple_tag type;\
};
- BOOST_FUSION_ALL_CV_REF_NON_REF_COMBINATIONS(TAG_OF_SPECIALIZATION,_)
+ BOOST_FUSION_ALL_CV_REF_NON_REF_COMBINATIONS(
+ BOOST_FUSION_TAG_OF_SPECIALIZATION,_)
-#undef TAG_OF_SPECIALIZATION
+#undef BOOST_FUSION_TAG_OF_SPECIALIZATION
}
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/mpl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/mpl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/mpl.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#ifndef BOOST_FUSION_ADAPTED_MPL_HPP
#define BOOST_FUSION_ADAPTED_MPL_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/adapted/detail/mpl/mpl_iterator.hpp>
#include <boost/fusion/adapted/detail/mpl/advance_impl.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/std_array.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/std_array.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/std_array.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -7,7 +7,7 @@
#define BOOST_FUSION_ADAPTED_STD_ARRAY_HPP
#include <boost/config.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#define BOOST_FUSION_ADAPTED_ARRAY_TYPE struct
//TODO!!!
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/std_pair.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/std_pair.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/std_pair.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -7,7 +7,7 @@
#define BOOST_FUSION_ADAPTED_STD_PAIR_HPP
#include <boost/fusion/adapted/struct.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/mpl/int.hpp>
#include <boost/config/no_tr1/utility.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/struct/adapt_assoc_struct.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/struct/adapt_assoc_struct.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -6,7 +6,7 @@
#ifndef BOOST_FUSION_ADAPTED_STRUCT_ADAPT_ASSOC_STRUCT_HPP
#define BOOST_FUSION_ADAPTED_STRUCT_ADAPT_ASSOC_STRUCT_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/adapted/detail/struct/extension.hpp>
#include <boost/fusion/adapted/detail/struct/adapt_base.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/struct/adapt_struct.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/struct/adapt_struct.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/struct/adapt_struct.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -6,7 +6,7 @@
#ifndef BOOST_FUSION_ADAPTED_STRUCT_ADAPT_STRUCT_HPP
#define BOOST_FUSION_ADAPTED_STRUCT_ADAPT_STRUCT_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/adapted/detail/struct/extension.hpp>
#include <boost/fusion/adapted/detail/struct/adapt_base.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/accumulate.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/accumulate.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/accumulate.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,8 +9,8 @@
#define BOOST_FUSION_ALGORITHM_ITERATION_ACCUMULATE_HPP
#include <boost/fusion/algorithm/iteration/fold.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/detail/fold.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/detail/fold.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/detail/fold.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -17,7 +17,7 @@
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/value_of.hpp>
#include <boost/fusion/iterator/next.hpp>
-#include <boost/fusion/support/result_of.hpp>
+#include <boost/fusion/support/internal/result_of.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/bool.hpp>
@@ -131,22 +131,19 @@
#ifdef BOOST_NO_RVALUE_REFERENCES
typedef typename
- support::result_of<
- typename support::get_func_base<FRef>::type
- (deref_type, StateRef)
+ internal::result_of<
+ typename get_func_base<FRef>::type(deref_type, StateRef)
>::type
type;
#else
typedef typename
mpl::eval_if<
- typename detail::is_lrref<deref_type>::type
- , support::result_of<
- typename support::get_func_base<FRef>::type
- (deref_type, StateRef)
+ typename is_lrref<deref_type>::type
+ , internal::result_of<
+ typename get_func_base<FRef>::type(deref_type, StateRef)
>
- , support::result_of<
- typename support::get_func_base<FRef>::type
- (deref_type&&, StateRef)
+ , internal::result_of<
+ typename get_func_base<FRef>::type(deref_type&&, StateRef)
>
>::type
type;
@@ -158,7 +155,7 @@
#ifdef BOOST_NO_RVALUE_REFERENCES
: fold_apply<
It
- , typename detail::add_lref<typename add_const<State>::type>::type
+ , typename add_lref<typename add_const<State>::type>::type
, FRef
>
#else
@@ -225,8 +222,8 @@
{
typedef typename
mpl::eval_if<
- typename support::is_preevaluable<FRef>::type
- , support::preevaluate<FRef>
+ typename is_preevaluable<FRef>::type
+ , preevaluate<FRef>
, result_of_unrolled_fold<It0, StateRef, FRef, SeqSize>
>::type
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,8 +10,8 @@
#define BOOST_FUSION_ALGORITHM_ITERATION_FOLD_HPP
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/algorithm/iteration/detail/fold.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/for_each.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/for_each.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/for_each.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,8 +10,8 @@
#define BOOST_FUSION_ALGORITHM_ITERATION_FOR_EACH_HPP
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/algorithm/iteration/detail/for_each.hpp>
@@ -51,7 +51,7 @@
inline typename result_of::for_each<Seq&,F const&>::type
for_each(Seq& seq,F const& f)
{
- detail::for_each_unrolled<result_of::size<Seq&>::value>::call(
+ for_each_unrolled<result_of::size<Seq&>::value>::call(
fusion::begin(seq),f);
}
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/all.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/all.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/all.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,8 +11,8 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/algorithm/query/detail/all.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/any.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/any.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/any.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,8 +11,8 @@
#define BOOST_FUSION_ALGORITHM_QUERY_ANY_HPP
#include <boost/fusion/algorithm/query/all.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/count.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/count.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/count.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,8 +10,8 @@
#define BOOST_FUSION_ALGORITHM_QUERY_COUNT_HPP
#include <boost/fusion/algorithm/query/count_if.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/algorithm/query/detail/count.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/count_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/count_if.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/count_if.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,8 +10,8 @@
#define BOOST_FUSION_ALGORITHM_QUERY_COUNT_IF_HPP
#include <boost/fusion/algorithm/iteration/fold.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/all.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/all.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/all.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -51,7 +51,7 @@
return false;
}
- return detail::unrolled_all<N-4>::call(
+ return unrolled_all<N-4>::call(
fusion::next(it3)
, BOOST_FUSION_FORWARD(F,f));
}
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,9 +11,9 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/iterator/value_of.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/detail/workaround.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
#include <boost/mpl/placeholders.hpp>
#include <boost/type_traits/is_same.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,9 +11,9 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/iterator/value_of.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/detail/workaround.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
#include <boost/mpl/quote.hpp>
#include <boost/mpl/lambda.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,9 +11,9 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/iterator/key_of.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/detail/workaround.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
#include <boost/type_traits/is_same.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/none.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/none.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/none.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,8 +10,8 @@
#define BOOST_FUSION_ALGORITHM_QUERY_NONE_HPP
#include <boost/fusion/algorithm/query/any.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/clear.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/clear.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/clear.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -16,8 +16,8 @@
#endif
#include <boost/fusion/support/is_view.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/mpl/eval_if.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/filter_key_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/filter_key_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/filter_key_view.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/view/detail/view_storage.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/mpl/bool.hpp>
@@ -39,16 +39,17 @@
typedef fusion_sequence_tag tag;
typedef mpl::true_ is_view;
-#define FILTER_KEY_VIEW_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_FILTER_KEY_VIEW_CTOR(COMBINATION,_)\
template<typename OtherSeq>\
filter_key_view(filter_key_view<OtherSeq,Pred> COMBINATION view)\
: seq(static_cast<filter_key_view<OtherSeq,Pred>COMBINATION>(\
view).seq)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(FILTER_KEY_VIEW_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(
+ BOOST_FUSION_FILTER_KEY_VIEW_CTOR,_)
-#undef FILTER_KEY_VIEW_CTOR
+#undef BOOST_FUSION_FILTER_KEY_VIEW_CTOR
#ifdef BOOST_NO_RVALUE_REFERENCES
explicit
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/pp/zip.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/pp/zip.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/pp/zip.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,9 +9,9 @@
#include <boost/fusion/container/generation/vector_tie.hpp>
#include <boost/fusion/view/zip_view.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/template.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/template.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#ifdef BOOST_FUSION_ENABLE_STATIC_ASSERTS
# include <boost/preprocessor/cat.hpp>
@@ -35,19 +35,20 @@
#endif
#else
-#define N BOOST_PP_ITERATION()
+#define BOOST_FUSION_N BOOST_PP_ITERATION()
namespace result_of
{
- VARIADIC_TEMPLATE(N)
+ VARIADIC_TEMPLATE(BOOST_FUSION_N)
struct zip
- EXPAND_TEMPLATE_ARGUMENTS_SPECIALIZATION(FUSION_MAX_ZIP_SEQUENCES,N)
+ EXPAND_TEMPLATE_ARGUMENTS_SPECIALIZATION(
+ FUSION_MAX_ZIP_SEQUENCES,BOOST_FUSION_N)
{
#ifdef BOOST_FUSION_ENABLE_STATIC_ASSERS
#define BOOST_FUSION_IS_FORWARD_ASSERT(Z,N,_)\
BOOST_FUSION_MPL_ASSERT((traits::is_forward<BOOST_PP_CAT(T,N)>));
- BOOST_PP_REPEAT(N,BOOST_FUSION_IS_FORWARD_ASSERT,_)
+ BOOST_PP_REPEAT(BOOST_FUSION_N,BOOST_FUSION_IS_FORWARD_ASSERT,_)
#undef BOOST_FUSION_IS_FORWARD_ASSERT
#endif
@@ -55,7 +56,7 @@
typedef
zip_view<
typename result_of::vector_tie<
- EXPAND_TEMPLATE_ARGUMENTS(N)
+ EXPAND_TEMPLATE_ARGUMENTS(BOOST_FUSION_N)
>::type
>
type;
@@ -67,16 +68,19 @@
#if N
typename
#endif
- result_of::zip<EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_CLREF(N)>::type
- zip(EXPAND_TEMPLATE_ARGUMENTS_PARAMETERS_A_R_ELSE_CLREF(N))
+ result_of::zip<
+ EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_CLREF(BOOST_FUSION_N)
+ >::type
+ zip(EXPAND_TEMPLATE_ARGUMENTS_PARAMETERS_A_R_ELSE_CLREF(BOOST_FUSION_N))
{
return
#if N
typename
#endif
- result_of::zip<EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_CLREF(N)>::type(
- fusion::vector_tie(EXPAND_PARAMETERS_A(N)));
+ result_of::zip<
+ EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_CLREF(BOOST_FUSION_N)
+ >::type(fusion::vector_tie(EXPAND_PARAMETERS_A(BOOST_FUSION_N)));
}
-#undef N
+#undef BOOST_FUSION_N
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/replace_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/replace_if.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/replace_if.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,11 +8,12 @@
#ifndef BOOST_FUSION_ALGORITHM_TRANSFORMATION_DETAIL_REPLACE_IF_HPP
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_DETAIL_REPLACE_IF_HPP
-#include <boost/fusion/support/result_of.hpp>
+#include <boost/fusion/support/internal/result_of.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/type_traits/is_convertible.hpp>
+#include <boost/type_traits/remove_const.hpp>
namespace boost { namespace fusion { namespace detail
{
@@ -84,8 +85,7 @@
}
F f;
- //TODO test if const
- mutable NewValue new_value;
+ mutable typename remove_const<NewValue>::type new_value;
};
}}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/variadic_templates/zip.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/variadic_templates/zip.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/variadic_templates/zip.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,8 +9,8 @@
#include <boost/fusion/container/vector.hpp>
#include <boost/fusion/container/generation/vector_tie.hpp>
#include <boost/fusion/view/zip_view.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#ifdef BOOST_FUSION_ENABLE_STATIC_ASSERTS
# include <boost/mpl/and.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -13,9 +13,9 @@
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/view/joint_view/joint_view.hpp>
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/algorithm/transformation/detail/is_in_seq.hpp>
#include <boost/mpl/eval_if.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase_key.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase_key.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase_key.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -13,9 +13,9 @@
#ifdef BOOST_FUSION_ENABLE_STATIC_ASSERTS
# include <boost/fusion/sequence/intrinsic/has_key.hpp>
#endif
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/detail/workaround.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/identity.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/filter.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/filter.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/filter.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,9 +10,9 @@
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_FILTER_HPP
#include <boost/fusion/algorithm/transformation/filter_if.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/detail/workaround.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
#include <boost/mpl/placeholders.hpp>
#include <boost/type_traits/is_same.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/filter_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/filter_if.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/filter_if.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,9 +9,9 @@
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_FILTER_IF_HPP
#include <boost/fusion/view/filter_view/filter_view.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/detail/workaround.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,8 +10,8 @@
#include <boost/fusion/view/single_view/single_view.hpp>
#include <boost/fusion/algorithm/transformation/insert_range.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/algorithm/transformation/detail/is_in_seq.hpp>
namespace boost { namespace fusion
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert_range.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert_range.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert_range.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -12,9 +12,9 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/view/joint_view/joint_view.hpp>
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/algorithm/transformation/detail/is_in_seq.hpp>
#include <boost/preprocessor/empty.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/join.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/join.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/join.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,8 +10,8 @@
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_JOIN_HPP
#include <boost/fusion/view/joint_view.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/preprocessor/empty.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_back.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_back.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_back.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -15,8 +15,8 @@
#endif
#include <boost/fusion/iterator/prior.hpp>
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_front.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_front.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_front.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -15,8 +15,8 @@
#endif
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/push_back.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/push_back.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/push_back.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,9 +10,9 @@
#include <boost/fusion/view/joint_view/joint_view.hpp>
#include <boost/fusion/view/single_view/single_view.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/push_front.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/push_front.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/push_front.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,9 +10,9 @@
#include <boost/fusion/view/joint_view/joint_view.hpp>
#include <boost/fusion/view/single_view/single_view.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/remove.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/remove.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/remove.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,9 +9,9 @@
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_REMOVE_HPP
#include <boost/fusion/algorithm/transformation/remove_if.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/detail/workaround.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
#include <boost/mpl/not.hpp>
#include <boost/mpl/placeholders.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/remove_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/remove_if.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/remove_if.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,9 +9,9 @@
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_REMOVE_IF_HPP
#include <boost/fusion/view/filter_view/filter_view.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/detail/workaround.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
#include <boost/mpl/not.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,9 +9,9 @@
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_REPLACE_HPP
#include <boost/fusion/algorithm/transformation/replace_if.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace_if.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace_if.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,9 +10,9 @@
#include <boost/fusion/view/transform_view/transform_view.hpp>
#include <boost/fusion/algorithm/transformation/detail/replace_if.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/reverse.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/reverse.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/reverse.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,8 +9,8 @@
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_REVERSE_HPP
#include <boost/fusion/view/reverse_view/reverse_view.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/transform.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/transform.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/transform.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,8 +9,8 @@
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_TRANSFORM_HPP
#include <boost/fusion/view/transform_view/transform_view.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/preprocessor/empty.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/detail/convert_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/detail/convert_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/detail/convert_impl.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -7,7 +7,7 @@
# include <boost/fusion/sequence/intrinsic/begin.hpp>
# include <boost/fusion/sequence/intrinsic/size.hpp>
#endif
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/preprocessor/cat.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/detail/pp/as_seq.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/detail/pp/as_seq.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/detail/pp/as_seq.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -28,10 +28,10 @@
#else
-#define N BOOST_PP_ITERATION()
+#define BOOST_FUSION_N BOOST_PP_ITERATION()
template <>
- struct BOOST_PP_CAT(as_,BOOST_FUSION_SEQ_NAME)<N>
+ struct BOOST_PP_CAT(as_,BOOST_FUSION_SEQ_NAME)<BOOST_FUSION_N>
{
template <typename It0>
struct apply
@@ -48,13 +48,16 @@
result_of::value_of<BOOST_PP_CAT(It, N)>::type\
BOOST_PP_CAT(T, N);
- BOOST_PP_REPEAT_FROM_TO(1, N, BOOST_FUSION_IT_VALUE_ENUM, _)
+ BOOST_PP_REPEAT_FROM_TO(
+ 1, BOOST_FUSION_N, BOOST_FUSION_IT_VALUE_ENUM, _)
#undef BOOST_FUSION_IT_VALUE_ENUM
- typedef BOOST_FUSION_SEQ_NAME<BOOST_PP_ENUM_PARAMS(N, T)> type;
+ typedef
+ BOOST_FUSION_SEQ_NAME<BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, T)>
+ type;
};
};
-#undef N
+#undef BOOST_FUSION_N
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/detail/pp/forward_ctor.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/detail/pp/forward_ctor.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/detail/pp/forward_ctor.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -6,7 +6,7 @@
#ifndef BOOST_PP_IS_ITERATING
# ifndef BOOST_FUSION_SEQ_NAME
# ifndef BOOST_FUSION_CONTAINER_DETAIL_PP_FORWARD_CTOR_HPP
-# include <boost/fusion/support/template.hpp>
+# include <boost/fusion/support/internal/template.hpp>
# include <boost/config.hpp>
# include <boost/preprocessor/iterate.hpp>
@@ -24,21 +24,21 @@
{}
# endif
#else
-# define N BOOST_PP_ITERATION()
+# define BOOST_FUSION_N BOOST_PP_ITERATION()
# ifndef BOOST_NO_RVALUE_REFERENCES
- VARIADIC_TEMPLATE_A(N)
+ VARIADIC_TEMPLATE_A(BOOST_FUSION_N)
# endif
# if N == 1
explicit
# endif
# ifdef BOOST_NO_RVALUE_REFERENCES
- BOOST_FUSION_SEQ_NAME(EXPAND_TEMPLATE_ARGUMENTS_CALL_PARAMS(N))
+ BOOST_FUSION_SEQ_NAME(EXPAND_TEMPLATE_ARGUMENTS_CALL_PARAMS(BOOST_FUSION_N))
# else
- BOOST_FUSION_SEQ_NAME(EXPAND_TEMPLATE_ARGUMENTS_A(N))
+ BOOST_FUSION_SEQ_NAME(EXPAND_TEMPLATE_ARGUMENTS_A(BOOST_FUSION_N))
# endif
- : BOOST_FUSION_INIT_BASE(EXPAND_PARAMETERS_A(N))
+ : BOOST_FUSION_INIT_BASE(EXPAND_PARAMETERS_A(BOOST_FUSION_N))
{}
-# undef N
+# undef BOOST_FUSION_N
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/as_seq.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/as_seq.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/as_seq.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -5,8 +5,8 @@
#include <boost/fusion/mpl/begin.hpp>
#include <boost/fusion/mpl/end.hpp>
-#include <boost/fusion/support/variadic_templates/variadic_quote.hpp>
-#include <boost/fusion/support/to_random_access_mpl_seq.hpp>
+#include <boost/fusion/support/internal/variadic_templates/variadic_quote.hpp>
+#include <boost/fusion/support/internal/to_random_access_mpl_seq.hpp>
#include <boost/mpl/apply.hpp>
#include <boost/mpl/unpack_args.hpp>
@@ -21,8 +21,8 @@
typedef typename
mpl::apply<
mpl::unpack_args<variadic_quote<BOOST_FUSION_SEQ_NAME> >
- , typename detail::to_random_access_mpl_seq<
- typename detail::remove_reference<SeqRef>::type
+ , typename to_random_access_mpl_seq<
+ typename remove_reference<SeqRef>::type
>::type
>::type
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/cons_tie.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/cons_tie.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/cons_tie.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_CONTAINER_GENERATION_CONS_TIE_HPP
#include <boost/fusion/container/list/cons.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/make_map.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/make_map.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/make_map.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_CONTAINER_GENERATION_DETAIL_PP_MAKE_MAP_HPP
#include <boost/fusion/container/map/map.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
#include <boost/fusion/support/pair.hpp>
#include <boost/preprocessor/iterate.hpp>
@@ -36,21 +36,21 @@
#endif
#else
-#define N BOOST_PP_ITERATION()
+#define BOOST_FUSION_N BOOST_PP_ITERATION()
namespace result_of
{
- VARIADIC_TEMPLATE(BOOST_PP_MUL(N,2))
+ VARIADIC_TEMPLATE(BOOST_PP_MUL(BOOST_FUSION_N,2))
struct make_map
EXPAND_TEMPLATE_ARGUMENTS_SPECIALIZATION(
BOOST_PP_MUL(FUSION_MAX_MAP_SIZE,2),
- BOOST_PP_MUL(N,2))
+ BOOST_PP_MUL(BOOST_FUSION_N,2))
{
#define BOOST_FUSION_MAP_ELEMENT(Z,INNER_N,_)\
pair<\
BOOST_PP_CAT(T,INNER_N),\
typename detail::as_fusion_element<\
- BOOST_PP_CAT(T,BOOST_PP_ADD(N,INNER_N))\
+ BOOST_PP_CAT(T,BOOST_PP_ADD(BOOST_FUSION_N,INNER_N))\
>::type\
>
@@ -64,22 +64,22 @@
BOOST_PP_CAT(A,BOOST_PP_ADD(N,INNER_N))\
BOOST_FUSION_R_ELSE_CLREF(BOOST_PP_EMPTY())
- VARIADIC_TEMPLATE_A(BOOST_PP_MUL(N,2))
+ VARIADIC_TEMPLATE_A(BOOST_PP_MUL(BOOST_FUSION_N,2))
inline
#if N
typename
#endif
result_of::make_map<
- BOOST_PP_ENUM_PARAMS(N, A)
- , BOOST_PP_ENUM(N, BOOST_FUSION_MAKE_MAP_ARGS2, _)
+ BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, A)
+ , BOOST_PP_ENUM(BOOST_FUSION_N, BOOST_FUSION_MAKE_MAP_ARGS2, _)
>::type
#define BOOST_FUSION_MAKE_MAP_ARGUMENTS(Z,INNER_N,__)\
- BOOST_PP_CAT(A,BOOST_PP_ADD(N,INNER_N))\
+ BOOST_PP_CAT(A,BOOST_PP_ADD(BOOST_FUSION_N,INNER_N))\
BOOST_FUSION_R_ELSE_CLREF(BOOST_PP_EMPTY())\
BOOST_PP_CAT(_,INNER_N)
- make_map(BOOST_PP_ENUM(N, BOOST_FUSION_MAKE_MAP_ARGUMENTS, _))
+ make_map(BOOST_PP_ENUM(BOOST_FUSION_N, BOOST_FUSION_MAKE_MAP_ARGUMENTS, _))
#undef BOOST_FUSION_MAKE_MAP_ARGUMENTS
{
@@ -88,12 +88,12 @@
typename
#endif
result_of::make_map<
- BOOST_PP_ENUM_PARAMS(N, A)
- , BOOST_PP_ENUM(N, BOOST_FUSION_MAKE_MAP_ARGS2, _)
+ BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, A)
+ , BOOST_PP_ENUM(BOOST_FUSION_N, BOOST_FUSION_MAKE_MAP_ARGS2, _)
>::type(EXPAND_PARAMETERS_A(N));
}
#undef BOOST_FUSION_MAKE_MAP_ARGS2
-#undef N
+#undef BOOST_FUSION_N
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/make_seq.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/make_seq.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/make_seq.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -5,8 +5,8 @@
#ifndef BOOST_PP_IS_ITERATING
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/support/template.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/template.hpp>
#include <boost/preprocessor/iterate.hpp>
#include <boost/preprocessor/cat.hpp>
@@ -27,19 +27,19 @@
#else
-#define N BOOST_PP_ITERATION()
+#define BOOST_FUSION_N BOOST_PP_ITERATION()
namespace result_of
{
VARIADIC_TEMPLATE(N)
struct BOOST_PP_CAT(make_,BOOST_FUSION_SEQ_NAME)
EXPAND_TEMPLATE_ARGUMENTS_SPECIALIZATION(
- BOOST_FUSION_MAX_SEQ_SIZE,N)
+ BOOST_FUSION_MAX_SEQ_SIZE,BOOST_FUSION_N)
{
typedef
BOOST_FUSION_SEQ_NAME<
EXPAND_TEMPLATE_ARGUMENTS_BINARY(
- N,
+ BOOST_FUSION_N,
typename detail::as_fusion_element<,
>::type
)
@@ -48,25 +48,25 @@
};
}
- VARIADIC_TEMPLATE_A(N)
+ VARIADIC_TEMPLATE_A(BOOST_FUSION_N)
inline
#if N
typename
#endif
result_of::BOOST_PP_CAT(make_,BOOST_FUSION_SEQ_NAME)<
- EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_CLREF(N)
+ EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_CLREF(BOOST_FUSION_N)
>::type
BOOST_PP_CAT(make_,BOOST_FUSION_SEQ_NAME)(
- EXPAND_TEMPLATE_ARGUMENTS_PARAMETERS_A_R_ELSE_CLREF(N))
+ EXPAND_TEMPLATE_ARGUMENTS_PARAMETERS_A_R_ELSE_CLREF(BOOST_FUSION_N))
{
return
#if N
typename
#endif
result_of::BOOST_PP_CAT(make_,BOOST_FUSION_SEQ_NAME)<
- EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_CLREF(N)
- >::type(EXPAND_PARAMETERS_A(N));
+ EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_CLREF(BOOST_FUSION_N)
+ >::type(EXPAND_PARAMETERS_A(BOOST_FUSION_N));
}
-#undef N
+#undef BOOST_FUSION_N
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/map_tie.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/map_tie.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/map_tie.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_CONTAINER_GENERATION_DETAIL_PP_MAP_TIE_HPP
#include <boost/fusion/container/map/map.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
#include <boost/fusion/support/pair.hpp>
#include <boost/preprocessor/iterate.hpp>
@@ -36,15 +36,15 @@
#endif
#else
-#define N BOOST_PP_ITERATION()
+#define BOOST_FUSION_N BOOST_PP_ITERATION()
namespace result_of
{
- VARIADIC_TEMPLATE(BOOST_PP_MUL(N,2))
+ VARIADIC_TEMPLATE(BOOST_PP_MUL(BOOST_FUSION_N,2))
struct map_tie
EXPAND_TEMPLATE_ARGUMENTS_SPECIALIZATION(
BOOST_PP_MUL(FUSION_MAX_MAP_SIZE,2),
- BOOST_PP_MUL(N,2))
+ BOOST_PP_MUL(BOOST_FUSION_N,2))
{
#define BOOST_FUSION_MAP_ELEMENT(Z,INNER_N,_)\
pair<\
@@ -54,7 +54,9 @@
>::type\
>
- typedef map<BOOST_PP_ENUM(N, BOOST_FUSION_MAP_ELEMENT, _)> type;
+ typedef
+ map<BOOST_PP_ENUM(BOOST_FUSION_N, BOOST_FUSION_MAP_ELEMENT, _)>
+ type;
#undef BOOST_FUSION_MAP_ELEMENT
};
@@ -64,22 +66,22 @@
BOOST_PP_CAT(A,BOOST_PP_ADD(N,INNER_N))\
BOOST_FUSION_R_ELSE_LREF(BOOST_PP_EMPTY())
- VARIADIC_TEMPLATE_A(BOOST_PP_MUL(N,2))
+ VARIADIC_TEMPLATE_A(BOOST_PP_MUL(BOOST_FUSION_N,2))
inline
#if N
typename
#endif
result_of::map_tie<
- BOOST_PP_ENUM_PARAMS(N, A)
- , BOOST_PP_ENUM(N, BOOST_FUSION_MAP_TIE_ARGS2, _)
+ BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, A)
+ , BOOST_PP_ENUM(BOOST_FUSION_N, BOOST_FUSION_MAP_TIE_ARGS2, _)
>::type
#define BOOST_FUSION_MAP_TIE_ARGUMENTS(Z,INNER_N,__)\
- BOOST_PP_CAT(A,BOOST_PP_ADD(N,INNER_N))\
+ BOOST_PP_CAT(A,BOOST_PP_ADD(BOOST_FUSION_N,INNER_N))\
BOOST_FUSION_R_ELSE_LREF(BOOST_PP_EMPTY())\
BOOST_PP_CAT(_,INNER_N)
- map_tie(BOOST_PP_ENUM(N, BOOST_FUSION_MAP_TIE_ARGUMENTS, _))
+ map_tie(BOOST_PP_ENUM(BOOST_FUSION_N, BOOST_FUSION_MAP_TIE_ARGUMENTS, _))
#undef BOOST_FUSION_MAP_TIE_ARGUMENTS
{
@@ -88,12 +90,12 @@
typename
#endif
result_of::map_tie<
- BOOST_PP_ENUM_PARAMS(N, A)
+ BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, A)
, BOOST_PP_ENUM(N, BOOST_FUSION_MAP_TIE_ARGS2, _)
- >::type(EXPAND_PARAMETERS_A(N));
+ >::type(EXPAND_PARAMETERS_A(BOOST_FUSION_N));
}
#undef BOOST_FUSION_MAP_TIE_ARGS2
-#undef N
+#undef BOOST_FUSION_N
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/seq_tie.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/seq_tie.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/pp/seq_tie.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -5,8 +5,8 @@
#ifndef BOOST_PP_IS_ITERATING
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/support/template.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/template.hpp>
#include <boost/preprocessor/iterate.hpp>
#include <boost/preprocessor/cat.hpp>
@@ -27,19 +27,19 @@
#else
-#define N BOOST_PP_ITERATION()
+#define BOOST_FUSION_N BOOST_PP_ITERATION()
namespace result_of
{
- VARIADIC_TEMPLATE(N)
+ VARIADIC_TEMPLATE(BOOST_FUSION_N)
struct BOOST_FUSION_FUNCTION_NAME
EXPAND_TEMPLATE_ARGUMENTS_SPECIALIZATION(
- BOOST_FUSION_MAX_SEQ_SIZE,N)
+ BOOST_FUSION_MAX_SEQ_SIZE,BOOST_FUSION_N)
{
typedef
BOOST_FUSION_SEQ_NAME<
EXPAND_TEMPLATE_ARGUMENTS_BINARY(
- N,
+ BOOST_FUSION_N,
typename detail::as_fusion_element_ref<,
>::type
)
@@ -48,24 +48,24 @@
};
}
- VARIADIC_TEMPLATE_A(N)
+ VARIADIC_TEMPLATE_A(BOOST_FUSION_N)
inline
#if N
typename
#endif
result_of::BOOST_FUSION_FUNCTION_NAME<
- EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_LREF(N)
+ EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_LREF(BOOST_FUSION_N)
>::type
BOOST_FUSION_FUNCTION_NAME(
- EXPAND_TEMPLATE_ARGUMENTS_PARAMETERS_A_R_ELSE_LREF(N))
+ EXPAND_TEMPLATE_ARGUMENTS_PARAMETERS_A_R_ELSE_LREF(BOOST_FUSION_N))
{
return
#if N
typename
#endif
result_of::BOOST_FUSION_FUNCTION_NAME<
- EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_LREF(N)
- >::type(EXPAND_PARAMETERS_A(N));
+ EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_LREF(BOOST_FUSION_N)
+ >::type(EXPAND_PARAMETERS_A(BOOST_FUSION_N));
}
#undef N
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_map.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_map.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_map.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -7,9 +7,9 @@
#define BOOST_FUSION_CONTAINER_GENERATION_DETAIL_VARIADIC_TEMPLATES_MAKE_MAP_HPP
#include <boost/fusion/container/map/map.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/support/variadic_templates/variadic_arguments_to_vector.hpp>
-#include <boost/fusion/support/variadic_templates/variadic_quote.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/variadic_templates/variadic_arguments_to_vector.hpp>
+#include <boost/fusion/support/internal/variadic_templates/variadic_quote.hpp>
#include <boost/mpl/int.hpp>
#include <boost/mpl/divides.hpp>
@@ -32,7 +32,7 @@
struct make_map
{
typedef typename
- variadic_arguments_to_vector<KeysTypes...>::type
+ detail::variadic_arguments_to_vector<KeysTypes...>::type
args;
typedef typename
mpl::iterator_range<
@@ -62,7 +62,7 @@
typedef typename
mpl::apply<
- mpl::unpack_args<variadic_quote<map> >
+ mpl::unpack_args<detail::variadic_quote<map> >
, map_args
>::type
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_seq.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_seq.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_seq.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -3,7 +3,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
#include <boost/preprocessor/cat.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/map_tie.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/map_tie.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/map_tie.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -7,9 +7,9 @@
#define BOOST_FUSION_CONTAINER_GENERATION_DETAIL_VARIADIC_TEMPLATES_MAP_TIE_HPP
#include <boost/fusion/container/map/map.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/support/variadic_templates/variadic_arguments_to_vector.hpp>
-#include <boost/fusion/support/variadic_templates/variadic_quote.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/variadic_templates/variadic_arguments_to_vector.hpp>
+#include <boost/fusion/support/internal/variadic_templates/variadic_quote.hpp>
#include <boost/mpl/int.hpp>
#include <boost/mpl/divides.hpp>
@@ -32,7 +32,7 @@
struct map_tie
{
typedef typename
- variadic_arguments_to_vector<KeysTypes...>::type
+ detail::variadic_arguments_to_vector<KeysTypes...>::type
args;
typedef typename
mpl::iterator_range<
@@ -62,7 +62,7 @@
typedef typename
mpl::apply<
- mpl::unpack_args<variadic_quote<map> >
+ mpl::unpack_args<detail::variadic_quote<map> >
, map_args
>::type
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/seq_tie.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/seq_tie.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/seq_tie.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -3,7 +3,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
#include <boost/preprocessor/cat.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/make_cons.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/make_cons.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/make_cons.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,7 +10,7 @@
#define BOOST_FUSION_CONTAINER_GENERATION_MAKE_CONS_HPP
#include <boost/fusion/container/list/cons.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/pair_tie.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/pair_tie.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/pair_tie.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,8 +8,8 @@
#if !defined (BOOST_FUSION_PAIR_TIE_20060812_2058)
#define BOOST_FUSION_PAIR_TIE_20060812_2058
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/cons.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/cons.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/cons.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -17,10 +17,10 @@
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assign_tags.hpp>
-#include <boost/fusion/support/sequence_assign.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assign_tags.hpp>
+#include <boost/fusion/support/internal/sequence_assign.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/int.hpp>
#include <boost/mpl/bool.hpp>
@@ -115,7 +115,7 @@
//cschmidt: iterators so we do not have to deal with the cv-ness
//of cons_.car/cons_.cdr explicitly
-#define CONS_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_CONS_CTOR(COMBINATION,_)\
cons(cons COMBINATION cons_)\
: car(fusion::front(BOOST_FUSION_FORWARD(cons COMBINATION,cons_)))\
, cdr(detail::assign_by_deref(),\
@@ -123,9 +123,9 @@
BOOST_FUSION_FORWARD(cons COMBINATION,cons_))))\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(CONS_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_CONS_CTOR,_);
-#undef CONS_CTOR
+#undef BOOST_FUSION_CONS_CTOR
//cschmidt: rvalue ref if possible, so this does not collide with
//cons(OtherCar&&,OtherCdr&&)
@@ -148,17 +148,17 @@
{}
#endif
-#define CONS_ASSIGN_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_CONS_ASSIGN_CTOR(COMBINATION,_)\
template<typename SeqRef>\
- cons(support::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
+ cons(detail::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
: car(fusion::front(seq_assign.get()))\
, cdr(detail::assign_by_deref(),\
fusion::next(fusion::begin(seq_assign.get())))\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(CONS_ASSIGN_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_CONS_ASSIGN_CTOR,_);
-#undef CONS_ASSIGN_CTOR
+#undef BOOST_FUSION_CONS_ASSIGN_CTOR
/*
template<typename Seq>
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/at_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/at_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/at_impl.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_CONTAINER_LIST_DETAIL_CONS_AT_IMPL_HPP
#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
#include <boost/mpl/int.hpp>
namespace boost { namespace fusion
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/cons_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/cons_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/cons_iterator.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -58,7 +58,7 @@
{}
};
-#define NIL_ITERATOR(COMBINATION,_)\
+#define BOOST_FUSION_NIL_ITERATOR(COMBINATION,_)\
template <>\
struct cons_iterator<nil COMBINATION>\
: nil_iterator\
@@ -71,9 +71,9 @@
{}\
};
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(NIL_ITERATOR,_)
+ BOOST_FUSION_ALL_CV_REF_COMBINATIONS(BOOST_FUSION_NIL_ITERATOR,_)
-#undef NIL_ITERATOR
+#undef BOOST_FUSION_NIL_ITERATOR
}}
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/list.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/list.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/list.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/container/list/list_fwd.hpp>
#include <boost/fusion/container/vector/vector.hpp>
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/container/list/detail/list/begin_impl.hpp>
#include <boost/fusion/container/list/detail/list/end_impl.hpp>
@@ -43,14 +43,14 @@
list()
{}
-#define LIST_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_LIST_CTOR(COMBINATION,_)\
list(list COMBINATION list_)\
: data(BOOST_FUSION_FORWARD(list COMBINATION,list_).data)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(LIST_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_LIST_CTOR,_)
-#undef LIST_CTOR
+#undef BOOST_FUSION_LIST_CTOR
#define BOOST_FUSION_SEQ_NAME list
#define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_LIST_SIZE
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/list_fwd.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/list_fwd.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/list_fwd.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_CONTAINER_LIST_LIST_FWD_HPP
#include <boost/fusion/container/list/limits.hpp>
-#include <boost/fusion/support/template.hpp>
+#include <boost/fusion/support/internal/template.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/map/map.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/map/map.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/map.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,7 +10,7 @@
#include <boost/fusion/container/vector/vector.hpp>
#include <boost/fusion/support/pair.hpp>
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/mpl/bool.hpp>
@@ -48,14 +48,14 @@
map()
{}
-#define MAP_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_MAP_CTOR(COMBINATION,_)\
map(map COMBINATION map_)\
: data(BOOST_FUSION_FORWARD(map COMBINATION,map_).data)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(MAP_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_MAP_CTOR,_)
-#undef MAP_CTOR
+#undef BOOST_FUSION_MAP_CTOR
#define BOOST_FUSION_SEQ_NAME map
#define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_MAP_SIZE
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/map/map_fwd.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/map/map_fwd.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/map_fwd.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,7 +10,7 @@
#include <boost/fusion/container/map/limits.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/template.hpp>
+#include <boost/fusion/support/internal/template.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/set/set.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/set/set.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/set.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#include <boost/fusion/container/set/set_fwd.hpp>
#include <boost/fusion/container/vector/vector.hpp>
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/mpl/bool.hpp>
@@ -44,14 +44,14 @@
set()
{}
-#define SET_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_SET_CTOR(COMBINATION,_)\
set(set COMBINATION set_)\
: data(BOOST_FUSION_FORWARD(set COMBINATION,set_).data)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(SET_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_SET_CTOR,_)
-#undef SET_CTOR
+#undef BOOST_FUSION_SET_CTOR
#define BOOST_FUSION_SEQ_NAME set
#define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_SET_SIZE
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/set/set_fwd.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/set/set_fwd.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/set_fwd.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,7 +10,7 @@
#include <boost/fusion/container/set/limits.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/template.hpp>
+#include <boost/fusion/support/internal/template.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -41,14 +41,14 @@
vector()
{}
-#define VECTOR_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_VECTOR_CTOR(COMBINATION,_)\
vector(self_type COMBINATION vec)\
: data(BOOST_FUSION_FORWARD(self_type COMBINATION,vec).data)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_VECTOR_CTOR,_);
-#undef VECTOR_CTOR
+#undef BOOST_FUSION_VECTOR_CTOR
#define BOOST_FUSION_SEQ_NAME vector
#define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_VECTOR_SIZE
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,8 +10,8 @@
# include <boost/fusion/iterator/next.hpp>
# include <boost/fusion/iterator/advance_c.hpp>
# include <boost/fusion/support/sequence_base.hpp>
-# include <boost/fusion/support/ref.hpp>
-# include <boost/fusion/support/sequence_assign.hpp>
+# include <boost/fusion/support/internal/ref.hpp>
+# include <boost/fusion/support/internal/sequence_assign.hpp>
# include <boost/preprocessor/cat.hpp>
# include <boost/preprocessor/dec.hpp>
@@ -64,23 +64,26 @@
struct vector0<void_>
: sequence_base<vector0<void_> >
# else
- template <BOOST_PP_ENUM_PARAMS(N, typename T)>
- struct BOOST_PP_CAT(vector, N)
- : sequence_base<BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N,T)> >
+ template <BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, typename T)>
+ struct BOOST_PP_CAT(vector, BOOST_FUSION_N)
+ : sequence_base<BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N,T)> >
# endif
{
- typedef mpl::BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, T)> types;
+ typedef
+ mpl::BOOST_PP_CAT(vector, BOOST_FUSION_N)
+ <BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, T)>
+ types;
typedef vector_tag fusion_tag;
typedef fusion_sequence_tag tag;
typedef mpl::false_ is_view;
typedef random_access_traversal_tag category;
- typedef mpl::int_<N> size;
+ typedef mpl::int_<BOOST_FUSION_N> size;
# define BOOST_FUSION_DEFAULT_MEMBER_INIT(Z, N, _) BOOST_PP_CAT(m,N)()
- BOOST_PP_CAT(vector, N)()
-# if N
- : BOOST_PP_ENUM(N, BOOST_FUSION_DEFAULT_MEMBER_INIT, _)
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)()
+# if BOOST_FUSION_N
+ : BOOST_PP_ENUM(BOOST_FUSION_N, BOOST_FUSION_DEFAULT_MEMBER_INIT, _)
# endif
{}
@@ -95,25 +98,26 @@
BOOST_FUSION_FORWARD(BOOST_FUSION_SELF_TYPE COMBINATION,vec).\
BOOST_PP_CAT(m,N))
-# define VECTOR_CTOR(COMBINATION,_)\
+# define BOOST_FUSION_VECTOR_CTOR(COMBINATION,_)\
BOOST_PP_CAT(vector, N)(\
BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N,T)> COMBINATION vec)\
: BOOST_PP_ENUM(N, BOOST_FUSION_MEMBER_INIT, COMBINATION)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_VECTOR_CTOR,_)
# undef BOOST_FUSION_MEMBER_INIT
# undef BOOST_FUSION_SELF_TYPE
# else
-# define VECTOR_CTOR(COMBINATION,_)\
- BOOST_PP_CAT(vector, N)(BOOST_PP_CAT(vector, N)<void_> COMBINATION vec)\
+# define BOOST_FUSION_VECTOR_CTOR(COMBINATION,_)\
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)(\
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)<void_> COMBINATION vec)\
{}
BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_CTOR,_)
# endif
-# undef VECTOR_CTOR
+# undef BOOST_FUSION_VECTOR_CTOR
# if N
# define BOOST_FUSION_MEMBER_INIT(Z, N, _)\
@@ -123,18 +127,18 @@
#ifndef BOOST_NO_RVALUE_REFERENCES
template <BOOST_PP_ENUM_PARAMS(N, typename A)>
#endif
-# if (N == 1)
+# if (BOOST_FUSION_N == 1)
explicit
# endif
- BOOST_PP_CAT(vector, N)(
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)(
#ifdef BOOST_NO_RVALUE_REFERENCES
BOOST_PP_ENUM_BINARY_PARAMS(
- N,
+ BOOST_FUSION_N,
typename call_traits<T,
>::param_type _)
#else
BOOST_PP_ENUM_BINARY_PARAMS(
- N,
+ BOOST_FUSION_N,
A,
BOOST_FUSION_R_ELSE_CLREF(BOOST_PP_EMPTY()) _)
#endif
@@ -145,31 +149,31 @@
# undef BOOST_FUSION_MEMBER_INIT
# endif
-# if N
+# if BOOST_FUSION_N
# define BOOST_FUSION_MEMBER_INIT(Z, N, _)\
BOOST_PP_CAT(m,N)(fusion::deref(\
fusion::advance_c<N>(fusion::begin(seq_assign.get()))))
-# define VECTOR_ASSIGN_CTOR(COMBINATION,_)\
+# define BOOST_FUSION_VECTOR_ASSIGN_CTOR(COMBINATION,_)\
template<typename SeqRef>\
BOOST_PP_CAT(vector,N)(\
- support::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
+ detail::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
: BOOST_PP_ENUM(N, BOOST_FUSION_MEMBER_INIT, _)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_ASSIGN_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_VECTOR_ASSIGN_CTOR,_);
-# undef VECTOR_ASSIGN_CTOR
+# undef BOOST_FUSION_VECTOR_ASSIGN_CTOR
# undef BOOST_FUSION_MEMBER_INIT
# else
-# define VECTOR_ASSIGN_CTOR(COMBINATION,_)\
+# define BOOST_FUSION_VECTOR_ASSIGN_CTOR(COMBINATION,_)\
template<typename SeqRef>\
BOOST_PP_CAT(vector,N)(\
- support::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
+ detail::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_ASSIGN_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_VECTOR_ASSIGN_CTOR,_);
-# undef VECTOR_ASSIGN_CTOR
+# undef VBOOST_FUSION_ECTOR_ASSIGN_CTOR
# endif
template <typename Seq>
@@ -206,11 +210,13 @@
{
#ifdef BOOST_NO_RVALUE_REFERENCES
return this->operator=<
- BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, T)>
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)
+ <BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, T)>
>(seq);
#else
return this->operator=<
- BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, T)> const&
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)
+ <BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, T)> const&
>(seq);
#endif
}
@@ -248,11 +254,11 @@
\
BOOST_PP_CAT(T,N) BOOST_PP_CAT(m,N);
- BOOST_PP_REPEAT(N, BOOST_FUSION_MEMBER_DECL, _)
+ BOOST_PP_REPEAT(BOOST_FUSION_N, BOOST_FUSION_MEMBER_DECL, _)
# undef BOOST_FUSION_MEMBER_DECL
};
}}
-# undef N
+# undef BOOST_FUSION_N
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n_chooser.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n_chooser.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n_chooser.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -86,5 +86,5 @@
};
};
-#undef N
+#undef BOOST_FUSION_N
#endif // defined(BOOST_PP_IS_ITERATING)
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,11 +10,11 @@
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/iterator/deref.hpp>
-#include <boost/fusion/support/variadic_templates/variadic_arguments_to_vector.hpp>
-#include <boost/fusion/support/sequence_assign.hpp>
-#include <boost/fusion/support/assign_tags.hpp>
+#include <boost/fusion/support/internal/variadic_templates/variadic_arguments_to_vector.hpp>
+#include <boost/fusion/support/internal/sequence_assign.hpp>
+#include <boost/fusion/support/internal/assign_tags.hpp>
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/int.hpp>
@@ -127,7 +127,9 @@
public:
typedef vector<Elements...> this_type;
- typedef typename variadic_arguments_to_vector<Elements...>::type types;
+ typedef typename
+ detail::variadic_arguments_to_vector<Elements...>::type
+ types;
typedef vector_tag fusion_tag;
typedef fusion_sequence_tag tag;
typedef mpl::false_ is_view;
@@ -157,18 +159,18 @@
sizeof...(Elements)==sizeof...(OtherArguments)));
}
-#define VECTOR_ASSIGN_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_VECTOR_ASSIGN_CTOR(COMBINATION,_)\
template<typename SeqRef>\
- vector(support::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
+ vector(detail::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
: base(detail::assign_by_deref(),fusion::begin(seq_assign.get()))\
{\
BOOST_FUSION_STATIC_ASSERT((\
sizeof...(Elements)==result_of::size<SeqRef>::value));\
}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_ASSIGN_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_VECTOR_ASSIGN_CTOR,_);
-#undef VECTOR_ASSIGN_CTOR
+#undef BOOST_FUSION_VECTOR_ASSIGN_CTOR
/*
template<typename Seq>
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector_n.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector_n.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector_n.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -16,13 +16,12 @@
# include BOOST_PP_ITERATE()
#else
-# define N BOOST_PP_ITERATION()
+# define BOOST_FUSION_N BOOST_PP_ITERATION()
//cschmidt: template typedefs if possible...
namespace boost { namespace fusion
{
-
-# if !N
+# if !BOOST_FUSION_N
struct void_;
template <typename T0=void_>
@@ -31,53 +30,57 @@
template<>
struct vector0<void_>
# else
- template <BOOST_PP_ENUM_PARAMS(N, typename T)>
- struct BOOST_PP_CAT(vector, N)
+ template <BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, typename T)>
+ struct BOOST_PP_CAT(vector, BOOST_FUSION_N)
# endif
- : vector<BOOST_PP_ENUM_PARAMS(N, T)>
+ : vector<BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, T)>
{
private:
- typedef vector<BOOST_PP_ENUM_PARAMS(N, T)> base;
+ typedef vector<BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, T)> base;
public:
- BOOST_PP_CAT(vector, N)()
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)()
{}
-# define VECTOR_CTOR(COMBINATION,_)\
- BOOST_PP_CAT(vector, N)(BOOST_PP_CAT(vector, N) COMBINATION vec)\
- : base(sequence_assign(\
- BOOST_FUSION_FORWARD(BOOST_PP_CAT(vector, N) COMBINATION,vec)))\
+# define BOOST_FUSION_VECTOR_CTOR(COMBINATION,_)\
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)(\
+ BOOST_PP_CAT(vector, BOOST_FUSION_N) COMBINATION vec)\
+ : base(sequence_assign(BOOST_FUSION_FORWARD(\
+ BOOST_PP_CAT(vector, BOOST_FUSION_N) COMBINATION,vec)))\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_VECTOR_CTOR,_)
-# undef VECTOR_CTOR
+# undef BOOST_FUSION_VECTOR_CTOR
template<typename Arg>
- BOOST_PP_CAT(vector, N)(BOOST_FUSION_R_ELSE_CLREF(Arg) arg)
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)(BOOST_FUSION_R_ELSE_CLREF(Arg) arg)
: base(BOOST_FUSION_FORWARD(Arg,arg))
{}
-# if N > 1
+# if BOOST_FUSION_N > 1
# ifdef BOOST_NO_RVALUE_REFERENCES
- BOOST_PP_CAT(vector, N)(BOOST_PP_ENUM_BINARY_PARAMS(N, T, const& a))
- : base(BOOST_PP_ENUM_PARAMS(N, a))
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)(
+ BOOST_PP_ENUM_BINARY_PARAMS(N, T, const& a))
+ : base(BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, a))
{}
# else
-# define FORWARD_ARGUMENT(Z, N, __) std::forward<\
+# define BOOST_FUSION_FORWARD_ARGUMENT(Z, N, __) std::forward<\
BOOST_PP_CAT(A,N)>(BOOST_PP_CAT(_,N))
- template <BOOST_PP_ENUM_PARAMS(N, typename A)>
- BOOST_PP_CAT(vector, N)(BOOST_PP_ENUM_BINARY_PARAMS(N, A,&& _))
- : base(BOOST_PP_ENUM(N, FORWARD_ARGUMENT, _))
+ template <BOOST_PP_ENUM_PARAMS(BOOST_FUSION_N, typename A)>
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)(
+ BOOST_PP_ENUM_BINARY_PARAMS(BOOST_FUSION_N, A,&& _))
+ : base(
+ BOOST_PP_ENUM(BOOST_FUSION_N, BOOST_FUSION_FORWARD_ARGUMENT, _))
{}
-# undef FORWARD_ARGUMENT
+# undef BOOST_FUSION_FORWARD_ARGUMENT
# endif
# endif
template<typename Seq>
- BOOST_PP_CAT(vector, N)&
+ BOOST_PP_CAT(vector, BOOST_FUSION_N)&
operator=(BOOST_FUSION_R_ELSE_CLREF(Seq) seq)
{
*static_cast<base*>(this)=BOOST_FUSION_FORWARD(Seq,seq);
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/vector.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/vector.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/vector.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -12,7 +12,7 @@
# include <boost/fusion/container/vector/detail/pp/vector.hpp>
#else
# include <boost/fusion/container/vector/vector_fwd.hpp>
-# include <boost/fusion/support/ref.hpp>
+# include <boost/fusion/support/internal/ref.hpp>
# include <boost/fusion/container/vector/detail/at_impl.hpp>
# include <boost/fusion/container/vector/detail/value_at_impl.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/vector_fwd.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/vector_fwd.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/vector_fwd.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,7 +10,7 @@
#define BOOST_FUSION_CONTAINER_VECTOR_VECTOR_FWD_HPP
#include <boost/fusion/container/vector/limits.hpp>
-#include <boost/fusion/support/template.hpp>
+#include <boost/fusion/support/internal/template.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/generation/detail/gen_make_adapter.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/generation/detail/gen_make_adapter.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/generation/detail/gen_make_adapter.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -6,8 +6,8 @@
http://www.boost.org/LICENSE_1_0.txt).
==============================================================================*/
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
#include <boost/preprocessor/cat.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/include/sequence_assign.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/include/sequence_assign.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/include/sequence_assign.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -6,6 +6,6 @@
#ifndef BOOST_FUSION_INCLUDE_SEQUENCE_ASSIGN_HPP
#define BOOST_FUSION_INCLUDE_SEQUENCE_ASSIGN_HPP
-#include <boost/fusion/support/sequence_assign.hpp>
+#include <boost/fusion/support/internal/sequence_assign.hpp>
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/advance.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/advance.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/advance.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_ITERATOR_ADVANCE_HPP
#include <boost/fusion/iterator/detail/advance.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace fusion
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/basic_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/basic_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/basic_iterator.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -7,8 +7,8 @@
#define BOOST_FUSION_ITERATOR_BASIC_ITERATOR_HPP
#include <boost/fusion/iterator/iterator_facade.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/and.hpp>
#include <boost/mpl/equal_to.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/deref.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/deref.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/deref.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,10 +8,10 @@
#ifndef BOOST_FUSION_ITERATOR_DEREF_HPP
#define BOOST_FUSION_ITERATOR_DEREF_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/iterator_base.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/deref_data.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/deref_data.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/deref_data.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_ITERATOR_DEREF_DATA_HPP
#define BOOST_FUSION_ITERATOR_DEREF_DATA_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/detail/distance.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/detail/distance.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/detail/distance.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,13 +8,14 @@
#ifndef BOOST_FUSION_ITERATOR_DETAIL_DISTANCE_HPP
#define BOOST_FUSION_ITERATOR_DETAIL_DISTANCE_HPP
+#include <boost/fusion/iterator/next.hpp>
+#include <boost/fusion/iterator/equal_to.hpp>
+
#include <boost/mpl/int.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/next.hpp>
#include <boost/mpl/identity.hpp>
-#include <boost/fusion/iterator/next.hpp>
-#include <boost/fusion/iterator/equal_to.hpp>
namespace boost { namespace fusion { namespace distance_detail
{
@@ -44,8 +45,7 @@
, mpl::identity<mpl::int_<0> >
, next_distance<First, Last>
>::type
- {
- };
+ {};
}}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/distance.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/distance.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/distance.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_ITERATOR_DISTANCE_HPP
#include <boost/fusion/iterator/detail/distance.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace fusion
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/equal_to.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/equal_to.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/equal_to.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,7 +10,7 @@
#include <boost/fusion/support/tag_of.hpp>
#include <boost/fusion/support/is_iterator.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/and.hpp>
#include <boost/utility/enable_if.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/iterator_facade.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/iterator_facade.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/iterator_facade.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,8 +9,8 @@
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/iterator/detail/advance.hpp>
#include <boost/fusion/support/iterator_base.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/dummy_tag.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/dummy_tag.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/key_of.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/key_of.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/key_of.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_ITERATOR_KEY_OF_HPP
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/next.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/next.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/next.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_ITERATOR_NEXT_HPP
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/prior.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/prior.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/prior.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_ITERATOR_PRIOR_HPP
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_ITERATOR_VALUE_OF_HPP
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of_data.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of_data.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of_data.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_ITERATOR_VALUE_OF_DATA_HPP
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/fusion_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/fusion_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/fusion_iterator.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -29,8 +29,6 @@
typedef It iterator;
};
- //TODO deref
-
template <typename It>
struct next<fusion_iterator<It> >
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/equal_to.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/equal_to.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/equal_to.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -12,7 +12,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/sequence/comparison/detail/equal_to.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/greater.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/greater.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/greater.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
#ifdef FUSION_DIRECT_OPERATOR_USAGE
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/greater_equal.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/greater_equal.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/greater_equal.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
#ifdef FUSION_DIRECT_OPERATOR_USAGE
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/less.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/less.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/less.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/sequence/comparison/detail/less.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/less_equal.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/less_equal.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/less_equal.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
# ifdef FUSION_DIRECT_OPERATOR_USAGE
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/not_equal_to.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/not_equal_to.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/not_equal_to.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/sequence/comparison/detail/enable_comparison.hpp>
#ifdef FUSION_DIRECT_OPERATOR_USAGE
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/convert.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/convert.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/convert.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,8 +8,8 @@
#ifndef BOOST_FUSION_SEQUENCE_CONVERT_HPP
#define BOOST_FUSION_SEQUENCE_CONVERT_HPP
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
//TODO doc!!!
namespace boost { namespace fusion
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/at.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/at.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/at.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -13,9 +13,9 @@
# include <boost/fusion/sequence/intrinsic/size.hpp>
#endif
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/detail/workaround.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/int.hpp>
#ifdef BOOST_FUSION_ENABLE_STATIC_ASSERTS
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/at_key.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/at_key.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/at_key.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -14,9 +14,9 @@
#endif
#include <boost/fusion/iterator/deref_data.hpp>
#include <boost/fusion/algorithm/query/find_key.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/back.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/back.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/back.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -14,8 +14,8 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/iterator/prior.hpp>
#include <boost/fusion/iterator/deref.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/begin.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/begin.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/begin.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_SEQUENCE_INTRINSIC_BEGIN_HPP
#define BOOST_FUSION_SEQUENCE_INTRINSIC_BEGIN_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/empty.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/empty.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/empty.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,8 +10,8 @@
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/end.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/end.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/end.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_SEQUENCE_INTRINSIC_END_HPP
#define BOOST_FUSION_SEQUENCE_INTRINSIC_END_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/front.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/front.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/front.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -13,8 +13,8 @@
#endif
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/iterator/deref.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/has_key.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/has_key.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/has_key.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,9 +11,9 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/algorithm/query/find_key.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/not.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/size.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/size.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/size.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_SEQUENCE_INTRINSIC_SIZE_HPP
#define BOOST_FUSION_SEQUENCE_INTRINSIC_SIZE_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/int.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/swap.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/swap.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/swap.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -20,7 +20,7 @@
#ifdef BOOST_FUSION_ENABLE_STATIC_ASSERTS
# include <boost/fusion/sequence/intrinsic/size.hpp>
#endif
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <algorithm>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/value_at.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/value_at.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/value_at.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -13,8 +13,8 @@
# include <boost/fusion/sequence/intrinsic/size.hpp>
#endif
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/int.hpp>
#ifdef BOOST_FUSION_ENABLE_STATIC_ASSERTS
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/value_at_key.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/value_at_key.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/value_at_key.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -15,8 +15,8 @@
#include <boost/fusion/iterator/value_of_data.hpp>
#include <boost/fusion/algorithm/query/find_key.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/int.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/io/detail/in.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/io/detail/in.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/io/detail/in.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -7,8 +7,6 @@
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
-//TODO !!!
-
#ifndef BOOST_FUSION_SEQUENCE_IO_DETAIL_IN_HPP
#define BOOST_FUSION_SEQUENCE_IO_DETAIL_IN_HPP
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/io/in.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/io/in.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/io/in.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -6,11 +6,12 @@
Distributed under 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)
==============================================================================*/
-#if !defined(BOOST_IN_05042005_0120)
-#define BOOST_IN_05042005_0120
+
+#ifndef BOOST_FUSION_SEQUENCE_IO_IN_HPP
+#define BOOST_FUSION_SEQUENCE_IO_IN_HPP
#include <boost/fusion/support/is_sequence.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <istream>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/io/out.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/io/out.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/io/out.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -6,11 +6,12 @@
Distributed under 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)
==============================================================================*/
-#if !defined(BOOST_OUT_05042005_0120)
-#define BOOST_OUT_05042005_0120
+
+#ifndef BOOST_FUSION_SEQUENCE_IO_OUT_HPP
+#define BOOST_FUSION_SEQUENCE_IO_OUT_HPP
#include <boost/fusion/support/is_sequence.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/mpl/or.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/sequence_facade.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/sequence_facade.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/sequence_facade.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -7,7 +7,7 @@
#define BOOST_FUSION_SEQUENCE_SEQUENCE_FACADE_HPP
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/dummy_tag.hpp>
+#include <boost/fusion/support/internal/dummy_tag.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/support.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,17 +8,17 @@
#ifndef BOOST_FUSION_SUPPORT_HPP
#define BOOST_FUSION_SUPPORT_HPP
-//TODO cschmidt: decouple internal helper and public support classes
-
#include <boost/fusion/support/category_of.hpp>
+#include <boost/fusion/support/deduce_sequence.hpp>
+#include <boost/fusion/support/deduce.hpp>
#include <boost/fusion/support/is_iterator.hpp>
#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/fusion/support/is_view.hpp>
#include <boost/fusion/support/iterator_base.hpp>
#include <boost/fusion/support/pair.hpp>
#include <boost/fusion/support/sequence_base.hpp>
+#include <boost/fusion/support/tag_of_fwd.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/deduce.hpp>
-#include <boost/fusion/support/deduce_sequence.hpp>
#include <boost/fusion/support/unused.hpp>
#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/support/assert.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/assert.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
+++ (empty file)
@@ -1,100 +0,0 @@
-// Copyright Christopher Schmidt 2009.
-// Distributed under 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_FUSION_SUPPORT_ASSERT_HPP
-#define BOOST_FUSION_SUPPORT_ASSERT_HPP
-
-#ifdef BOOST_FUSION_ENABLE_STATIC_ASSERTS
-# include <boost/config.hpp>
-
-# ifdef BOOST_NO_STATIC_ASSERT
-# include <boost/mpl/assert.hpp>
-# include <boost/static_assert.hpp>
-
-# define BOOST_FUSION_MPL_ASSERT(PRED)\
- BOOST_MPL_ASSERT(PRED)
-# define BOOST_FUSION_MPL_ASSERT_NOT(PRED)\
- BOOST_MPL_ASSERT_NOT(PRED)
-# define BOOST_FUSION_STATIC_ASSERT(PRED)\
- BOOST_STATIC_ASSERT(PRED)
-# define BOOST_FUSION_MPL_ASSERT_MSG(PRED,MESSAGE)\
- BOOST_FUSION_MPL_ASSERT(PRED)
-# define BOOST_FUSION_MPL_ASSERT_NOT_MSG(PRED,MESSAGE)\
- BOOST_FUSION_MPL_ASSERT_NOT(PRED)
-# define BOOST_FUSION_STATIC_ASSERT_MSG(PRED,MESSAGE)\
- BOOST_FUSION_STATIC_ASSERT(PRED)
-# else
-# include <boost/preprocessor/stringize.hpp>
-# include <boost/mpl/if.hpp>
-
-namespace boost { namespace fusion { namespace detail
-{
- typedef char small_type;
- struct big_type
- {
- char data[1024];
- };
-
- template<typename Pred>
- typename mpl::if_<Pred,small_type,big_type>::type
- evaluate_pred(void(*)(Pred));
-}}}
-
-# define BOOST_FUSION_MPL_ASSERT(PRED)\
- static_assert(\
- sizeof(detail::evaluate_pred(\
- reinterpret_cast<void (*) PRED>(0)))==\
- sizeof(detail::small_type)\
- , "assert failed: " BOOST_PP_STRINGIZE(PRED))
-# define BOOST_FUSION_MPL_ASSERT_NOT(PRED)\
- static_assert(\
- sizeof(detail::evaluate_pred(\
- reinterpret_cast<void (*) PRED>(0)))==\
- sizeof(detail::big_type)\
- , "assert failed: " BOOST_PP_STRINGIZE(PRED))
-# define BOOST_FUSION_STATIC_ASSERT(PRED)\
- static_assert(\
- PRED\
- , "assert failed: " BOOST_PP_STRINGIZE(PRED))
-# define BOOST_FUSION_MPL_ASSERT_MSG(PRED,MESSAGE)\
- static_assert(\
- sizeof(detail::evaluate_pred(\
- reinterpret_cast<void (*) PRED>(0)))==\
- sizeof(detail::small_type)\
- , MESSAGE " - assert expression: " BOOST_PP_STRINGIZE(PRED))
-# define BOOST_FUSION_MPL_ASSERT_NOT_MSG(PRED,MESSAGE)\
- static_assert(\
- sizeof(detail::evaluate_pred(\
- reinterpret_cast<void (*) PRED>(0)))!=\
- , sizeof(detail::small_type)\
- , MESSAGE " - assert expression: " BOOST_PP_STRINGIZE(PRED))
-# define BOOST_FUSION_STATIC_ASSERT_MSG(PRED,MESSAGE)\
- static_assert(\
- PRED\
- , MESSAGE " - assert expression: " BOOST_PP_STRINGIZE(PRED))
-# endif
-#else
-# define BOOST_FUSION_MPL_ASSERT(PRED)
-# define BOOST_FUSION_MPL_ASSERT_NOT(PRED)
-# define BOOST_FUSION_STATIC_ASSERT(PRED)
-# define BOOST_FUSION_MPL_ASSERT_MSG(PRED,MESSAGE)
-# define BOOST_FUSION_MPL_ASSERT_NOT_MSG(PRED,MESSAGE)
-# define BOOST_FUSION_STATIC_ASSERT_MSG(PRED,MESSAGE)
-#endif
-
-#define BOOST_FUSION_INDEX_CHECK(INDEX,MAX)\
- BOOST_FUSION_STATIC_ASSERT_MSG(\
- INDEX >= 0 && INDEX < MAX, "index out of range")
-
-#ifdef BOOST_FUSION_ENABLE_STATIC_ASSERTS
-//TODO ->support.hpp
-# include <boost/fusion/support/is_view.hpp>
-# include <boost/fusion/support/is_sequence.hpp>
-# include <boost/fusion/support/is_iterator.hpp>
-# include <boost/fusion/support/category_of.hpp>
-# include <boost/fusion/support/tag_of.hpp>
-#endif
-
-#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/support/assign_tags.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/assign_tags.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
+++ (empty file)
@@ -1,18 +0,0 @@
-// Copyright Christopher Schmidt 2009.
-// Distributed under 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_FUSION_SUPPORT_ASSIGN_TAGS_HPP
-#define BOOST_FUSION_SUPPORT_ASSIGN_TAGS_HPP
-
-namespace boost { namespace fusion { namespace detail
-{
- struct assign_directly
- {};
-
- struct assign_by_deref
- {};
-}}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/category_of.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/category_of.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/category_of.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,7 +8,7 @@
#ifndef BOOST_FUSION_SUPPORT_CATEGORY_OF_HPP
#define BOOST_FUSION_SUPPORT_CATEGORY_OF_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/tag_of.hpp>
#include <boost/config.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/deduce.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/deduce.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/deduce.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -6,7 +6,7 @@
#ifndef BOOST_FUSION_SUPPORT_DEDUCE_HPP
#define BOOST_FUSION_SUPPORT_DEDUCE_HPP
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
#include <boost/config.hpp>
#ifdef BOOST_NO_RVALUE_REFERENCES
Deleted: sandbox/SOC/2009/fusion/boost/fusion/support/dummy_tag.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/dummy_tag.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
+++ (empty file)
@@ -1,23 +0,0 @@
-// Copyright Christopher Schmidt 2009.
-// Distributed under 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_FUSION_SUPPORT_DUMMY_TAG_HPP
-#define BOOST_FUSION_SUPPORT_DUMMY_TAG_HPP
-
-namespace boost { namespace fusion
-{
- struct void_;
-
- namespace detail
- {
- template<typename>
- struct get_dummy_tag
- {
- typedef void_ type;
- };
- }
-}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/is_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/is_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/is_iterator.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -8,7 +8,7 @@
#ifndef BOOST_FUSION_SUPPORT_IS_ITERATOR_HPP
#define BOOST_FUSION_SUPPORT_IS_ITERATOR_HPP
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/iterator_base.hpp>
#include <boost/type_traits/is_base_of.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/is_sequence.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/is_sequence.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/is_sequence.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_SUPPORT_IS_SEQUENCE_HPP
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/type_traits/is_base_of.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/is_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/is_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/is_view.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_SUPPORT_IS_VIEW_HPP
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/pair.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/pair.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/pair.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,8 +9,8 @@
#ifndef BOOST_FUSION_SUPPORT_PAIR_HPP
#define BOOST_FUSION_SUPPORT_PAIR_HPP
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
#if defined(BOOST_NO_VARIADIC_TEMPLATES) && defined(BOOST_NO_RVALUE_REFERENCES)
# include <boost/call_traits.hpp>
@@ -26,16 +26,16 @@
: second()
{}
-#define PAIR_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_PAIR_CTOR(COMBINATION,_)\
template<typename OtherFirst,typename OtherSecond>\
pair(pair<OtherFirst,OtherSecond> COMBINATION pair_)\
: second(static_cast<pair<OtherFirst,OtherSecond> COMBINATION>(pair_)\
.second)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(PAIR_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_PAIR_CTOR,_)
-#undef PAIR_CTOR
+#undef BOOST_FUSION_PAIR_CTOR
#ifdef BOOST_NO_VARIADIC_TEMPLATES
Deleted: sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
+++ (empty file)
@@ -1,199 +0,0 @@
-// Copyright Christopher Schmidt 2009.
-// Distributed under 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_FUSION_SUPPORT_REF_HPP
-#define BOOST_FUSION_SUPPORT_REF_HPP
-
-#include <boost/config.hpp>
-
-#include <boost/preprocessor/empty.hpp>
-
-#include <boost/mpl/eval_if.hpp>
-#ifndef BOOST_NO_RVALUE_REFERENCES
-# include <boost/mpl/or.hpp>
-#endif
-#include <boost/mpl/not.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/identity.hpp>
-#include <boost/mpl/bool.hpp>
-
-#include <boost/type_traits/is_class.hpp>
-#include <boost/type_traits/is_array.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_volatile.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/add_const.hpp>
-#include <boost/type_traits/add_volatile.hpp>
-#include <boost/type_traits/remove_const.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-
-#ifndef BOOST_NO_RVALUE_REFERENCES
-# include <utility>
-#endif
-
-//cschmidt: We ignore volatile in the BOOST_FUSION_ALL_CV_*-Macros, as we would
-//get a lot of problems with older compilers. On top of that, fusion
-//types are not meant to be volatile anyway.
-#ifdef BOOST_NO_RVALUE_REFERENCES
-# define BOOST_FUSION_R_ELSE_LREF(OBJECT) OBJECT&
-# define BOOST_FUSION_R_ELSE_CLREF(OBJECT) OBJECT const&
-
-# define BOOST_FUSION_FORWARD(TYPE,ARGUMENT) ARGUMENT
-
-# define BOOST_FUSION_ALL_CTOR_COMBINATIONS(MACRO,ARG)\
- MACRO(const&,ARG)
-# define BOOST_FUSION_ALL_CV_REF_COMBINATIONS(MACRO,ARG)\
- MACRO(const&,ARG)\
- MACRO(&,ARG)
-#else
-# define BOOST_FUSION_R_ELSE_LREF(OBJECT) OBJECT&&
-# define BOOST_FUSION_R_ELSE_CLREF(OBJECT) OBJECT&&
-
-# define BOOST_FUSION_FORWARD(TYPE,ARGUMENT) std::forward<TYPE>(ARGUMENT)
-
-# define BOOST_FUSION_ALL_CTOR_COMBINATIONS(MACRO,ARG)\
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(MACRO,ARG)
-# define BOOST_FUSION_ALL_CV_REF_COMBINATIONS(MACRO,ARG)\
- MACRO(&,ARG)\
- MACRO(const&,ARG)\
- MACRO(&&,ARG)\
- MACRO(const&&,ARG)
-#endif
-#define BOOST_FUSION_ALL_CV_REF_NON_REF_COMBINATIONS(MACRO,ARG)\
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(MACRO,ARG)\
- MACRO(BOOST_PP_EMPTY(),ARG)\
- MACRO(const,ARG)
-
-namespace boost { namespace fusion { namespace detail
-{
- //cschmidt: workaround until boost::is_reference supports rvalues
- template<typename T>
- struct is_lrref
- : mpl::false_
- {
- };
-
- template<typename T>
- struct is_lrref<T&>
- : mpl::true_
- {
- };
-
-#ifndef BOOST_NO_RVALUE_REFERENCES
- template<typename T>
- struct is_lrref<T&&>
- : mpl::true_
- {
- };
-
- template<typename T>
- struct is_rref
- : mpl::false_
- {
- };
-
- template<typename T>
- struct is_rref<T&&>
- : mpl::true_
- {
- };
-#endif
-
- //cschmidt: workaround until boost::is_reference supports rvalues
- template<typename T>
- struct remove_reference
- {
- typedef T type;
- };
-
- template<typename T>
- struct remove_reference<T&>
- {
- typedef T type;
- };
-
-#ifndef BOOST_NO_RVALUE_REFERENCES
- template<typename T>
- struct remove_reference<T&&>
- {
- typedef T type;
- };
-#endif
-
- template <typename T>
- struct add_lref
- : add_reference<T>
- {};
-
-#ifndef BOOST_NO_RVALUE_REFERENCES
- template <typename T>
- struct add_lref<T&&>
- {
- typedef T&& type;
- };
-#endif
-
- template <typename T>
- struct identity
- {
- typedef typename remove_const<
- typename remove_cv<
- typename remove_reference<T>::type
- >::type
- >::type type;
- };
-
- template <typename T>
- struct non_ref_parameter
- {
- typedef typename boost::remove_cv<T>::type const& type;
- };
-
- template <typename TestType,typename Type>
- struct forward_as
- {
- typedef typename remove_reference<TestType>::type test_type;
-
- typedef typename
- mpl::if_<
- is_const<test_type>
- , typename add_const<Type>::type
- , Type
- >::type
- const_type;
-
- typedef typename
- mpl::if_<
- is_volatile<test_type>
- , typename add_volatile<const_type>::type
- , const_type
- >::type
- cv_type;
-
-#ifdef BOOST_NO_RVALUE_REFERENCES
- typedef typename add_reference<cv_type>::type type;
-#else
- typedef typename
- mpl::eval_if<
- //8.5.3p5...
- mpl::or_<is_class<Type>
- , is_array<Type>
- //cschmidt: workaround until Boost.type_traits supports
- //rvalue refs!
- , mpl::not_<is_rref<TestType> >
- >,
- mpl::eval_if<
- is_rref<TestType>
- , mpl::identity<cv_type&&>
- , detail::add_lref<cv_type>
- >,
- mpl::identity<cv_type>
- >::type
- type;
-#endif
- };
-}}}
-
-#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/support/result_of.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/result_of.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
+++ (empty file)
@@ -1,220 +0,0 @@
-// Copyright Christopher Schmidt 2009.
-// Distributed under 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_FUSION_SUPPORT_RESULT_OF_HPP
-#define BOOST_FUSION_SUPPORT_RESULT_OF_HPP
-
-//cschmidt: fusion might call result_of on class types without an operator().
-//Therefore we emulate the old behavior if (and only if) the boost
-//implementation falls back to decltype by default.
-
-#include <boost/fusion/support/ref.hpp>
-
-#include <boost/mpl/if.hpp>
-#include <boost/utility/result_of.hpp>
-#include <boost/type_traits/remove_pointer.hpp>
-#include <boost/type_traits/is_function.hpp>
-#include <boost/type_traits/is_member_function_pointer.hpp>
-
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
-# include <boost/mpl/if.hpp>
-#else
-# include <boost/mpl/eval_if.hpp>
-# include <boost/mpl/has_xxx.hpp>
-#endif
-
-namespace boost { namespace fusion { namespace support
-{
-//cschmidt: a pp implementation won't be worth the effort
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
- template<typename FRef>
- struct is_preevaluable
- : mpl::false_
- {};
-
- template<typename FRef>
- struct preevaluate;
-#else
- //cschmidt: These metafunction needs to handle
- //T()
- //T(&)()
- //T(cv&)()
- //T(*)()
- //T(*cv)()
- //T(*cv&)()
- //T(C::*)()
- //T(C::*cv)()
- //T(C::*&)()
- //T(C::*cv&)()
- //T(C::*)()cv
- //T(C::*cv)()cv
- //T(C::*&)()cv
- //T(C::*cv&)()cv
- //T(C::*)()cv&
- //T(C::*cv)()cv&
- //T(C::*&)()cv&
- //T(C::*cv&)()cv&
- //& -> &&
-
- template<typename FRef>
- struct is_preevaluable
- {
- typedef typename
- remove_pointer<
- typename detail::identity<FRef>::type
- >::type
- f;
-
- typedef
- mpl::or_<
- typename is_function<f>::type
- , typename is_member_function_pointer<f>::type
- >
- type;
- };
-
- template<typename FRef>
- struct preevaluate_impl;
-
- template<typename Result,typename... Args>
- struct preevaluate_impl<Result (Args...)>
- {
- typedef Result type;
- };
-
- template<typename Result,typename Class,typename... Args>
- struct preevaluate_impl<Result(Class::*)(Args...)>
- {
- typedef Class& class_type;
-
- typedef Result type;
- };
-
- //cschmidt: Once we get a macro to find out whether the compiler
- //supports rvalue references for this, use
- //BOOST_FUSION_ALL_CV_REF_COMBINATIONS
- template<typename Result,typename Class,typename... Args>
- struct preevaluate_impl<Result(Class::*)(Args...) const>
- {
- typedef Class const& class_type;
-
- typedef Result type;
- };
-
- template<typename Result,typename Class,typename... Args>
- struct preevaluate_impl<Result(Class::*)(Args...) const volatile>
- {
- typedef Class const volatile& class_type;
-
- typedef Result type;
- };
-
- template<typename Result,typename Class,typename... Args>
- struct preevaluate_impl<Result(Class::*)(Args...) volatile>
- {
- typedef Class volatile& class_type;
-
- typedef Result type;
- };
-
- template<typename FRef>
- struct preevaluate
- : preevaluate_impl<
- typename remove_pointer<
- typename detail::identity<FRef>::type
- >::type
- >
- {};
-#endif
-
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
- using boost::result_of;
-
- //cschmidt: The non-decltype result_of does not like ref-qualified
- //'class type' functions
- template<typename FRef>
- struct get_func_base
- {
- typedef typename
- remove_pointer<
- typename detail::identity<FRef>::type
- >::type
- f;
-
- typedef typename
- mpl::if_<
- mpl::or_<
- typename is_function<f>::type
- , typename is_member_function_pointer<f>::type
- >
- , FRef
- , f
- >::type
- type;
- };
-#else
-}
-namespace detail
-{
- BOOST_MPL_HAS_XXX_TRAIT_DEF(result_type)
-
- template<typename IdentityF>
- struct get_result_type
- {
- typedef typename IdentityF::result_type type;
- };
-
- template<typename IdentityF, typename Sig>
- struct get_result
- : IdentityF::template result<Sig>
- {};
-
- template<typename IdentityF,typename F,typename... Args>
- struct result_of_class_type
- {
- typedef typename
- mpl::eval_if<
- detail::has_result_type<IdentityF>
- , detail::get_result_type<IdentityF>
- //TODO cschmidt: fallback to boost::result_of (decltype) if
- //'F::template result' does not exist.
- //Is this even possible?
- , detail::get_result<IdentityF,F(Args...)>
- >::type
- type;
- };
-}
-
-namespace support
-{
- template<typename Sig>
- struct result_of
- : boost::result_of<Sig>
- {
- };
-
- template<typename F, typename... Args>
- struct result_of<F(Args...)>
- {
- typedef typename detail::identity<F>::type f;
-
- typedef typename
- mpl::eval_if<
- is_function<f>
- , boost::result_of<F(Args...)>
- , detail::result_of_class_type<f,F,Args...>
- >::type
- type;
- };
-
- template<typename FRef>
- struct get_func_base
- {
- typedef FRef type;
- };
-#endif
-}}}
-
-#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/support/sequence_assign.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/sequence_assign.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
+++ (empty file)
@@ -1,45 +0,0 @@
-// Copyright Christopher Schmidt 2009.
-// Distributed under 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_FUSION_SUPPORT_SEQUENCE_ASSIGN_HPP
-#define BOOST_FUSION_SUPPORT_SEQUENCE_ASSIGN_HPP
-
-#include <boost/fusion/support/ref.hpp>
-
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/if.hpp>
-
-namespace boost{namespace fusion{
-
- namespace support
- {
- template<typename Seq>
- struct sequence_assign_type
- {
- typedef Seq seq_type;
-
- sequence_assign_type(Seq seq)
- : seq(seq)
- {}
-
- Seq get()const
- {
- return seq;
- }
-
- private:
- Seq seq;
- };
- }
-
- template<typename Seq>
- support::sequence_assign_type<BOOST_FUSION_R_ELSE_CLREF(Seq)>
- sequence_assign(BOOST_FUSION_R_ELSE_CLREF(Seq) seq)
- {
- return seq;
- }
-}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/tag_of.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/tag_of.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/tag_of.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_SUPPORT_TAG_OF_HPP
#include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/mpl/is_sequence.hpp>
#include <boost/mpl/eval_if.hpp>
Deleted: sandbox/SOC/2009/fusion/boost/fusion/support/template.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/template.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
+++ (empty file)
@@ -1,64 +0,0 @@
-// Copyright Christopher Schmidt 2009.
-// Distributed under 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_FUSION_SUPPORT_TEMPLATE_HPP
-#define BOOST_FUSION_SUPPORT_TEMPLATE_HPP
-
-#include <boost/config.hpp>
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# include <boost/fusion/support/ref.hpp>
-
-# include <boost/preprocessor/expand.hpp>
-# include <boost/preprocessor/empty.hpp>
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/control/if.hpp>
-# include <boost/preprocessor/facilities/intercept.hpp>
-# include <boost/preprocessor/comparison/equal.hpp>
-# include <boost/preprocessor/arithmetic/sub.hpp>
-# include <boost/preprocessor/repetition/enum.hpp>
-# include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-# include <boost/preprocessor/repetition/enum_params.hpp>
-# include <boost/preprocessor/repetition/enum_binary_params.hpp>
-# include <boost/call_traits.hpp>
-#endif
-
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# define DUMMY1(_)
-# define DUMMY2(_,__)
-
- //cschmidt: for clarity’s sake no linebreaks
-# define VARIADIC_TEMPLATE(N) template<BOOST_PP_ENUM_PARAMS(N, typename T)>
-# define VARIADIC_TEMPLATE_WITH_DEFAULT(N) template<BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(N, typename T, void_)>
-# define EXPAND_TEMPLATE_ARGUMENTS(N) BOOST_PP_ENUM_PARAMS(N, T)
-# ifdef BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS
-# define EXPAND_TEMPLATE_ARGUMENTS_SPECIALIZATION_IMPL(MAX,N)<EXPAND_TEMPLATE_ARGUMENTS(N), BOOST_PP_ENUM_PARAMS(BOOST_PP_SUB(MAX,N), void_)>
-# else
-# define EXPAND_TEMPLATE_ARGUMENTS_SPECIALIZATION_IMPL(MAX,N)<EXPAND_TEMPLATE_ARGUMENTS(N)>
-# endif
-# define EXPAND_TEMPLATE_ARGUMENTS_SPECIALIZATION(MAX,N)BOOST_PP_IF(BOOST_PP_EQUAL(MAX,N),DUMMY2,EXPAND_TEMPLATE_ARGUMENTS_SPECIALIZATION_IMPL)(MAX,N)
-# define EXPAND_TEMPLATE_ARGUMENTS_BINARY(N,PRE,POST)BOOST_PP_ENUM_BINARY_PARAMS(N, PRE T, POST BOOST_PP_INTERCEPT)
-# define EXPAND_TEMPLATE_ARGUMENTS_CALL_PARAMS(N)BOOST_PP_ENUM_BINARY_PARAMS(N, typename call_traits<T, >::param_type _)
-# define EXPAND_PARAMETERS(N) BOOST_PP_ENUM_PARAMS(N, _)
-
-# define VARIADIC_TEMPLATE_A_IMPL(N) template<BOOST_PP_ENUM_PARAMS(N, typename A)>
-# define VARIADIC_TEMPLATE_A(N) BOOST_PP_IF(N,VARIADIC_TEMPLATE_A_IMPL,DUMMY1)(N)
-# define EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_LREF(N)BOOST_PP_ENUM_BINARY_PARAMS(N, A, BOOST_FUSION_R_ELSE_LREF(BOOST_PP_EMPTY()) BOOST_PP_INTERCEPT)
-# define EXPAND_TEMPLATE_ARGUMENTS_A_R_ELSE_CLREF(N)BOOST_PP_ENUM_BINARY_PARAMS(N, A,BOOST_FUSION_R_ELSE_CLREF(BOOST_PP_EMPTY()) BOOST_PP_INTERCEPT)
-# define EXPAND_TEMPLATE_ARGUMENTS_PARAMETERS_A_R_ELSE_LREF(N)BOOST_PP_ENUM_BINARY_PARAMS(N, A, BOOST_FUSION_R_ELSE_LREF(BOOST_PP_EMPTY()) _)
-# define EXPAND_TEMPLATE_ARGUMENTS_PARAMETERS_A_R_ELSE_CLREF(N)BOOST_PP_ENUM_BINARY_PARAMS(N, A,BOOST_FUSION_R_ELSE_CLREF(BOOST_PP_EMPTY()) _)
-# define EXPAND_PARAMETERS_A_IMPL(Z,N,__) BOOST_FUSION_FORWARD(BOOST_PP_CAT(A,N),BOOST_PP_CAT(_,N))
-# define EXPAND_PARAMETERS_A(N) BOOST_PP_ENUM(N,EXPAND_PARAMETERS_A_IMPL,_)
-
-namespace boost { namespace fusion
-{
- struct void_;
-}}
-#else
-# define VARIADIC_TEMPLATE_WITH_DEFAULT(MAX) template<typename... Arguments>
-# define VARIADIC_TEMPLATE(MAX) template<typename... Arguments>
-# define EXPAND_TEMPLATE_ARGUMENTS(MAX) Arguments...
-#endif
-
-#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/support/to_random_access_mpl_seq.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/to_random_access_mpl_seq.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
+++ (empty file)
@@ -1,44 +0,0 @@
-// Copyright Christopher Schmidt 2009.
-// Distributed under 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_FUSION_SUPPORT_TO_RANDOM_ACCESS_MPL_SEQ_HPP
-#define BOOST_FUSION_SUPPORT_TO_RANDOM_ACCESS_MPL_SEQ_HPP
-
-#include <boost/fusion/mpl.hpp>
-#include <boost/fusion/support/category_of.hpp>
-
-#include <boost/mpl/fold.hpp>
-#include <boost/mpl/placeholders.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/push_back.hpp>
-
-namespace boost { namespace fusion { namespace detail
-{
- template<
- typename Seq
- , bool random_access=traits::is_random_access<Seq>::value
- >
- struct to_random_access_mpl_seq;
-
- template<typename Seq>
- struct to_random_access_mpl_seq<Seq,true>
- {
- typedef Seq type;
- };
-
- template<typename Seq>
- struct to_random_access_mpl_seq<Seq,false>
- {
- typedef typename
- mpl::fold<
- Seq
- , mpl::vector0<>
- , mpl::push_back<mpl::_1, mpl::_2>
- >::type
- type;
- };
-}}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -16,8 +16,8 @@
#include <boost/fusion/sequence/comparison.hpp>
#include <boost/fusion/sequence/io.hpp>
#include <boost/fusion/adapted/std_pair.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/detail/workaround.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/workaround.hpp>
#include <boost/fusion/container/detail/forward_ctor.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple_fwd.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple_fwd.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple_fwd.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_TUPLE_TUPLE_FWD_HPP
#include <boost/fusion/container/vector/limits.hpp>
-#include <boost/fusion/support/template.hpp>
+#include <boost/fusion/support/internal/template.hpp>
namespace boost { namespace fusion
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/detail/strictest_traversal.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/detail/strictest_traversal.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/detail/strictest_traversal.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/algorithm/iteration/fold.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/mpl/if.hpp>
#include <boost/type_traits/is_base_of.hpp>
@@ -30,7 +30,7 @@
{
typedef typename traits::category_of<NextSeq>::type next_tag;
typedef typename
- detail::identity<StrictestSoFar>::type
+ identity<StrictestSoFar>::type
strictest_so_far_identity;
typedef typename
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/detail/view_storage.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/detail/view_storage.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/detail/view_storage.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -7,7 +7,7 @@
#define BOOST_FUSION_VIEW_DETAIL_VIEW_STORAGE_HPP
#include <boost/fusion/support/is_view.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/bool.hpp>
@@ -54,15 +54,15 @@
call_param;
#endif
-#define VIEW_STORAGE_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_VIEW_STORAGE_CTOR(COMBINATION,_)\
template<typename OtherT>\
view_storage(view_storage<OtherT> COMBINATION storage)\
: t(get_init_type(storage.get(), typename traits::is_view<T>::type()))\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(VIEW_STORAGE_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_VIEW_STORAGE_CTOR,_)
-#undef VIEW_STORAGE_CTOR
+#undef BOOST_FUSION_VIEW_STORAGE_CTOR
#ifdef BOOST_NO_RVALUE_REFERENCES
view_storage(call_param t)
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/filter_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/filter_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/filter_view.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,9 +11,9 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/view/detail/view_storage.hpp>
#include <boost/mpl/eval_if.hpp>
@@ -61,15 +61,15 @@
typedef fusion_sequence_tag tag;
typedef mpl::true_ is_view;
-#define FILTER_VIEW_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_FILTER_VIEW_CTOR(COMBINATION,_)\
template<typename OtherSeq>\
filter_view(filter_view<OtherSeq, Pred> COMBINATION view)\
: seq(static_cast<filter_view<OtherSeq, Pred> COMBINATION>(view).seq)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(FILTER_VIEW_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_FILTER_VIEW_CTOR,_)
-#undef FILTER_VIEW_CTOR
+#undef BOOST_FUSION_FILTER_VIEW_CTOR
#ifdef BOOST_NO_RVALUE_REFERENCES
explicit
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/iterator_range/iterator_range.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/iterator_range/iterator_range.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/iterator_range/iterator_range.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,10 +9,10 @@
#define BOOST_FUSION_VIEW_ITERATOR_RANGE_ITERATOR_RANGE_HPP
#include <boost/fusion/iterator/distance.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/joint_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/joint_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/joint_view.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -12,9 +12,9 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/view/detail/view_storage.hpp>
#include <boost/mpl/eval_if.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/reverse_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/reverse_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/reverse_view.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,11 +11,11 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/view/detail/view_storage.hpp>
#include <boost/mpl/eval_if.hpp>
@@ -65,21 +65,16 @@
typedef fusion_sequence_tag tag;
typedef mpl::true_ is_view;
- //BOOST_FUSION_STATIC_ASSERT(
- // (is_base_of<bidirectional_traversal_tag,
- // typename traits::category_of<first_type>::type>::value),
- // "underlying iterator must be bidirectional");
-
-#define REVERSE_VIEW_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_REVERSE_VIEW_CTOR(COMBINATION,_)\
template<typename OtherSeq>\
reverse_view(reverse_view<OtherSeq> COMBINATION view)\
: seq(BOOST_FUSION_FORWARD(\
reverse_view<OtherSeq> COMBINATION,view).seq)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(REVERSE_VIEW_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_REVERSE_VIEW_CTOR,_)
-#undef REVERSE_VIEW_CTOR
+#undef BOOST_FUSION_REVERSE_VIEW_CTOR
#ifdef BOOST_NO_RVALUE_REFERENCES
explicit
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/single_view/single_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/single_view/single_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/single_view/single_view.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,10 +9,10 @@
#define BOOST_FUSION_VIEW_SINGLE_VIEW_SINGLE_VIEW_HPP
#include <boost/fusion/sequence/intrinsic/front.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/sequence_assign.hpp>
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/support/internal/sequence_assign.hpp>
+#include <boost/fusion/support/internal/as_fusion_element.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/int.hpp>
@@ -51,14 +51,14 @@
: val()
{}
-#define SINGLE_VIEW_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_SINGLE_VIEW_CTOR(COMBINATION,_)\
single_view(single_view COMBINATION view)\
: val(BOOST_FUSION_FORWARD(single_view COMBINATION,view).val)\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(SINGLE_VIEW_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_SINGLE_VIEW_CTOR,_)
-#undef SINGLE_VIEW_CTOR
+#undef BOOST_FUSION_SINGLE_VIEW_CTOR
#ifdef BOOST_NO_RVALUE_REFERENCES
explicit
@@ -73,16 +73,16 @@
{}
#endif
-#define SINGLE_VIEW_ASSIGN_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_SINGLE_VIEW_ASSIGN_CTOR(COMBINATION,_)\
template<typename SeqRef>\
single_view(\
- support::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
+ detail::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
: val(fusion::front(seq_assign.get()))\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(SINGLE_VIEW_ASSIGN_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_SINGLE_VIEW_ASSIGN_CTOR,_)
-#undef SINGLE_VIEW_ASSIGN_CTOR
+#undef BOOST_FUSION_SINGLE_VIEW_ASSIGN_CTOR
template<typename OtherT>
single_view&
@@ -92,18 +92,18 @@
return *this;
}
-#define SINGLE_VIEW_SEQ_ASSIGN(COMBINATION,_)\
+#define BOOST_FUSION_SINGLE_VIEW_SEQ_ASSIGN(COMBINATION,_)\
template<typename SeqRef>\
single_view&\
- operator=(support::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
+ operator=(detail::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
{\
val=fusion::front(seq_assign.get());\
return *this;\
}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(SINGLE_VIEW_SEQ_ASSIGN,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_SINGLE_VIEW_SEQ_ASSIGN,_)
-#undef SINGLE_VIEW_SEQ_ASSIGN
+#undef BOOST_FUSION_SINGLE_VIEW_SEQ_ASSIGN
value_type val;
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/at_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/at_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/at_impl.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,7 +10,7 @@
#define BOOST_FUSION_VIEW_TRANSFORM_VIEW_DETAIL_AT_IMPL_HPP
#include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/support/result_of.hpp>
+#include <boost/fusion/support/internal/result_of.hpp>
namespace boost { namespace fusion { namespace extension
{
@@ -26,8 +26,8 @@
typedef typename detail::remove_reference<SeqRef>::type seq;
typedef typename
- support::result_of<
- typename support::get_func_base<
+ detail::internal::result_of<
+ typename detail::get_func_base<
typename seq::transform_type
>::type(
typename result_of::at<typename seq::seq_type, N>::type
@@ -52,8 +52,8 @@
typedef typename detail::remove_reference<SeqRef>::type seq;
typedef typename
- support::result_of<
- typename support::get_func_base<
+ detail::internal::result_of<
+ typename detail::get_func_base<
typename seq::transform_type
>::type(
typename boost::fusion::result_of::at<
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/deref_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/deref_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/deref_impl.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,7 +10,7 @@
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/value_of.hpp>
-#include <boost/fusion/support/result_of.hpp>
+#include <boost/fusion/support/internal/result_of.hpp>
namespace boost { namespace fusion { namespace extension
{
@@ -29,8 +29,8 @@
it;
typedef typename
- support::result_of<
- typename support::get_func_base<
+ detail::internal::result_of<
+ typename detail::get_func_base<
typename it::transform_type
>::type(
typename result_of::deref<typename it::first_type>::type
@@ -56,8 +56,8 @@
typedef typename detail::remove_reference<ItRef>::type it;
typedef typename
- support::result_of<
- typename support::get_func_base<
+ detail::internal::result_of<
+ typename detail::get_func_base<
typename it::transform_type
>::type(
typename result_of::deref<typename it::first1_type>::type
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_at_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_at_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_at_impl.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -10,7 +10,7 @@
#define BOOST_FUSION_VIEW_TRANSFORM_VIEW_DETAIL_VALUE_AT_IMPL_HPP
#include <boost/fusion/sequence/intrinsic/value_at.hpp>
-#include <boost/fusion/support/result_of.hpp>
+#include <boost/fusion/support/internal/result_of.hpp>
namespace boost { namespace fusion { namespace extension
{
@@ -26,8 +26,8 @@
typedef typename detail::remove_reference<SeqRef>::type seq;
typedef typename
- support::result_of<
- typename support::get_func_base<
+ detail::internal::result_of<
+ typename detail::get_func_base<
typename seq::transform_type
>::type(
typename boost::fusion::result_of::value_at<
@@ -48,8 +48,8 @@
typedef typename detail::remove_reference<SeqRef>::type seq;
typedef typename
- support::result_of<
- typename support::get_func_base<
+ detail::internal::result_of<
+ typename detail::get_func_base<
typename seq::transform_type
>::type(
typename boost::fusion::result_of::value_at<
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_of_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_of_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_of_impl.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -9,7 +9,7 @@
#define BOOST_FUSION_VIEW_TRANSFORM_VIEW_DETAIL_VALUE_OF_IMPL_HPP
#include <boost/fusion/iterator/value_of.hpp>
-#include <boost/fusion/support/result_of.hpp>
+#include <boost/fusion/support/internal/result_of.hpp>
namespace boost { namespace fusion { namespace extension
{
@@ -26,8 +26,8 @@
typedef typename detail::remove_reference<ItRef>::type it;
typedef typename
- support::result_of<
- typename support::get_func_base<
+ detail::internal::result_of<
+ typename detail::get_func_base<
typename it::transform_type
>::type(
typename result_of::value_of<typename it::first_type>::type)
@@ -46,8 +46,8 @@
typedef typename detail::remove_reference<ItRef>::type it;
typedef typename
- support::result_of<
- typename support::get_func_base<
+ detail::internal::result_of<
+ typename detail::get_func_base<
typename it::transform_type
>::type(
typename result_of::value_of<typename it::first1_type>::type
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -18,9 +18,9 @@
# include <boost/fusion/container/vector/vector.hpp>
#endif
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/view/detail/strictest_traversal.hpp>
#include <boost/fusion/view/detail/view_storage.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/zip_view_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/zip_view_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/zip_view_iterator.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/container/vector/convert.hpp>
#include <boost/fusion/support/iterator_base.hpp>
-#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
namespace boost { namespace fusion {
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/zip_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/zip_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/zip_view.hpp 2009-08-13 14:46:48 EDT (Thu, 13 Aug 2009)
@@ -17,8 +17,8 @@
#include <boost/fusion/algorithm/transformation/remove.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/unused.hpp>
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/internal/ref.hpp>
+#include <boost/fusion/support/internal/assert.hpp>
#include <boost/mpl/not.hpp>
#include <boost/mpl/placeholders.hpp>
@@ -165,16 +165,16 @@
>::type
size;
-#define ZIP_VIEW_CTOR(COMBINATION,_)\
+#define BOOST_FUSION_ZIP_VIEW_CTOR(COMBINATION,_)\
template<typename OtherSeqs>\
zip_view(zip_view<OtherSeqs> COMBINATION view)\
: seqs(sequence_assign(BOOST_FUSION_FORWARD(\
zip_view<OtherSeqs> COMBINATION,view).seqs))\
{}
- BOOST_FUSION_ALL_CTOR_COMBINATIONS(ZIP_VIEW_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(BOOST_FUSION_ZIP_VIEW_CTOR,_)
-#undef ZIP_VIEW_CTOR
+#undef BOOST_FUSION_ZIP_VIEW_CTOR
template<typename OtherSeqs>
explicit