|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r55468 - in sandbox/SOC/2009/fusion: . boost/fusion boost/fusion/adapted boost/fusion/adapted/detail/array boost/fusion/adapted/detail/boost_tuple boost/fusion/adapted/detail/mpl boost/fusion/adapted/detail/struct boost/fusion/adapted/struct boost/fusion/algorithm/iteration boost/fusion/algorithm/query boost/fusion/algorithm/query/detail boost/fusion/algorithm/transformation boost/fusion/algorithm/transformation/detail boost/fusion/container/detail boost/fusion/container/detail/pp boost/fusion/container/detail/variadic_templates boost/fusion/container/generation boost/fusion/container/generation/detail/variadic_templates boost/fusion/container/list boost/fusion/container/list/detail/cons boost/fusion/container/list/detail/list boost/fusion/container/map boost/fusion/container/map/detail boost/fusion/container/map/detail/pp boost/fusion/container/set boost/fusion/container/set/detail boost/fusion/container/set/detail/pp boost/fusion/container/vector boost/fusion/container/vector/detail boost/fusion/container/vector/detail/pp boost/fusion/container/vector/detail/variadic_templates boost/fusion/functional/adapter boost/fusion/functional/adapter/detail/decltype_and_variadic_templates boost/fusion/functional/adapter/detail/no_decltype_or_variadic_templates boost/fusion/functional/generation/detail boost/fusion/functional/invocation boost/fusion/functional/invocation/detail boost/fusion/functional/invocation/detail/decltype_and_variadic_templates boost/fusion/functional/invocation/detail/no_decltype_or_variadic_templates boost/fusion/include boost/fusion/iterator boost/fusion/mpl boost/fusion/sequence boost/fusion/sequence/comparison boost/fusion/sequence/intrinsic boost/fusion/support boost/fusion/support/detail boost/fusion/support/detail/iterator_adapter boost/fusion/support/detail/pp boost/fusion/support/variadic_templates boost/fusion/tuple boost/fusion/tuple/detail boost/fusion/view/detail boost/fusion/view/filter_view boost/fusion/view/filter_view/detail boost/fusion/view/iterator_range boost/fusion/view/joint_view boost/fusion/view/joint_view/detail boost/fusion/view/reverse_view boost/fusion/view/reverse_view/detail boost/fusion/view/single_view boost/fusion/view/single_view/detail boost/fusion/view/transform_view boost/fusion/view/transform_view/detail boost/fusion/view/zip_view boost/fusion/view/zip_view/detail libs/fusion/doc libs/fusion/example/extension libs/fusion/example/extension/detail libs/fusion/example/test libs/fusion/test libs/fusion/test/algorithm libs/fusion/test/sequence
From: mr.chr.schmidt_at_[hidden]
Date: 2009-08-08 14:27:03
Author: cschmidt
Date: 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
New Revision: 55468
URL: http://svn.boost.org/trac/boost/changeset/55468
Log:
added assoc. iterators
Added:
sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_array.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/deref_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/value_of_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/deref_data_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/deref_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/key_of_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_of_data_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_of_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/adapted/std_array.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/detail/forward_ctor.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/forward_ctor.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/deref_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/value_of_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/deref_data_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/deref_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/key_of_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/value_of_data_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/value_of_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/deref_data_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/deref_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/key_of_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/value_of_data_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/value_of_impl.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/include/boost_array.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/include/deref_data.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/include/find_key.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/include/key_of.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/include/std_array.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/include/value_of_data.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/iterator/basic_iterator.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/iterator/deref_data.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/iterator/key_of.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of_data.hpp (contents, props changed)
sandbox/SOC/2009/fusion/boost/fusion/support/dummy_tag.hpp (contents, props changed)
Removed:
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/array_iterator.hpp
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/at_key_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/has_key_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/struct_iterator.hpp
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_at_key_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/assoc_find.hpp
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/at_key_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/pp/
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/value_at_key_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/at_key_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/pp/
sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/value_at_key_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/advance_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/distance_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/equal_to_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/next_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/prior_impl.hpp
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/vector_iterator.hpp
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/detail/no_decltype_or_variadic_templates/
sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/detail/decltype_and_variadic_templates/
sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/detail/no_decltype_or_variadic_templates/
sandbox/SOC/2009/fusion/boost/fusion/support/detail/iterator_adapter/
sandbox/SOC/2009/fusion/boost/fusion/support/detail/pp/
sandbox/SOC/2009/fusion/boost/fusion/support/iterator_adapter.hpp
sandbox/SOC/2009/fusion/boost/fusion/tuple/detail/
Text files modified:
sandbox/SOC/2009/fusion/boost/fusion/adapted/array.hpp | 26 +-----
sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_tuple.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/begin_impl.hpp | 9 +
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/end_impl.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/tag_of.hpp | 14 +-
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/boost_tuple_iterator.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/advance_impl.hpp | 5
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/category_of_impl.hpp | 19 ----
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/deref_impl.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/distance_impl.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/equal_to_impl.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/mpl_iterator.hpp | 113 +++++++++++++++------------
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/next_impl.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/prior_impl.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_assoc_struct.hpp | 64 +++++----------
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_base.hpp | 68 +++++++++-------
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_struct.hpp | 50 ++++-------
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/at_impl.hpp | 5 +
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/begin_impl.hpp | 32 +++++++
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/category_of_impl.hpp | 16 +++
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/end_impl.hpp | 33 ++++++-
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/extension.hpp | 18 ++-
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/is_sequence_impl.hpp | 5 +
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/is_view_impl.hpp | 5 +
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/size_impl.hpp | 5 +
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_at_impl.hpp | 11 +-
sandbox/SOC/2009/fusion/boost/fusion/adapted/struct.hpp | 22 ----
sandbox/SOC/2009/fusion/boost/fusion/adapted/struct/adapt_assoc_struct.hpp | 21 ++++
sandbox/SOC/2009/fusion/boost/fusion/adapted/struct/adapt_struct.hpp | 18 +++
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/accumulate.hpp | 7
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/find_if.hpp | 65 ++++++---------
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp | 41 ++++-----
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp | 29 ++++++
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/clear.hpp | 23 +++++
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/replace_if.hpp | 42 ++++-----
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase_key.hpp | 23 +---
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/filter.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert_range.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/remove.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace.hpp | 30 +++++-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace_if.hpp | 8
sandbox/SOC/2009/fusion/boost/fusion/container/detail/pp/forward_ctor.hpp | 26 -----
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_map.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/map_tie.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/container/generation/pair_tie.hpp | 17 ---
sandbox/SOC/2009/fusion/boost/fusion/container/list/cons.hpp | 12 +-
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/build_cons.hpp | 8 +
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/cons_fwd.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/cons_iterator.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/begin_impl.hpp | 18 +---
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/end_impl.hpp | 18 +--
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/value_at_impl.hpp | 15 +-
sandbox/SOC/2009/fusion/boost/fusion/container/list/limits.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/list/list.hpp | 35 +++-----
sandbox/SOC/2009/fusion/boost/fusion/container/list/list_fwd.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/begin_impl.hpp | 20 +--
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/end_impl.hpp | 20 +--
sandbox/SOC/2009/fusion/boost/fusion/container/map/limits.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/map/map.hpp | 162 ++++-----------------------------------
sandbox/SOC/2009/fusion/boost/fusion/container/map/map_fwd.hpp | 6 +
sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/begin_impl.hpp | 20 +--
sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/end_impl.hpp | 20 +--
sandbox/SOC/2009/fusion/boost/fusion/container/set/limits.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/set/set.hpp | 140 +++++-----------------------------
sandbox/SOC/2009/fusion/boost/fusion/container/set/set_fwd.hpp | 6 +
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/begin_impl.hpp | 9 +
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/deref_impl.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/end_impl.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector.hpp | 5
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/value_of_impl.hpp | 11 -
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector_n.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/vector/limits.hpp | 16 +-
sandbox/SOC/2009/fusion/boost/fusion/container/vector/vector.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/container/vector/vector_fwd.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused_function_object.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused_procedure.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/limits.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused.hpp | 8
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused_typed.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/functional/generation/detail/gen_make_adapter.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/detail/that_ptr.hpp | 12 +-
sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke_function_object.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke_procedure.hpp | 6
sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/limits.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/iterator/advance.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator/distance.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/iterator/iterator_facade.hpp | 44 ++++------
sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/mpl/back.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/mpl/begin.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/mpl/clear.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/mpl/end.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/mpl/erase.hpp | 11 -
sandbox/SOC/2009/fusion/boost/fusion/mpl/fusion_iterator.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/mpl/insert.hpp | 11 -
sandbox/SOC/2009/fusion/boost/fusion/mpl/insert_range.hpp | 11 -
sandbox/SOC/2009/fusion/boost/fusion/mpl/pop_back.hpp | 11 -
sandbox/SOC/2009/fusion/boost/fusion/mpl/pop_front.hpp | 11 -
sandbox/SOC/2009/fusion/boost/fusion/mpl/push_back.hpp | 11 -
sandbox/SOC/2009/fusion/boost/fusion/mpl/push_front.hpp | 11 -
sandbox/SOC/2009/fusion/boost/fusion/sequence/comparison/less_equal.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/at.hpp | 16 +++
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/at_key.hpp | 31 ++++++-
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/has_key.hpp | 21 ++--
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/size.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/swap.hpp | 7 +
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/value_at.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/value_at_key.hpp | 15 +++
sandbox/SOC/2009/fusion/boost/fusion/sequence/sequence_facade.hpp | 76 ++++++++++++++++-
sandbox/SOC/2009/fusion/boost/fusion/support.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/support/assign_tags.hpp | 7
sandbox/SOC/2009/fusion/boost/fusion/support/deduce_sequence.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/support/detail/as_fusion_element.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/support/is_sequence.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/support/is_view.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/support/pair.hpp | 17 ++-
sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp | 23 +----
sandbox/SOC/2009/fusion/boost/fusion/support/result_of.hpp | 71 ++++++++--------
sandbox/SOC/2009/fusion/boost/fusion/support/sequence_assign.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/support/sequence_base.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/support/to_random_access_mpl_seq.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/support/variadic_templates/variadic_quote.hpp | 7
sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple.hpp | 33 ++++---
sandbox/SOC/2009/fusion/boost/fusion/view/detail/view_storage.hpp | 24 ++---
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/begin_impl.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/end_impl.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/filter_view_iterator.hpp | 26 +++++-
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/next_impl.hpp | 5
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/filter_view.hpp | 30 ++++--
sandbox/SOC/2009/fusion/boost/fusion/view/iterator_range/iterator_range.hpp | 21 +++-
sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/joint_view_iterator.hpp | 7
sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/joint_view.hpp | 28 ++++-
sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/begin_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/end_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/reverse_view_iterator.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/reverse_view.hpp | 34 +++++--
sandbox/SOC/2009/fusion/boost/fusion/view/single_view/detail/deref_impl.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/view/single_view/detail/single_view_iterator.hpp | 11 +-
sandbox/SOC/2009/fusion/boost/fusion/view/single_view/single_view.hpp | 20 +++
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/at_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/begin_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/deref_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/end_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_at_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view.hpp | 131 ++++++++++++++++++++++++++------
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view_fwd.hpp | 10 +
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/at_impl.hpp | 8
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/begin_impl.hpp | 7
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/deref_impl.hpp | 15 +--
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/distance_impl.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/end_impl.hpp | 11 +-
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/equal_to_impl.hpp | 5
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/next_impl.hpp | 19 +--
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/prior_impl.hpp | 15 +--
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/zip_view.hpp | 26 +++--
sandbox/SOC/2009/fusion/build.bat | 3
sandbox/SOC/2009/fusion/libs/fusion/doc/container.qbk | 4
sandbox/SOC/2009/fusion/libs/fusion/doc/extension.qbk | 2
sandbox/SOC/2009/fusion/libs/fusion/example/extension/detail/size_impl.hpp | 2
sandbox/SOC/2009/fusion/libs/fusion/example/extension/triple.cpp | 10 -
sandbox/SOC/2009/fusion/libs/fusion/example/test/main.cpp | 15 +--
sandbox/SOC/2009/fusion/libs/fusion/test/Jamfile | 24 ++--
sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/clear.cpp | 5
sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/erase_key.cpp | 7
sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/find.cpp | 14 +-
sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/find_if.cpp | 1
sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/replace_if.cpp | 5
sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/transform.cpp | 4
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp | 3
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/filter_view.cpp | 14 ---
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/joint_view.cpp | 1
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/transform_view.cpp | 6
sandbox/SOC/2009/fusion/project-root.jam | 9 -
180 files changed, 1341 insertions(+), 1321 deletions(-)
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/array.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/array.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/array.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -1,27 +1,11 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
- Copyright (c) 2005-2006 Dan Marsden
-
- 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)
-==============================================================================*/
+// 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_ADAPTED_ARRAY_HPP
#define BOOST_FUSION_ADAPTED_ARRAY_HPP
-//TODO adapt std::tuple, std::array
-
-#include <boost/fusion/support/ref.hpp>
-
-#include <boost/fusion/adapted/detail/array/tag_of.hpp>
-#include <boost/fusion/adapted/detail/array/array_iterator.hpp>
-#include <boost/fusion/adapted/detail/array/is_view_impl.hpp>
-#include <boost/fusion/adapted/detail/array/is_sequence_impl.hpp>
-#include <boost/fusion/adapted/detail/array/category_of_impl.hpp>
-#include <boost/fusion/adapted/detail/array/begin_impl.hpp>
-#include <boost/fusion/adapted/detail/array/end_impl.hpp>
-#include <boost/fusion/adapted/detail/array/size_impl.hpp>
-#include <boost/fusion/adapted/detail/array/at_impl.hpp>
-#include <boost/fusion/adapted/detail/array/value_at_impl.hpp>
+#include <boost/fusion/adapted/boost_array.hpp>
#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_array.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/boost_array.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,29 @@
+// 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_ADAPTED_BOOST_ARRAY_HPP
+#define BOOST_FUSION_ADAPTED_BOOST_ARRAY_HPP
+
+#include <boost/fusion/iterator/basic_iterator.hpp>
+#include <boost/fusion/support/ref.hpp>
+
+#define BOOST_FUSION_ADAPTED_ARRAY_TYPE class
+#define BOOST_FUSION_ADAPTED_ARRAY_NAMESPACE boost
+#include <boost/fusion/adapted/detail/array/tag_of.hpp>
+#undef BOOST_FUSION_ADAPTED_ARRAY_NAMESPACE
+#undef BOOST_FUSION_ADAPTED_ARRAY_TYPE
+
+#include <boost/fusion/adapted/detail/array/is_view_impl.hpp>
+#include <boost/fusion/adapted/detail/array/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/detail/array/category_of_impl.hpp>
+#include <boost/fusion/adapted/detail/array/begin_impl.hpp>
+#include <boost/fusion/adapted/detail/array/end_impl.hpp>
+#include <boost/fusion/adapted/detail/array/size_impl.hpp>
+#include <boost/fusion/adapted/detail/array/at_impl.hpp>
+#include <boost/fusion/adapted/detail/array/value_at_impl.hpp>
+#include <boost/fusion/adapted/detail/array/deref_impl.hpp>
+#include <boost/fusion/adapted/detail/array/value_of_impl.hpp>
+
+#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,6 +8,8 @@
#ifndef BOOST_FUSION_ADAPTED_BOOST_TUPLE_HPP
#define BOOST_FUSION_ADAPTED_BOOST_TUPLE_HPP
+//TODO adapt std::(tr1::)tuple
+
#include <boost/fusion/support/ref.hpp>
#include <boost/tuple/tuple.hpp>
Deleted: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/array_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/array_iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,123 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
- Copyright (c) 2005-2006 Dan Marsden
-
- 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_ADAPTED_DETAIL_ARRAY_ARRAY_ITERATOR_HPP
-#define BOOST_FUSION_ADAPTED_DETAIL_ARRAY_ARRAY_ITERATOR_HPP
-
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/iterator/iterator_facade.hpp>
-
-#include <boost/mpl/int.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/minus.hpp>
-
-#include <cstddef>
-
-namespace boost { namespace fusion
-{
- struct random_access_traversal_tag;
-
- template <typename ArrayRef, int Pos>
- struct array_iterator
- : iterator_facade<
- array_iterator<ArrayRef, Pos>
- , random_access_traversal_tag
- >
- {
- //BOOST_FUSION_INDEX_CHECK(Pos, Array::static_size+1);
-
- template <typename ItRef>
- struct value_of
- {
- typedef typename
- detail::remove_reference<
- typename detail::remove_reference<ItRef>::type::array_type
- >::type::value_type
- type;
- };
-
- template <typename ItRef>
- struct deref
- {
- typedef typename detail::remove_reference<ItRef>::type it;
-
- typedef typename
- detail::forward_as<
- ArrayRef
- , typename detail::remove_reference<
- ArrayRef
- >::type::value_type
- >::type
- type;
-
- static type
- call(ItRef it)
- {
- return (*it.array)[it::index::value];
- }
- };
-
- template <typename ItRef, typename N>
- struct advance
- {
- typedef
- array_iterator<
- ArrayRef
- , Pos + N::value
- >
- type;
-
- static type
- call(ItRef it)
- {
- return type(*it.array,0);
- }
- };
-
- template <typename ItRef>
- struct next
- : advance<ItRef, mpl::int_<1> >
- {};
-
- template <typename ItRef>
- struct prior
- : advance<ItRef, mpl::int_<-1> >
- {};
-
- template <typename It1Ref, typename It2Ref>
- struct distance
- : mpl::minus<
- typename detail::remove_reference<It2Ref>::type::index
- , typename detail::remove_reference<It1Ref>::type::index
- >
- {};
-
- typedef mpl::int_<Pos> index;
-
- template<typename OtherIt>
- array_iterator(OtherIt const& it)
- : array(it.array)
- {}
-
- array_iterator(ArrayRef a, int)
- : array(&a)
- {}
-
- template<typename OtherIt>
- array_iterator&
- operator=(OtherIt const& it)
- {
- array=it.array;
- return *this;
- }
-
- typename detail::remove_reference<ArrayRef>::type* array;
- };
-}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/begin_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -20,7 +20,14 @@
template <typename SeqRef>
struct apply
{
- typedef array_iterator<SeqRef, 0> type;
+ typedef
+ basic_iterator<
+ array_iterator_tag
+ , random_access_traversal_tag
+ , SeqRef
+ , 0
+ >
+ type;
static type
call(SeqRef seq)
Added: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/deref_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/deref_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,40 @@
+// 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_ADAPTED_DETAIL_ARRAY_DEREF_IMPL_HPP
+#define BOOST_FUSION_ADAPTED_DETAIL_ARRAY_DEREF_IMPL_HPP
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct deref_impl;
+
+ template <>
+ struct deref_impl<array_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+
+ typedef typename
+ detail::forward_as<
+ typename it::seq_type
+ , typename detail::remove_reference<
+ typename it::seq_type
+ >::type::value_type
+ >::type
+ type;
+
+ static type
+ call(ItRef it_)
+ {
+ return (*it_.seq)[it::index::value];
+ }
+ };
+ };
+}}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/end_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -21,8 +21,10 @@
struct apply
{
typedef
- array_iterator<
- SeqRef
+ basic_iterator<
+ array_iterator_tag
+ , random_access_traversal_tag
+ , SeqRef
, detail::remove_reference<SeqRef>::type::static_size
>
type;
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -6,28 +6,28 @@
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
-#ifndef BOOST_FUSION_ADAPTED_DETAIL_ARRAY_TAG_OF_HPP
-#define BOOST_FUSION_ADAPTED_DETAIL_ARRAY_TAG_OF_HPP
-
#include <boost/fusion/support/tag_of_fwd.hpp>
#include <cstddef>
-namespace boost
+namespace BOOST_FUSION_ADAPTED_ARRAY_NAMESPACE
{
template<typename T, std::size_t N>
- class array;
+ BOOST_FUSION_ADAPTED_ARRAY_TYPE array;
}
namespace boost { namespace fusion
{
struct array_tag;
+ struct array_iterator_tag;
+ struct random_access_traversal_tag;
namespace traits
{
#define TAG_OF_SPECIALIZATION(COMBINATION,_)\
template<typename T, std::size_t N>\
- struct tag_of<boost::array<T,N> COMBINATION>\
+ struct tag_of<\
+ BOOST_FUSION_ADAPTED_ARRAY_NAMESPACE::array<T,N> COMBINATION>\
{\
typedef array_tag type;\
};
@@ -37,5 +37,3 @@
#undef TAG_OF_SPECIALIZATION
}
}}
-
-#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/value_of_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/array/value_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,29 @@
+// 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_ADAPTED_DETAIL_ARRAY_VALUE_OF_IMPL_HPP
+#define BOOST_FUSION_ADAPTED_DETAIL_ARRAY_VALUE_OF_IMPL_HPP
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct value_of_impl;
+
+ template <>
+ struct value_of_impl<array_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename
+ detail::remove_reference<
+ typename detail::remove_reference<ItRef>::type::seq_type
+ >::type::value_type
+ type;
+ };
+ };
+}}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/boost_tuple_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/boost_tuple_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/boost_tuple_iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -20,6 +20,8 @@
struct boost_tuple_iterator
: iterator_facade<boost_tuple_iterator<ConsRef>, forward_traversal_tag>
{
+ typedef ConsRef cons_type;
+
template <typename ItRef>
struct value_of
{
@@ -78,8 +80,6 @@
>
{};
- typedef ConsRef cons_type;
-
template<typename OtherIt>
boost_tuple_iterator(OtherIt const& it)
: cons(it.cons)
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/advance_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/advance_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/advance_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -28,10 +28,11 @@
, N
>::type
>
- type;
+ type;
+ template<typename ItRef2>
static type
- call(ItRef)
+ call(ItRef2)
{
return type();
}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/category_of_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/category_of_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/category_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,6 +8,7 @@
#ifndef BOOST_FUSION_ADAPTED_DETAIL_MPL_CATEGORY_OF_IMPL_HPP
#define BOOST_FUSION_ADAPTED_DETAIL_MPL_CATEGORY_OF_IMPL_HPP
+
#include <boost/mpl/begin.hpp>
#include <boost/mpl/is_sequence.hpp>
@@ -46,24 +47,6 @@
{
typedef random_access_traversal_tag type;
};
-
- template <>
- struct mpl_iterator_category<forward_traversal_tag>
- {
- typedef forward_traversal_tag type;
- };
-
- template <>
- struct mpl_iterator_category<bidirectional_traversal_tag>
- {
- typedef bidirectional_traversal_tag type;
- };
-
- template <>
- struct mpl_iterator_category<random_access_traversal_tag>
- {
- typedef random_access_traversal_tag type;
- };
}
namespace extension
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/deref_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/deref_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/deref_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -25,8 +25,9 @@
mpl::deref<typename detail::identity<ItRef>::type>::type
type;
+ template<typename ItRef2>
static type
- call(ItRef)
+ call(ItRef2)
{
return type();
}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/distance_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/distance_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/distance_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -28,8 +28,7 @@
typename detail::identity<It2Ref>::type
>::type
>
- {
- };
+ {};
};
}}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/equal_to_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/equal_to_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/equal_to_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -28,8 +28,7 @@
typename detail::identity<It2Ref>::type
>::type
>
- {
- };
+ {};
};
}}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/mpl_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/mpl_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/mpl_iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,19 +11,46 @@
#include <boost/fusion/iterator/iterator_facade.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/iterator/equal_to.hpp>
-#include <boost/fusion/iterator/value_of.hpp>
-#include <boost/fusion/iterator/deref.hpp>
-#include <boost/fusion/iterator/next.hpp>
-#include <boost/fusion/iterator/prior.hpp>
-#include <boost/fusion/iterator/advance.hpp>
-#include <boost/fusion/iterator/distance.hpp>
+//TODO assoc iterator!
namespace boost { namespace fusion
{
struct mpl_iterator_tag;
struct mpl_sequence_tag;
+ namespace extension
+ {
+ template <typename Tag>
+ struct value_of_impl;
+
+ template <typename Tag>
+ struct equal_to_impl;
+
+ template <typename Tag>
+ struct deref_impl;
+
+ template <typename Tag>
+ struct next_impl;
+
+ template <typename Tag>
+ struct prior_impl;
+
+ template <typename Tag>
+ struct advance_impl;
+
+ template <typename Tag>
+ struct distance_impl;
+ }
+
+ namespace detail
+ {
+ template<typename>
+ struct get_mpl_iterator_tag
+ {
+ typedef mpl_iterator_tag type;
+ };
+ }
+
template <typename It>
struct mpl_iterator
: iterator_facade<
@@ -31,72 +58,58 @@
, typename traits::category_of<It>::type
>
{
+ //cschmidt: void typedef to enable fast SFINAE in get_mpl_it.hpp!
+ typedef void void_;
+ typedef It it_type;
+
template <typename ItRef>
struct value_of
- : result_of::value_of<It>
+ : extension::value_of_impl<
+ typename detail::get_mpl_iterator_tag<ItRef>::type
+ >::template apply<It&>
{};
template <typename It1Ref, typename It2Ref>
struct equal_to
- : result_of::equal_to<It, It2Ref>
+ : extension::equal_to_impl<
+ typename detail::get_mpl_iterator_tag<It1Ref>::type
+ >:: template apply<It&,It2Ref>
{};
template <typename ItRef>
struct deref
- {
- typedef typename result_of::deref<It>::type type;
-
- static type
- call(ItRef)
- {
- return type();
- }
- };
+ : extension::deref_impl<
+ typename detail::get_mpl_iterator_tag<ItRef>::type
+ >::template apply<It&>
+ {};
template <typename ItRef>
struct next
- {
- typedef typename result_of::next<It>::type type;
-
- static type
- call(ItRef)
- {
- return type();
- }
- };
+ : extension::next_impl<
+ typename detail::get_mpl_iterator_tag<ItRef>::type
+ >::template apply<It&>
+ {};
template <typename ItRef>
struct prior
- {
- typedef typename result_of::prior<It>::type type;
-
- static type
- call(ItRef)
- {
- return type();
- }
- };
+ : extension::prior_impl<
+ typename detail::get_mpl_iterator_tag<ItRef>::type
+ >::template apply<It&>
+ {};
template <typename ItRef, typename N>
struct advance
- {
- typedef typename fusion::result_of::advance<It,N>::type type;
-
- static type
- call(ItRef)
- {
- return type();
- }
- };
+ : extension::advance_impl<
+ typename detail::get_mpl_iterator_tag<ItRef>::type
+ >::template apply<It&,N>
+ {};
template <typename It1Ref, typename It2Ref>
struct distance
- : result_of::distance<It, It2Ref>
+ : extension::distance_impl<
+ typename detail::get_mpl_iterator_tag<It1Ref>::type
+ >::template apply<It&,It2Ref>
{};
-
- //cschmidt: void typedef to enable fast SFINAE in equal_to_impl.hpp!
- typedef void void_;
- typedef It it_type;
};
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/next_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/next_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/next_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -29,8 +29,9 @@
>
type;
+ template<typename ItRef2>
static type
- call(ItRef)
+ call(ItRef2)
{
return type();
}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/prior_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/prior_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/prior_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -29,8 +29,9 @@
>
type;
+ template<typename ItRef2>
static type
- call(ItRef)
+ call(ItRef2)
{
return type();
}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_assoc_struct.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_assoc_struct.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_assoc_struct.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -1,59 +1,37 @@
-/*=============================================================================
- Copyright (c) 2001-2007 Joel de Guzman
- Copyright (c) 2007 Dan Marsden
-
- 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)
-==============================================================================*/
+// 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_ADAPTED_DETAIL_STRUCT_ADAPT_ASSOC_STRUCT_HPP
#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_ADAPT_ASSOC_STRUCT_HPP
-#include <boost/fusion/support/tag_of_fwd.hpp>
-
#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/cat.hpp>
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT(name, bseq) \
- BOOST_FUSION_ADAPT_ASSOC_STRUCT_I( \
- name, BOOST_PP_CAT(BOOST_FUSION_ADAPT_ASSOC_STRUCT_X bseq, 0))
-
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_X(x, y, z)\
- ((x, y, z)) BOOST_FUSION_ADAPT_ASSOC_STRUCT_Y
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_Y(x, y, z)\
- ((x, y, z)) BOOST_FUSION_ADAPT_ASSOC_STRUCT_X
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_X0
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_Y0
-
-// BOOST_FUSION_ADAPT_ASSOC_STRUCT_I generates the overarching structure and
-// uses SEQ_FOR_EACH_I to generate the "linear" substructures.
-// Thanks to Paul Mensonides for the PP macro help
-
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_I(name, seq) \
- BOOST_FUSION_ADAPT_STRUCT_BASE(name, seq) \
- BOOST_PP_SEQ_FOR_EACH_I(BOOST_FUSION_ADAPT_ASSOC_STRUCT_C, name, seq)
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0(X, Y, Z)\
+ ((X, Y, Z)) BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_1
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_1(X, Y, Z)\
+ ((X, Y, Z)) BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0_END
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_1_END
+
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT(NAME, SEQ)\
+ BOOST_FUSION_ADAPT_STRUCT_BASE(\
+ NAME,\
+ assoc_struct_tag,\
+ BOOST_PP_CAT(BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0 SEQ,_END),\
+ BOOST_FUSION_ADAPT_ASSOC_STRUCT_C)
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_C(r, name, i, xy) \
- BOOST_FUSION_ADAPT_STRUCT_C_BASE(r, name, i, xy, 3) \
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_C(R, NAME, I, XYZ) \
+ BOOST_FUSION_ADAPT_STRUCT_C_BASE(NAME, I, XYZ, 3) \
\
namespace boost { namespace fusion { namespace extension \
{ \
template<> \
- struct struct_assoc_member<name, BOOST_PP_TUPLE_ELEM(3, 2, xy)> \
+ struct struct_assoc_key<NAME, I> \
{ \
- typedef BOOST_PP_TUPLE_ELEM(3, 0, xy) type; \
- \
- template<typename Seq> \
- static typename detail::forward_as<Seq&,type>::type \
- call(Seq& seq) \
- { \
- return seq.BOOST_PP_TUPLE_ELEM(3, 1, xy); \
- }; \
+ typedef BOOST_PP_TUPLE_ELEM(3, 2, XYZ) type; \
}; \
}}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_base.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_base.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_base.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -1,53 +1,61 @@
-// Copyright 2001-2007 Joel de Guzman, 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)
-
-#include <boost/fusion/support/tag_of_fwd.hpp>
-
-#include <boost/preprocessor/control/expr_if.hpp>
-#include <boost/preprocessor/array/elem.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
+/*=============================================================================
+ Copyright (c) 2001-2007 Joel de Guzman
+ Copyright (c) 2009 Dan Christopher Schmidt
+
+ 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_ADAPTED_DETAIL_STRUCT_ADAPT_BASE_HPP
#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_ADAPT_BASE_HPP
-#define BOOST_FUSION_ADAPT_STRUCT_TAG_OF_SPECIALIZATION(COMBINATION, name) \
+#include <boost/fusion/support/tag_of_fwd.hpp>
+
+#include <boost/preprocessor/seq/size.hpp>
+#include <boost/preprocessor/seq/for_each_i.hpp>
+#include <boost/preprocessor/tuple/elem.hpp>
+#include <boost/preprocessor/tuple/elem.hpp>
+
+#define BOOST_FUSION_ADAPT_STRUCT_TAG_OF_SPECIALIZATION(COMBINATION, DATA) \
template <> \
- struct tag_of<name COMBINATION> \
+ struct tag_of<BOOST_PP_TUPLE_ELEM(2,0,DATA) COMBINATION> \
{ \
- typedef struct_tag type; \
+ typedef BOOST_PP_TUPLE_ELEM(2,1,DATA) type; \
};
-
-#define BOOST_FUSION_ADAPT_STRUCT_BASE(name, seq) \
-namespace boost { namespace fusion { namespace traits \
-{ \
- BOOST_FUSION_ALL_CV_REF_NON_REF_COMBINATIONS( \
- BOOST_FUSION_ADAPT_STRUCT_TAG_OF_SPECIALIZATION,name) \
-}}} \
+#define BOOST_FUSION_ADAPT_STRUCT_BASE(NAME,TAG,TUPLE_SEQ,CALLBACK) \
+ BOOST_PP_SEQ_FOR_EACH_I(CALLBACK,NAME,TUPLE_SEQ) \
\
-namespace boost { namespace fusion { namespace extension \
+namespace boost { namespace fusion \
{ \
- template <> \
- struct struct_size<name> \
- : mpl::int_<BOOST_PP_SEQ_SIZE(seq)> {}; \
-}}}
+ namespace traits \
+ { \
+ BOOST_FUSION_ALL_CV_REF_NON_REF_COMBINATIONS( \
+ BOOST_FUSION_ADAPT_STRUCT_TAG_OF_SPECIALIZATION,(NAME,TAG)) \
+ } \
+ \
+ namespace extension \
+ { \
+ template <> \
+ struct struct_size<NAME> \
+ : mpl::int_<BOOST_PP_SEQ_SIZE(TUPLE_SEQ)> \
+ {}; \
+ } \
+}}
-#define BOOST_FUSION_ADAPT_STRUCT_C_BASE(r, name, i, xy, max_size) \
+#define BOOST_FUSION_ADAPT_STRUCT_C_BASE(NAME, I, TUPLE, MAX_SIZE) \
namespace boost { namespace fusion { namespace extension \
{ \
template <> \
- struct struct_member<name, i> \
+ struct struct_member<NAME, I> \
{ \
- typedef BOOST_PP_TUPLE_ELEM(max_size, 0, xy) type; \
+ typedef BOOST_PP_TUPLE_ELEM(MAX_SIZE, 0, TUPLE) type; \
\
template<typename Seq> \
static typename detail::forward_as<Seq&,type>::type \
call(Seq& seq) \
{ \
- return seq.BOOST_PP_TUPLE_ELEM(max_size, 1, xy); \
+ return seq.BOOST_PP_TUPLE_ELEM(MAX_SIZE, 1, TUPLE); \
} \
}; \
}}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_struct.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_struct.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/adapt_struct.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -1,40 +1,28 @@
-/*=============================================================================
- Copyright (c) 2001-2007 Joel de Guzman
-
- 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)
-==============================================================================*/
+// 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_ADAPTED_DETAIL_STRUCT_ADAPT_STRUCT_HPP
#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_ADAPT_STRUCT_HPP
#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/cat.hpp>
-
-#include <boost/mpl/int.hpp>
-#define BOOST_FUSION_ADAPT_STRUCT(name, bseq) \
- BOOST_FUSION_ADAPT_STRUCT_I( \
- name, BOOST_PP_CAT(BOOST_FUSION_ADAPT_STRUCT_X bseq, 0))
-
-#define BOOST_FUSION_ADAPT_STRUCT_X(x, y) ((x, y)) BOOST_FUSION_ADAPT_STRUCT_Y
-#define BOOST_FUSION_ADAPT_STRUCT_Y(x, y) ((x, y)) BOOST_FUSION_ADAPT_STRUCT_X
-#define BOOST_FUSION_ADAPT_STRUCT_X0
-#define BOOST_FUSION_ADAPT_STRUCT_Y0
-
-// BOOST_FUSION_ADAPT_STRUCT_I generates the overarching structure and uses
-// SEQ_FOR_EACH_I to generate the "linear" substructures.
-// Thanks to Paul Mensonides for the PP macro help
-#define BOOST_FUSION_ADAPT_STRUCT_I(name, seq) \
- BOOST_FUSION_ADAPT_STRUCT_BASE(name, seq) \
- BOOST_PP_SEQ_FOR_EACH_I(BOOST_FUSION_ADAPT_STRUCT_C, name, seq)
+#define BOOST_FUSION_ADAPT_STRUCT_FILLER_0(X, Y)\
+ ((X, Y)) BOOST_FUSION_ADAPT_STRUCT_FILLER_1
+#define BOOST_FUSION_ADAPT_STRUCT_FILLER_1(X, Y)\
+ ((X, Y)) BOOST_FUSION_ADAPT_STRUCT_FILLER_0
+#define BOOST_FUSION_ADAPT_STRUCT_FILLER_0_END
+#define BOOST_FUSION_ADAPT_STRUCT_FILLER_1_END
+
+#define BOOST_FUSION_ADAPT_STRUCT(NAME, SEQ)\
+ BOOST_FUSION_ADAPT_STRUCT_BASE(\
+ NAME,\
+ assoc_struct_tag,\
+ BOOST_PP_CAT(BOOST_FUSION_ADAPT_STRUCT_FILLER_0 SEQ,_END),\
+ BOOST_FUSION_ADAPT_STRUCT_C)
-#define BOOST_FUSION_ADAPT_STRUCT_C(r, name, i, xy) \
- BOOST_FUSION_ADAPT_STRUCT_C_BASE(r, name, i, xy, 2)
+#define BOOST_FUSION_ADAPT_STRUCT_C(R, NAME, I, XY)\
+ BOOST_FUSION_ADAPT_STRUCT_C_BASE(NAME, I, XY, 2)
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/at_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/at_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/at_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -48,6 +48,11 @@
}
};
};
+
+ template <>
+ struct at_impl<assoc_struct_tag>
+ : at_impl<struct_tag>
+ {};
}}}
#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/at_key_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/at_key_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,41 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2007 Joel de Guzman
- Copyright (c) 2005-2007 Dan Marsden
-
- 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_ADAPTED_DETAIL_STRUCT_AT_KEY_IMPL_HPP
-#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_AT_KEY_IMPL_HPP
-
-namespace boost { namespace fusion { namespace extension
-{
- template <typename Tag>
- struct at_key_impl;
-
- template <>
- struct at_key_impl<struct_tag>
- {
- template <typename SeqRef, typename Key>
- struct apply
- {
- typedef typename detail::identity<SeqRef>::type seq;
-
- typedef typename
- detail::forward_as<
- SeqRef
- , typename struct_assoc_member<seq, Key>::type
- >::type
- type;
-
- static type
- call(SeqRef seq_)
- {
- return struct_assoc_member<seq, Key>::call(seq_);
- }
- };
- };
-}}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/begin_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -20,7 +20,37 @@
template <typename SeqRef>
struct apply
{
- typedef struct_iterator<SeqRef, 0> type;
+ typedef
+ basic_iterator<
+ struct_iterator_tag
+ , random_access_traversal_tag
+ , SeqRef
+ , 0
+ >
+ type;
+
+ static type
+ call(SeqRef seq)
+ {
+ return type(seq,0);
+ }
+ };
+ };
+
+ template <>
+ struct begin_impl<assoc_struct_tag>
+ {
+ template <typename SeqRef>
+ struct apply
+ {
+ typedef
+ basic_iterator<
+ assoc_struct_iterator_tag
+ , assoc_struct_category
+ , SeqRef
+ , 0
+ >
+ type;
static type
call(SeqRef seq)
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/category_of_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/category_of_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/category_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,12 +9,10 @@
#ifndef BOOST_FUSION_ADAPTED_DETAIL_STRUCT_CATEGORY_OF_IMPL_HPP
#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_CATEGORY_OF_IMPL_HPP
-#include <boost/config/no_tr1/utility.hpp>
+#include <boost/fusion/support/category_of.hpp>
namespace boost { namespace fusion
{
- struct random_access_traversal_tag;
-
namespace extension
{
template<typename Tag>
@@ -29,6 +27,18 @@
typedef random_access_traversal_tag type;
};
};
+
+ template<>
+ struct category_of_impl<assoc_struct_tag>
+ {
+ template<typename SeqRef>
+ struct apply
+ {
+ struct type
+ : random_access_traversal_tag, associative_sequence_tag
+ {};
+ };
+ };
}
}}
Added: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/deref_data_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/deref_data_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,20 @@
+// 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_ADAPTED_DETAIL_STRUCT_DEREF_DATA_IMPL_HPP
+#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_DEREF_DATA_IMPL_HPP
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct deref_data_impl;
+
+ template <>
+ struct deref_data_impl<assoc_struct_iterator_tag>
+ : deref_impl<assoc_struct_iterator_tag>
+ {};
+}}}
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/deref_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/deref_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,53 @@
+// 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_ADAPTED_DETAIL_STRUCT_DEREF_IMPL_HPP
+#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_DEREF_IMPL_HPP
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct deref_impl;
+
+ template <>
+ struct deref_impl<struct_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+ typedef typename
+ detail::identity<typename it::seq_type>::type
+ identity_struct;
+
+ typedef typename
+ detail::forward_as<
+ typename it::seq_type
+ , typename extension::struct_member<
+ identity_struct
+ , it::index::value
+ >::type
+ >::type
+ type;
+
+ static type
+ call(ItRef it)
+ {
+ return
+ extension::struct_member<
+ identity_struct
+ , it::index::value
+ >::call(*it.seq);
+ }
+ };
+ };
+
+ template <>
+ struct deref_impl<assoc_struct_iterator_tag>
+ : deref_impl<struct_iterator_tag>
+ {};
+}}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/end_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -21,11 +21,34 @@
struct apply
{
typedef
- struct_iterator<
- SeqRef
- , struct_size<
- typename detail::identity<SeqRef>::type
- >::value
+ basic_iterator<
+ struct_iterator_tag
+ , random_access_traversal_tag
+ , SeqRef
+ , struct_size<typename detail::identity<SeqRef>::type>::value
+ >
+ type;
+
+ static type
+ call(SeqRef seq)
+ {
+ return type(seq,0);
+ }
+ };
+ };
+
+ template <>
+ struct end_impl<assoc_struct_tag>
+ {
+ template <typename SeqRef>
+ struct apply
+ {
+ typedef
+ basic_iterator<
+ assoc_struct_iterator_tag
+ , assoc_struct_category
+ , SeqRef
+ , struct_size<typename detail::identity<SeqRef>::type>::value
>
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/extension.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/extension.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/extension.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,9 +9,18 @@
#ifndef BOOST_FUSION_ADAPTED_DETAIL_STRUCT_EXTENSION_HPP
#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_EXTENSION_HPP
+#include <boost/fusion/support/category_of.hpp>
+
namespace boost { namespace fusion
{
struct struct_tag;
+ struct struct_iterator_tag;
+ struct assoc_struct_tag;
+ struct assoc_struct_iterator_tag;
+
+ struct assoc_struct_category
+ : forward_traversal_tag, associative_sequence_tag
+ {};
namespace extension
{
@@ -20,14 +29,11 @@
template<typename Seq, int N>
struct struct_member;
+ template<typename Seq, int N>
+ struct struct_assoc_key;
+
template<typename Seq>
struct struct_size;
-
- template<typename Seq, typename Key>
- struct struct_assoc_member
- {
- typedef no_such_member type;
- };
}
}}
Deleted: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/has_key_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/has_key_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,40 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2007 Joel de Guzman
- Copyright (c) 2005-2007 Dan Marsden
-
- 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_ADAPTED_DETAIL_STRUCT_HAS_KEY_IMPL_HPP
-#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_HAS_KEY_IMPL_HPP
-
-#include <boost/mpl/not.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-namespace boost { namespace fusion { namespace extension
-{
- struct no_such_member;
-
- template<typename Tag>
- struct has_key_impl;
-
- template<>
- struct has_key_impl<struct_tag>
- {
- template<typename SeqRef, typename Key>
- struct apply
- : mpl::not_<
- is_same<
- no_such_member
- , typename struct_assoc_member<
- typename detail::identity<SeqRef>::type
- , Key
- >::type
- >
- >
- {};
- };
-}}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/is_sequence_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/is_sequence_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/is_sequence_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -24,6 +24,11 @@
: mpl::true_
{};
};
+
+ template <>
+ struct is_sequence_impl<assoc_struct_tag>
+ : is_sequence_impl<struct_tag>
+ {};
}}}
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/is_view_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/is_view_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/is_view_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -24,6 +24,11 @@
: mpl::false_
{};
};
+
+ template <>
+ struct is_view_impl<assoc_struct_tag>
+ : is_view_impl<struct_tag>
+ {};
}}}
#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/key_of_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/key_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,32 @@
+// 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_ADAPTED_DETAIL_STRUCT_KEY_OF_IMPL_HPP
+#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_KEY_OF_IMPL_HPP
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct key_of_impl;
+
+ template <>
+ struct key_of_impl<assoc_struct_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+
+ typedef typename
+ extension::struct_assoc_key<
+ typename detail::identity<typename it::seq_type>::type
+ , it::index::value
+ >::type
+ type;
+ };
+ };
+}}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/size_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/size_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/size_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -24,6 +24,11 @@
: struct_size<typename detail::identity<SeqRef>::type>
{};
};
+
+ template <>
+ struct size_impl<assoc_struct_tag>
+ : size_impl<struct_tag>
+ {};
}}}
#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/struct_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/struct_iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,118 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2007 Joel de Guzman
- Copyright (c) 2005-2006 Dan Marsden
-
- 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_ADAPTED_DETAIL_STRUCT_STRUCT_ITERATOR_HPP
-#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_STRUCT_ITERATOR_HPP
-
-#include <boost/fusion/support/assert.hpp>
-#include <boost/fusion/iterator/iterator_facade.hpp>
-
-#include <boost/mpl/identity.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/int.hpp>
-#include <boost/mpl/minus.hpp>
-#include <boost/config/no_tr1/utility.hpp>
-
-namespace boost { namespace fusion
-{
- struct random_access_traversal_tag;
-
- template <typename SeqRef, int Pos>
- struct struct_iterator
- : iterator_facade<
- struct_iterator<SeqRef, Pos>
- , random_access_traversal_tag
- >
- {
- //BOOST_FUSION_INDEX_CHECK(N,struct_size<SeqRef>::value);
-
- typedef typename detail::identity<SeqRef>::type identity_struct;
-
- template <typename ItRef>
- struct value_of
- : extension::struct_member<identity_struct, Pos>
- {};
-
- template <typename ItRef>
- struct deref
- {
- typedef typename
- detail::forward_as<
- SeqRef
- , typename extension::struct_member<
- identity_struct
- , Pos
- >::type
- >::type
- type;
-
- static type
- call(ItRef it)
- {
- return extension::struct_member<identity_struct, Pos>::call(
- *it.struct_);
- }
- };
-
- template <typename ItRef, typename N>
- struct advance
- {
- typedef
- struct_iterator<SeqRef, Pos + N::value>
- type;
-
- static type
- call(ItRef it)
- {
- return type(*it.struct_,0);
- }
- };
-
- template <typename ItRef>
- struct next
- : advance<ItRef, mpl::int_<1> >
- {};
-
- template <typename ItRef>
- struct prior
- : advance<ItRef, mpl::int_<-1> >
- {};
-
- template <typename It1Ref, typename It2Ref>
- struct distance
- : mpl::minus<
- mpl::int_<Pos>
- , typename detail::remove_reference<It1Ref>::type::index
- >
- {
- };
-
- typedef mpl::int_<Pos> index;
-
- template<typename OtherIt>
- struct_iterator(BOOST_FUSION_R_ELSE_CLREF(OtherIt) it)
- : struct_(it.struct_)
- {}
-
- struct_iterator(SeqRef struct_,int)
- : struct_(&struct_)
- {}
-
- template<typename OtherIt>
- struct_iterator&
- operator=(BOOST_FUSION_R_ELSE_CLREF(OtherIt) it)
- {
- struct_=it.struct_;
- return *this;
- }
-
- typename detail::remove_reference<SeqRef>::type* struct_;
- };
-}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_at_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_at_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_at_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,8 +9,6 @@
#ifndef BOOST_FUSION_ADAPTED_DETAIL_STRUCT_VALUE_AT_IMPL_HPP
#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_VALUE_AT_IMPL_HPP
-#include <boost/fusion/support/assert.hpp>
-
namespace boost { namespace fusion { namespace extension
{
template<typename Tag>
@@ -22,10 +20,13 @@
template <typename SeqRef, typename N>
struct apply
: struct_member<typename detail::identity<SeqRef>::type, N::value>
- {
- //BOOST_FUSION_INDEX_CHECK(N::value, struct_size<Sequence>::value);
- };
+ {};
};
+
+ template <>
+ struct value_at_impl<assoc_struct_tag>
+ : value_at_impl<struct_tag>
+ {};
}}}
#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_at_key_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_at_key_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,32 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2007 Joel de Guzman
- Copyright (c) 2005-2007 Dan Marsden
-
- 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_ADAPTED_DETAIL_STRUCT_VALUE_AT_KEY_IMPL_HPP
-#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_VALUE_AT_KEY_IMPL_HPP
-
-#include <boost/mpl/if.hpp>
-
-namespace boost { namespace fusion { namespace extension
-{
- template<typename SeqRef>
- struct value_at_key_impl;
-
- template <>
- struct value_at_key_impl<struct_tag>
- {
- template <typename SeqRef, typename Key>
- struct apply
- : struct_assoc_member<
- typename detail::identity<SeqRef>::type
- , Key
- >
- {};
- };
-}}}
-
-#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_of_data_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_of_data_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,20 @@
+// 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_ADAPTED_DETAIL_STRUCT_VALUE_OF_DATA_IMPL_HPP
+#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_VALUE_OF_DATA_IMPL_HPP
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct value_of_data_impl;
+
+ template <>
+ struct value_of_data_impl<assoc_struct_iterator_tag>
+ : value_of_impl<assoc_struct_iterator_tag>
+ {};
+}}}
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_of_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/value_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,37 @@
+// 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_ADAPTED_DETAIL_STRUCT_VALUE_OF_IMPL_HPP
+#define BOOST_FUSION_ADAPTED_DETAIL_STRUCT_VALUE_OF_IMPL_HPP
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct value_of_impl;
+
+ template <>
+ struct value_of_impl<struct_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+
+ typedef typename
+ extension::struct_member<
+ typename detail::identity<typename it::seq_type>::type
+ , it::index::value
+ >::type
+ type;
+ };
+ };
+
+ template <>
+ struct value_of_impl<assoc_struct_iterator_tag>
+ : value_of_impl<struct_iterator_tag>
+ {};
+}}}
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/adapted/std_array.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/std_array.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,33 @@
+// 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_ADAPTED_STD_ARRAY_HPP
+#define BOOST_FUSION_ADAPTED_STD_ARRAY_HPP
+
+#include <boost/config.hpp>
+#include <boost/fusion/support/ref.hpp>
+
+#define BOOST_FUSION_ADAPTED_ARRAY_TYPE struct
+//TODO!!!
+#ifdef BOOST_HAS_TR1_ARRAY
+# define BOOST_FUSION_ADAPTED_ARRAY_NAMESPACE std::tr1
+#else
+# define BOOST_FUSION_ADAPTED_ARRAY_NAMESPACE std
+#endif
+#include <boost/fusion/adapted/detail/array/tag_of.hpp>
+#undef BOOST_FUSION_ADAPTED_ARRAY_NAMESPACE
+#undef BOOST_FUSION_ADAPTED_ARRAY_TYPE
+
+#include <boost/fusion/adapted/detail/array/array_iterator.hpp>
+#include <boost/fusion/adapted/detail/array/is_view_impl.hpp>
+#include <boost/fusion/adapted/detail/array/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/detail/array/category_of_impl.hpp>
+#include <boost/fusion/adapted/detail/array/begin_impl.hpp>
+#include <boost/fusion/adapted/detail/array/end_impl.hpp>
+#include <boost/fusion/adapted/detail/array/size_impl.hpp>
+#include <boost/fusion/adapted/detail/array/at_impl.hpp>
+#include <boost/fusion/adapted/detail/array/value_at_impl.hpp>
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/struct.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/struct.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/struct.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,24 +9,6 @@
#ifndef BOOST_FUSION_ADAPTED_STRUCT_HPP
#define BOOST_FUSION_ADAPTED_STRUCT_HPP
-#include <boost/fusion/support/ref.hpp>
-
-#include <boost/fusion/adapted/detail/struct/extension.hpp>
-#include <boost/fusion/adapted/detail/struct/adapt_base.hpp>
-#include <boost/fusion/adapted/detail/struct/adapt_struct.hpp>
-#include <boost/fusion/adapted/detail/struct/adapt_assoc_struct.hpp>
-
-#include <boost/fusion/adapted/detail/struct/at_impl.hpp>
-#include <boost/fusion/adapted/detail/struct/at_key_impl.hpp>
-#include <boost/fusion/adapted/detail/struct/is_view_impl.hpp>
-#include <boost/fusion/adapted/detail/struct/is_sequence_impl.hpp>
-#include <boost/fusion/adapted/detail/struct/value_at_impl.hpp>
-#include <boost/fusion/adapted/detail/struct/value_at_key_impl.hpp>
-#include <boost/fusion/adapted/detail/struct/category_of_impl.hpp>
-#include <boost/fusion/adapted/detail/struct/has_key_impl.hpp>
-#include <boost/fusion/adapted/detail/struct/size_impl.hpp>
-#include <boost/fusion/adapted/detail/struct/struct_iterator.hpp>
-#include <boost/fusion/adapted/detail/struct/begin_impl.hpp>
-#include <boost/fusion/adapted/detail/struct/end_impl.hpp>
-
+#include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
+#include <boost/fusion/adapted/struct/adapt_struct.hpp>
#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -6,8 +6,25 @@
#ifndef BOOST_FUSION_ADAPTED_STRUCT_ADAPT_ASSOC_STRUCT_HPP
#define BOOST_FUSION_ADAPTED_STRUCT_ADAPT_ASSOC_STRUCT_HPP
-//cschmidt: this header is only provided for backwards compatibility
+#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/iterator/basic_iterator.hpp>
-#include <boost/fusion/adapted/struct.hpp>
+#include <boost/fusion/adapted/detail/struct/extension.hpp>
+#include <boost/fusion/adapted/detail/struct/adapt_base.hpp>
+#include <boost/fusion/adapted/detail/struct/adapt_assoc_struct.hpp>
+
+#include <boost/fusion/adapted/detail/struct/at_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/is_view_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/value_at_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/category_of_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/size_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/begin_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/end_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/value_of_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/deref_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/deref_data_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/key_of_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/value_of_data_impl.hpp>
#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -6,8 +6,22 @@
#ifndef BOOST_FUSION_ADAPTED_STRUCT_ADAPT_STRUCT_HPP
#define BOOST_FUSION_ADAPTED_STRUCT_ADAPT_STRUCT_HPP
-//cschmidt: this header is only provided for backwards compatibility
+#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/iterator/basic_iterator.hpp>
-#include <boost/fusion/adapted/struct.hpp>
+#include <boost/fusion/adapted/detail/struct/extension.hpp>
+#include <boost/fusion/adapted/detail/struct/adapt_base.hpp>
+#include <boost/fusion/adapted/detail/struct/adapt_struct.hpp>
+
+#include <boost/fusion/adapted/detail/struct/at_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/is_view_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/value_at_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/category_of_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/size_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/begin_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/end_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/value_of_impl.hpp>
+#include <boost/fusion/adapted/detail/struct/deref_impl.hpp>
#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -13,13 +13,11 @@
namespace boost { namespace fusion
{
- struct void_;
-
namespace result_of
{
template <typename Seq, typename State, typename F>
struct accumulate
- : result_of::fold<Seq, State, F>
+ : fold<Seq, State, F>
{};
}
@@ -41,7 +39,8 @@
#ifdef BOOST_NO_RVALUE_REFERENCES
template <typename Seq, typename State, typename F>
- inline typename result_of::accumulate<Seq&, State const&, F const&>::type
+ inline typename
+ result_of::accumulate<Seq&, State const&, F const&>::type
accumulate(Seq& seq,State const& state,F const& f)
{
return fusion::fold(seq,state,f);
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -27,8 +27,8 @@
{
typedef
detail::fold_impl<
- result_of::size<Seq>::value
- , typename result_of::begin<Seq>::type
+ size<Seq>::value
+ , typename begin<Seq>::type
, typename detail::add_lref<State>::type
, typename detail::add_lref<F>::type
>
Deleted: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/assoc_find.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/assoc_find.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,38 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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_ALGORITHM_QUERY_DETAIL_ASSOC_FIND_HPP
-#define BOOST_FUSION_ALGORITHM_QUERY_DETAIL_ASSOC_FIND_HPP
-
-#include <boost/mpl/identity.hpp>
-#include <boost/mpl/eval_if.hpp>
-#include <boost/type_traits/is_const.hpp>
-
-namespace boost { namespace fusion { namespace detail
-{
- template <typename SeqRef, typename Key>
- struct assoc_find
- {
- typedef typename detail::remove_reference<SeqRef>::type seq;
-
- typedef typename
- mpl::eval_if<
- is_const<seq>
- , typename seq::template meta_find_impl_const<Key>
- , typename seq::template meta_find_impl<Key>
- >::type
- type;
-
- static type
- call(SeqRef seq)
- {
- return seq.find_impl(mpl::identity<Key>());
- }
- };
-}}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/find_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/find_if.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/find_if.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -10,7 +10,6 @@
#define BOOST_FUSION_ALGORITHM_QUERY_DETAIL_FIND_IF_HPP
#include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/iterator/value_of.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/iterator/advance_c.hpp>
@@ -28,12 +27,6 @@
namespace detail
{
- template <typename It, typename Pred>
- struct apply_filter
- : mpl::apply1<Pred, typename result_of::value_of<It>::type>::type
- {
- };
-
template <typename First, typename Last, typename Pred>
struct main_find_if;
@@ -56,7 +49,7 @@
mpl::eval_if<
mpl::or_<
result_of::equal_to<First, Last>
- , apply_filter<First, Pred>
+ , mpl::apply1<Pred,First>
>
, mpl::identity<First>
, recursive_find_if<First, Last, Pred>
@@ -72,30 +65,27 @@
: main_find_if<First, Last, Pred>
{};
- template<typename It, typename Pred, int n, int unrolling>
+ template<typename It, typename Pred, int N>
struct unroll_again;
- template <typename It, typename Pred, int offset>
+ template <typename It, typename Pred, int Offset>
struct apply_offset_filter
: mpl::apply1<
Pred
- , typename result_of::value_of<
- typename result_of::advance_c<It, offset>::type
- >::type
+ , typename result_of::advance_c<It, Offset>::type
>::type
- {
- };
+ {};
- template<typename It, typename Pred, int n>
+ template<typename It, typename Pred, int N>
struct unrolled_find_if
{
typedef typename
mpl::eval_if<
- apply_filter<It, Pred>
+ typename mpl::apply1<Pred,It>::type
, mpl::identity<It>
, mpl::eval_if<
apply_offset_filter<It, Pred, 1>
- , result_of::advance_c<It, 1>
+ , result_of::next<It>
, mpl::eval_if<
apply_offset_filter<It, Pred, 2>
, result_of::advance_c<It, 2>
@@ -105,8 +95,7 @@
, unroll_again<
It
, Pred
- , n
- , 4
+ , N
>
>
>
@@ -115,16 +104,28 @@
type;
};
+ template<typename It, typename Pred, int n>
+ struct unroll_again
+ {
+ typedef typename
+ unrolled_find_if<
+ typename result_of::advance_c<It, 4>::type
+ , Pred
+ , n-4
+ >::type
+ type;
+ };
+
template<typename It, typename Pred>
struct unrolled_find_if<It, Pred, 3>
{
typedef typename
mpl::eval_if<
- apply_filter<It, Pred>
+ typename mpl::apply1<Pred,It>::type
, mpl::identity<It>
, mpl::eval_if<
apply_offset_filter<It, Pred, 1>
- , result_of::advance_c<It, 1>
+ , result_of::next<It>
, mpl::eval_if<
apply_offset_filter<It, Pred, 2>
, result_of::advance_c<It, 2>
@@ -140,11 +141,11 @@
{
typedef typename
mpl::eval_if<
- apply_filter<It, Pred>
+ typename mpl::apply1<Pred,It>::type
, mpl::identity<It>
, mpl::eval_if<
apply_offset_filter<It, Pred, 1>
- , result_of::advance_c<It, 1>
+ , result_of::next<It>
, result_of::advance_c<It, 2>
>
>::type
@@ -156,21 +157,9 @@
{
typedef typename
mpl::eval_if<
- apply_filter<It, Pred>
+ typename mpl::apply1<Pred,It>::type
, mpl::identity<It>
- , result_of::advance_c<It, 1>
- >::type
- type;
- };
-
- template<typename It, typename Pred, int n, int unrolling>
- struct unroll_again
- {
- typedef typename
- unrolled_find_if<
- typename result_of::advance_c<It, unrolling>::type
- , Pred
- , n-unrolling
+ , result_of::next<It>
>::type
type;
};
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -10,47 +10,34 @@
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/support/category_of.hpp>
+#include <boost/fusion/iterator/value_of.hpp>
+#include <boost/mpl/placeholders.hpp>
#include <boost/type_traits/is_same.hpp>
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+# include <boost/type_traits/is_const.hpp>
+# include <boost/utility/enable_if.hpp>
+#endif
#include <boost/fusion/algorithm/query/detail/find_if.hpp>
-#include <boost/fusion/algorithm/query/detail/assoc_find.hpp>
namespace boost { namespace fusion
{
namespace result_of
{
- template<
- typename Seq
- , typename T
- , bool is_associative_sequence=traits::is_associative<Seq>::value
- >
- struct find;
-
template <typename Seq, typename T>
- struct find<Seq, T, false>
+ struct find
{
typedef
detail::static_seq_find_if<
- typename result_of::begin<Seq>::type
- , typename result_of::end<Seq>::type
- , is_same<mpl::_, T>
+ typename begin<Seq>::type
+ , typename end<Seq>::type
+ , is_same<value_of<mpl::_1>, T>
>
filter;
typedef typename filter::type type;
};
-
- template <typename Seq, typename T>
- struct find<Seq, T, true>
- {
- typedef
- detail::assoc_find<typename detail::add_lref<Seq>::type, T>
- filter;
-
- typedef typename filter::type type;
- };
}
template <typename T, typename Seq>
@@ -67,7 +54,15 @@
#ifdef BOOST_NO_RVALUE_REFERENCES
template <typename T, typename Seq>
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+ inline typename
+ lazy_disable_if<
+ is_const<Seq>
+ , result_of::find<Seq&, T>
+ >::type const
+#else
inline typename result_of::find<Seq&, T>::type const
+#endif
find(Seq& seq)
{
return result_of::find<Seq&, T>::filter::call(seq);
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -10,8 +10,18 @@
#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/mpl/quote.hpp>
+#include <boost/mpl/lambda.hpp>
+#include <boost/mpl/bind.hpp>
+#include <boost/mpl/placeholders.hpp>
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+# include <boost/type_traits/is_const.hpp>
+# include <boost/utility/enable_if.hpp>
+#endif
+
#include <boost/fusion/algorithm/query/detail/find_if.hpp>
namespace boost { namespace fusion
@@ -23,9 +33,12 @@
{
typedef
detail::static_find_if<
- typename result_of::begin<Seq>::type
- , typename result_of::end<Seq>::type
- , Pred
+ typename begin<Seq>::type
+ , typename end<Seq>::type
+ , mpl::bind1<
+ typename mpl::lambda<Pred>::type
+ , mpl::bind1<mpl::quote1<value_of>,mpl::_1>
+ >
>
gen;
@@ -46,7 +59,15 @@
#ifdef BOOST_NO_RVALUE_REFERENCES
template <typename Pred, typename Seq>
- inline typename result_of::find_if<Seq&, Pred>::type
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+ inline typename
+ lazy_disable_if<
+ is_const<Seq>
+ , result_of::find_if<Seq&, Pred>
+ >::type const
+#else
+ inline typename result_of::find_if<Seq&, Pred>::type const
+#endif
find_if(Seq& seq)
{
return result_of::find_if<Seq&, Pred>::gen::call(fusion::begin(seq));
Added: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,72 @@
+/*=============================================================================
+ Copyright (c) 2001-2006 Joel de Guzman
+
+ 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_ALGORITHM_QUERY_FIND_KEY_HPP
+#define BOOST_FUSION_ALGORITHM_QUERY_FIND_KEY_HPP
+
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/iterator/key_of.hpp>
+
+#include <boost/type_traits/is_same.hpp>
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+# include <boost/type_traits/is_const.hpp>
+# include <boost/utility/enable_if.hpp>
+#endif
+
+#include <boost/fusion/algorithm/query/detail/find_if.hpp>
+
+namespace boost { namespace fusion
+{
+ namespace result_of
+ {
+ template <typename Seq, typename T>
+ struct find_key
+ {
+ typedef
+ detail::static_seq_find_if<
+ typename begin<Seq>::type
+ , typename end<Seq>::type
+ , is_same<key_of<mpl::_1>, T>
+ >
+ filter;
+
+ typedef typename filter::type type;
+ };
+ }
+
+ template <typename T, typename Seq>
+ inline typename
+ result_of::find_key<BOOST_FUSION_R_ELSE_CLREF(Seq), T>::type const
+ find_key(BOOST_FUSION_R_ELSE_CLREF(Seq) seq)
+ {
+ return
+ result_of::find_key<
+ BOOST_FUSION_R_ELSE_CLREF(Seq)
+ , T
+ >::filter::call(seq);
+ }
+
+#ifdef BOOST_NO_RVALUE_REFERENCES
+ template <typename T, typename Seq>
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+ inline typename
+ lazy_disable_if<
+ is_const<Seq>
+ , result_of::find_key<Seq&, T>
+ >::type const
+#else
+ inline typename result_of::find_key<Seq&, T>::type const
+#endif
+ find_key(Seq& seq)
+ {
+ return result_of::find_key<Seq&, T>::filter::call(seq);
+ }
+#endif
+}}
+
+#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,25 +8,44 @@
#ifndef BOOST_FUSION_ALGORITHM_TRANSFORMATION_CLEAR_HPP
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_CLEAR_HPP
+#include <boost/fusion/sequence/convert.hpp>
#ifdef BOOST_NO_VARIADIC_TEMPLATES
# include <boost/fusion/container/vector/vector.hpp>
#else
# include <boost/fusion/container/vector/vector10.hpp>
#endif
+#include <boost/fusion/support/is_view.hpp>
+#include <boost/fusion/support/tag_of.hpp>
#include <boost/fusion/support/ref.hpp>
+#include <boost/mpl/identity.hpp>
+#include <boost/mpl/eval_if.hpp>
+
namespace boost { namespace fusion
{
namespace result_of
{
+ //TODO doc!!!
+
template <typename Seq>
struct clear
{
#ifdef BOOST_NO_VARIADIC_TEMPLATES
- typedef vector0<> type;
+ typedef vector0<> vec;
#else
- typedef vector<> type;
+ typedef vector<> vec;
#endif
+
+ typedef typename
+ mpl::eval_if<
+ traits::is_view<Seq>
+ , mpl::identity<vec>
+ , result_of::convert<
+ typename traits::tag_of<Seq>::type
+ , vec
+ >
+ >::type
+ type;
};
}
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,14 +11,12 @@
#include <boost/fusion/support/result_of.hpp>
#include <boost/mpl/bool.hpp>
-#include <boost/mpl/if.hpp>
+#include <boost/mpl/eval_if.hpp>
#include <boost/type_traits/is_convertible.hpp>
namespace boost { namespace fusion { namespace detail
{
//TODO cschmidt: update doc. according to real behavior!
- //TODO cschmidt: conv based on ptrs?!
- //TODO const?!
template <typename F, typename NewValue>
struct replace_if_helper
{
@@ -28,11 +26,7 @@
template<typename Self, typename U>
struct result<Self(U)>
{
- typedef typename detail::identity<U>::type u;
-
- typedef typename
- mpl::if_<is_convertible<NewValue, u>, u, U>::type
- type;
+ typedef U type;
};
template<typename OtherF, typename OtherNewValue>
@@ -59,37 +53,39 @@
}
template <typename U>
- BOOST_FUSION_R_ELSE_LREF(U)
- call_impl(BOOST_FUSION_R_ELSE_LREF(U) x, mpl::false_) const
+ U&
+ call_impl(U& x, mpl::false_) const
{
return x;
}
template <typename U>
- typename result<replace_if_helper(BOOST_FUSION_R_ELSE_LREF(U))>::type
- call_impl(BOOST_FUSION_R_ELSE_LREF(U) x, mpl::true_) const
+ U&
+ call_impl(U& x, mpl::true_) const
{
- return f(BOOST_FUSION_FORWARD(U,x)) ? new_value : x;
+ if(f(x))
+ {
+ return new_value;
+ }
+
+ return x;
}
template <typename U>
- typename result<replace_if_helper(BOOST_FUSION_R_ELSE_LREF(U))>::type
- operator()(BOOST_FUSION_R_ELSE_LREF(U) x) const
+ typename result<replace_if_helper(U&)>::type
+ operator()(U& x) const
{
return call_impl(
- BOOST_FUSION_FORWARD(U, x),
+ x,
typename is_convertible<
- NewValue
-#ifdef BOOST_NO_RVALUE_REFERENCES
- , U
-#else
- , typename detail::remove_reference<U>::type
-#endif
+ typename detail::remove_reference<NewValue>::type*
+ , U*
>::type());
}
F f;
- NewValue new_value;
+ //TODO test if const
+ mutable NewValue new_value;
};
}}}
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -69,12 +69,12 @@
>
struct erase
{
- typedef typename result_of::begin<Seq>::type seq_first_type;
- typedef typename result_of::end<Seq>::type seq_last_type;
+ typedef typename begin<Seq>::type seq_first_type;
+ typedef typename end<Seq>::type seq_last_type;
//TODO cschmidt: !
//BOOST_FUSION_STATIC_ASSERT(
- // (!result_of::equal_to<seq_first_type, seq_last_type>::value),
+ // (!equal_to<seq_first_type, seq_last_type>::value),
// "sequence empty");
typedef
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,8 +8,8 @@
#ifndef BOOST_FUSION_ALGORITHM_TRANSFORMATION_ERASE_KEY_HPP
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_ERASE_KEY_HPP
+#include <boost/fusion/algorithm/query/find_key.hpp>
#include <boost/fusion/algorithm/transformation/erase.hpp>
-#include <boost/fusion/algorithm/query/detail/assoc_find.hpp>
#include <boost/fusion/support/ref.hpp>
namespace boost { namespace fusion
@@ -19,32 +19,25 @@
template <typename Seq, typename Key>
struct erase_key
{
- typedef
- detail::assoc_find<
- typename detail::add_lref<Seq>::type
- , Key
- >
- gen;
-
typedef typename
erase<
Seq
- , typename gen::type
+ , typename find_key<
+ typename detail::add_lref<Seq>::type
+ , Key
+ >::type
>::type
type;
};
}
+ //TODO test const
template <typename Key, typename Seq>
inline typename
result_of::erase_key<BOOST_FUSION_R_ELSE_CLREF(Seq), Key>::type
erase_key(BOOST_FUSION_R_ELSE_CLREF(Seq) seq)
{
- return erase(
- BOOST_FUSION_FORWARD(Seq,seq),
- result_of::erase_key<
- BOOST_FUSION_R_ELSE_CLREF(Seq), Key
- >::gen::call(seq));
+ return erase(BOOST_FUSION_FORWARD(Seq,seq),find_key<Key>(seq));
}
#ifdef BOOST_NO_RVALUE_REFERENCES
@@ -52,7 +45,7 @@
inline typename result_of::erase_key<Seq&, Key>::type
erase_key(Seq& seq)
{
- return erase(seq,result_of::erase_key<Seq, Key>::gen::call(seq));
+ return erase(seq,find_key<Key>(seq));
}
#endif
}}
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -22,7 +22,7 @@
template <typename Seq, typename T>
struct filter
{
- typedef filter_view<Seq, is_same<mpl::_, T> > type;
+ typedef filter_view<Seq, is_same<mpl::_1, T> > type;
};
}
@@ -35,6 +35,7 @@
BOOST_FUSION_FORWARD(Seq,seq));
}
+ //TODO!!!
#ifdef BOOST_NO_RVALUE_REFERENCES
template <typename T, typename Seq>
inline typename result_of::filter<Seq&, T>::type
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -23,8 +23,7 @@
, Pos
, single_view<typename detail::as_fusion_element<T>::type>
>
- {
- };
+ {};
}
template <typename Seq, typename Pos, typename T>
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -26,14 +26,14 @@
{
typedef
iterator_range<
- typename result_of::begin<Seq>::type
+ typename begin<Seq>::type
, typename detail::identity<Pos>::type
>
left_type;
typedef
iterator_range<
typename detail::identity<Pos>::type
- , typename result_of::end<Seq>::type
+ , typename end<Seq>::type
>
right_type;
typedef
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -22,7 +22,7 @@
struct remove
{
typedef
- filter_view<Seq, mpl::not_<is_same<mpl::_, T> > >
+ filter_view<Seq, mpl::not_<is_same<mpl::_1, T> > >
type;
};
}
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,6 +8,7 @@
#ifndef BOOST_FUSION_ALGORITHM_TRANSFORMATION_REPLACE_HPP
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_REPLACE_HPP
+#include <boost/config.hpp>
#include <boost/fusion/algorithm/transformation/replace_if.hpp>
#include <boost/fusion/support/ref.hpp>
#include <boost/fusion/support/detail/as_fusion_element.hpp>
@@ -26,6 +27,22 @@
: old_value(BOOST_FUSION_FORWARD(OtherOldValue,old_value))
{}
+#if BOOST_WORKAROUND(__GNUC__,<4)
+ //cschmidt: due to some strange reason the default assignment ctor/
+ //operator generated by gcc 3.x do not work in some cases. That is
+ //why we define them here.
+ replace_helper(replace_helper const& replacer)
+ : old_value(replacer.old_value)
+ {}
+
+ replace_helper&
+ operator=(replace_helper const& replacer)
+ {
+ old_value=replacer.old_value;
+ return *this;
+ }
+#endif
+
template<typename Replacer>
replace_helper(BOOST_FUSION_R_ELSE_CLREF(Replacer) replacer)
: old_value(BOOST_FUSION_FORWARD(Replacer,replacer).old_value)
@@ -41,7 +58,7 @@
template <typename U>
bool
- operator()(BOOST_FUSION_R_ELSE_CLREF(U) x) const
+ operator()(BOOST_FUSION_R_ELSE_LREF(U) x) const
{
return x==old_value;
}
@@ -52,17 +69,18 @@
namespace result_of
{
- //TODO New arg?!
- template <typename Seq, typename OldValue, typename NewValue>
+ template <typename Seq, typename T>
struct replace
{
typedef
detail::replace_helper<
- typename detail::as_fusion_element<OldValue>::type
+ typename detail::as_fusion_element<T>::type
>
replacer;
- typedef typename replace_if<Seq, replacer, NewValue>::type type;
+ typedef typename
+ replace_if<Seq, BOOST_FUSION_R_ELSE_CLREF(replacer), T>::type
+ type;
};
}
@@ -72,7 +90,6 @@
result_of::replace<
BOOST_FUSION_R_ELSE_CLREF(Seq)
, BOOST_FUSION_R_ELSE_CLREF(OldValue)
- , BOOST_FUSION_R_ELSE_CLREF(NewValue)
>::type
replace(BOOST_FUSION_R_ELSE_CLREF(Seq) seq,
BOOST_FUSION_R_ELSE_CLREF(OldValue) old_value,
@@ -82,7 +99,6 @@
result_of::replace<
BOOST_FUSION_R_ELSE_CLREF(Seq)
, BOOST_FUSION_R_ELSE_CLREF(OldValue)
- , BOOST_FUSION_R_ELSE_CLREF(NewValue)
>::replacer
replacer;
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,21 +9,21 @@
#define BOOST_FUSION_ALGORITHM_TRANSFORMATION_REPLACE_IF_HPP
#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/detail/as_fusion_element.hpp>
-#include <boost/fusion/algorithm/transformation/detail/replace_if.hpp>
namespace boost { namespace fusion
{
namespace result_of
{
- template <typename Seq, typename F, typename T>
+ template <typename Seq, typename F, typename NewValue>
struct replace_if
{
typedef
detail::replace_if_helper<
- typename detail::as_fusion_element<F>::type
- , typename detail::as_fusion_element<T>::type
+ typename detail::add_lref<F>::type
+ , typename detail::as_fusion_element<NewValue>::type
>
replacer;
Added: sandbox/SOC/2009/fusion/boost/fusion/container/detail/forward_ctor.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/detail/forward_ctor.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,23 @@
+// 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)
+
+#if !defined(BOOST_FUSION_SEQ_NAME) && !defined(BOOST_FUSION_CONTAINER_DETAIL_FORWARD_CTOR_HPP)
+# define BOOST_FUSION_CONTAINER_DETAIL_FORWARD_CTOR_HPP
+# include <boost/config.hpp>
+#endif
+
+#ifdef BOOST_FUSION_USE_BASE_TYPE
+# define BOOST_FUSION_INIT_BASE base_type
+#else
+# define BOOST_FUSION_INIT_BASE data
+#endif
+
+#ifdef BOOST_NO_VARIADIC_TEMPLATES
+# include <boost/fusion/container/detail/pp/forward_ctor.hpp>
+#else
+# include <boost/fusion/container/detail/variadic_templates/forward_ctor.hpp>
+#endif
+
+#undef BOOST_FUSION_INIT_BASE
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -18,20 +18,12 @@
# define BOOST_PP_ITERATION_LIMITS (1, BOOST_FUSION_MAX_SEQ_SIZE)
# include BOOST_PP_ITERATE()
-# ifdef BOOST_NO_RVALUE_REFERENCES
template<typename SeqAssign>
BOOST_FUSION_SEQ_NAME(SeqAssign const& seq_assign)
-# ifdef BOOST_FUSION_USE_BASE_TYPE
- : base_type(seq_assign)
-# else
- : data(seq_assign)
-# endif
+ : BOOST_FUSION_INIT_BASE(seq_assign)
{}
-# endif
# endif
-
#else
-
# define N BOOST_PP_ITERATION()
# ifndef BOOST_NO_RVALUE_REFERENCES
@@ -42,21 +34,11 @@
# endif
# ifdef BOOST_NO_RVALUE_REFERENCES
BOOST_FUSION_SEQ_NAME(EXPAND_TEMPLATE_ARGUMENTS_CALL_PARAMS(N))
-# ifdef BOOST_FUSION_USE_BASE_TYPE
- : base_type(EXPAND_PARAMETERS(N))
-# else
- : data(EXPAND_PARAMETERS(N))
-# endif
- {}
# else
BOOST_FUSION_SEQ_NAME(EXPAND_TEMPLATE_ARGUMENTS_A(N))
-# ifdef BOOST_FUSION_USE_BASE_TYPE
- : base_type(EXPAND_PARAMETERS_A(N))
-# else
- : data(EXPAND_PARAMETERS_A(N))
-# endif
- {}
# endif
+ : BOOST_FUSION_INIT_BASE(EXPAND_PARAMETERS_A(N))
+ {}
# undef N
-#endif // defined(BOOST_PP_IS_ITERATING)
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/forward_ctor.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/forward_ctor.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,30 @@
+// 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_SEQ_NAME
+# ifndef BOOST_FUSION_CONTAINER_DETAIL_VARIADIC_TEMPLATES_FORWARD_CTOR_HPP
+# define BOOST_FUSION_CONTAINER_DETAIL_VARIADIC_TEMPLATES_FORWARD_CTOR_HPP
+# include <boost/call_traits.hpp>
+# endif
+#else
+# ifdef BOOST_NO_RVALUE_REFERENCES
+ explicit
+ BOOST_FUSION_SEQ_NAME(
+ typename call_traits<Arguments>::param_type... arguments)
+ : BOOST_FUSION_INIT_BASE(arguments)
+ {}
+# else
+ template <typename... OtherArguments>
+ explicit
+ BOOST_FUSION_SEQ_NAME(OtherArguments&&... arguments)
+ : BOOST_FUSION_INIT_BASE(std::forward<OtherArguments>(arguments)...)
+ {}
+# endif
+
+ template<typename SeqAssign>
+ BOOST_FUSION_SEQ_NAME(SeqAssign const& seq_assign)
+ : BOOST_FUSION_INIT_BASE(seq_assign)
+ {}
+#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -18,7 +18,6 @@
#include <boost/mpl/advance.hpp>
#include <boost/mpl/end.hpp>
#include <boost/mpl/size.hpp>
-#include <boost/mpl/lambda.hpp>
#include <boost/mpl/apply.hpp>
#include <boost/mpl/unpack_args.hpp>
#include <boost/mpl/vector.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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -18,7 +18,6 @@
#include <boost/mpl/advance.hpp>
#include <boost/mpl/end.hpp>
#include <boost/mpl/size.hpp>
-#include <boost/mpl/lambda.hpp>
#include <boost/mpl/apply.hpp>
#include <boost/mpl/unpack_args.hpp>
#include <boost/mpl/vector.hpp>
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,10 +11,8 @@
#include <boost/fusion/support/ref.hpp>
#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/type_traits/is_const.hpp>
-
-namespace boost { namespace fusion {
-
+namespace boost { namespace fusion
+{
template<typename Key, typename T>
struct pair;
@@ -34,7 +32,7 @@
template<typename Key, typename T>
typename result_of::pair_tie<Key, BOOST_FUSION_R_ELSE_CLREF(T)>::type
- pair_tie(BOOST_FUSION_R_ELSE_CLREF(T) t)
+ pair_tie(BOOST_FUSION_R_ELSE_LREF(T) t)
{
return typename
result_of::pair_tie<
@@ -42,15 +40,6 @@
, BOOST_FUSION_R_ELSE_CLREF(T)
>::type(BOOST_FUSION_FORWARD(T,t));
}
-
-#ifdef BOOST_NO_RVALUE_REFERENCES
- template<typename Key, typename T>
- typename result_of::pair_tie<Key, T const&>::type
- pair_tie(T const& t)
- {
- return typename result_of::pair_tie<Key, T const&>::type(t);
- }
-#endif
}}
#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -42,8 +42,6 @@
namespace boost { namespace fusion
{
struct void_;
- struct cons_tag;
- struct forward_traversal_tag;
struct fusion_sequence_tag;
struct nil
@@ -51,7 +49,7 @@
{
typedef mpl::int_<0> size;
typedef cons_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
+ typedef fusion_sequence_tag tag;
typedef mpl::false_ is_view;
typedef forward_traversal_tag category;
typedef void_ car_type;
@@ -92,7 +90,7 @@
{
typedef mpl::int_<Cdr::size::value+1> size;
typedef cons_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
+ typedef fusion_sequence_tag tag;
typedef mpl::false_ is_view;
typedef forward_traversal_tag category;
typedef Car car_type;
@@ -126,12 +124,14 @@
{}
#ifdef BOOST_NO_RVALUE_REFERENCES
- explicit cons(typename call_traits<Car>::param_type car)
+ explicit
+ cons(typename call_traits<Car>::param_type car)
: car(car)
{}
#else
template<typename OtherCar>
- explicit cons(OtherCar&& car)
+ explicit
+ cons(OtherCar&& car)
: car(std::forward<OtherCar>(car))
{}
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/build_cons.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/build_cons.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/build_cons.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -40,9 +40,11 @@
build_cons<typename result_of::next<First>::type, Last>
next_build_cons;
- typedef cons<
- typename result_of::value_of<First>::type
- , typename next_build_cons::type>
+ typedef
+ cons<
+ typename result_of::value_of<First>::type
+ , typename next_build_cons::type
+ >
type;
static type
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/cons_fwd.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/cons_fwd.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/cons_fwd.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,6 +9,7 @@
namespace boost { namespace fusion
{
struct cons_tag;
+ struct forward_traversal_tag;
struct nil;
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -66,7 +66,8 @@
cons_iterator()\
{}\
\
- explicit cons_iterator(nil COMBINATION, int)\
+ explicit\
+ cons_iterator(nil COMBINATION, int)\
{}\
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/begin_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,9 +9,6 @@
#ifndef BOOST_FUSION_CONTAINER_LIST_DETAIL_LIST_BEGIN_IMPL_HPP
#define BOOST_FUSION_CONTAINER_LIST_DETAIL_LIST_BEGIN_IMPL_HPP
-#include <boost/fusion/support/iterator_adapter.hpp>
-#include <boost/fusion/sequence/intrinsic/begin.hpp>
-
namespace boost { namespace fusion { namespace extension
{
template <typename Tag>
@@ -24,23 +21,18 @@
struct apply
{
typedef
- iterator_adapter<
- typename result_of::begin<
- typename detail::forward_as<
- SeqRef
- , typename detail::remove_reference<
- SeqRef
- >::type::storage_type
- >::type
- >::type
+ basic_iterator<
+ list_iterator_tag
, forward_traversal_tag
+ , SeqRef
+ , 0
>
type;
static type
call(SeqRef seq)
{
- return type(fusion::begin(seq.get_data()),0);
+ return type(seq,0);
}
};
};
Added: sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/deref_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/deref_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,45 @@
+// 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_CONTAINER_LIST_DETAIL_LIST_DEREF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_LIST_DETAIL_LIST_DEREF_IMPL_HPP
+
+#include <boost/fusion/sequence/intrinsic/at.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct deref_impl;
+
+ template <>
+ struct deref_impl<list_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+
+ typedef typename
+ result_of::at<
+ typename detail::forward_as<
+ typename it::seq_type
+ , typename detail::remove_reference<
+ typename it::seq_type
+ >::type::storage_type
+ >::type
+ , typename it::index
+ >::type
+ type;
+
+ static type
+ call(ItRef it_)
+ {
+ return at<typename it::index>(it_.seq->get_data());
+ }
+ };
+ };
+}}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/end_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,8 +9,7 @@
#ifndef BOOST_FUSION_CONTAINER_LIST_DETAIL_LIST_END_IMPL_HPP
#define BOOST_FUSION_CONTAINER_LIST_DETAIL_LIST_END_IMPL_HPP
-#include <boost/fusion/support/iterator_adapter.hpp>
-#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/sequence/intrinsic/size.hpp>
namespace boost { namespace fusion { namespace extension
{
@@ -24,23 +23,18 @@
struct apply
{
typedef
- iterator_adapter<
- typename result_of::end<
- typename detail::forward_as<
- SeqRef
- , typename detail::remove_reference<
- SeqRef
- >::type::storage_type
- >::type
- >::type
+ basic_iterator<
+ list_iterator_tag
, forward_traversal_tag
+ , SeqRef
+ , result_of::size<SeqRef>::type::value
>
type;
static type
call(SeqRef seq)
{
- return type(fusion::end(seq.get_data()),0);
+ return type(seq,0);
}
};
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/value_at_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/value_at_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/value_at_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -10,6 +10,7 @@
namespace boost { namespace fusion { namespace extension
{
+ //TODO doc
template <typename Tag>
struct value_at_impl;
@@ -20,14 +21,12 @@
struct apply
{
typedef typename
- detail::forward_as<
- SeqRef
- , typename detail::remove_reference<SeqRef>::type::storage_type
- >::type
- storage_type;
-
- typedef typename
- result_of::value_at<storage_type,N>::type
+ result_of::value_at<
+ typename detail::remove_reference<
+ SeqRef
+ >::type::storage_type
+ , N
+ >::type
type;
};
};
Added: sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/value_of_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/list/value_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,36 @@
+// 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_CONTAINER_LIST_DETAIL_LIST_VALUE_OF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_LIST_DETAIL_LIST_VALUE_OF_IMPL_HPP
+
+#include <boost/fusion/sequence/intrinsic/value_at.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct value_of_impl;
+
+ template <>
+ struct value_of_impl<list_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+
+ typedef typename
+ result_of::value_at<
+ typename detail::remove_reference<
+ typename it::seq_type
+ >::type::storage_type
+ , typename it::index
+ >::type
+ type;
+ };
+ };
+}}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/limits.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/limits.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/limits.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/container/vector/limits.hpp>
#if defined(BOOST_NO_VARIADIC_TEMPLATES) || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
-# if !defined(FUSION_MAX_LIST_SIZE)
+# ifndef FUSION_MAX_LIST_SIZE
# define FUSION_MAX_LIST_SIZE FUSION_MAX_VECTOR_SIZE
# else
# if FUSION_MAX_LIST_SIZE < 3
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -10,7 +10,7 @@
#include <boost/fusion/container/list/list_fwd.hpp>
#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/support/category_of.hpp>
+#include <boost/fusion/iterator/basic_iterator.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/ref.hpp>
@@ -18,29 +18,27 @@
#include <boost/fusion/container/list/detail/list/end_impl.hpp>
#include <boost/fusion/container/list/detail/list/at_impl.hpp>
#include <boost/fusion/container/list/detail/list/value_at_impl.hpp>
+#include <boost/fusion/container/list/detail/list/deref_impl.hpp>
+#include <boost/fusion/container/list/detail/list/value_of_impl.hpp>
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# include <boost/fusion/container/detail/pp/forward_ctor.hpp>
-#endif
+#include <boost/fusion/container/detail/forward_ctor.hpp>
namespace boost { namespace fusion
{
struct fusion_sequence_tag;
-#ifndef BOOST_NO_VARIADIC_TEMPLATES
- struct void_;
-#endif
VARIADIC_TEMPLATE(FUSION_MAX_LIST_SIZE)
struct list
: sequence_base<list<EXPAND_TEMPLATE_ARGUMENTS(FUSION_MAX_LIST_SIZE)> >
{
typedef forward_traversal_tag category;
-
typedef list_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
+ typedef fusion_sequence_tag tag;
typedef mpl::false_ is_view;
- typedef vector<EXPAND_TEMPLATE_ARGUMENTS(FUSION_MAX_LIST_SIZE)> storage_type;
+ typedef
+ vector<EXPAND_TEMPLATE_ARGUMENTS(FUSION_MAX_LIST_SIZE)>
+ storage_type;
typedef typename storage_type::size size;
list()
@@ -55,18 +53,11 @@
#undef LIST_CTOR
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# define BOOST_FUSION_SEQ_NAME list
-# define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_LIST_SIZE
-# include <boost/fusion/container/detail/pp/forward_ctor.hpp>
-# undef BOOST_FUSION_MAX_SEQ_SIZE
-# undef BOOST_FUSION_SEQ_NAME
-#else
- template <typename... OtherArguments>
- list(BOOST_FUSION_R_ELSE_CLREF(OtherArguments)... arguments)
- : data(BOOST_FUSION_FORWARD(OtherArguments,arguments)...)
- {}
-#endif
+#define BOOST_FUSION_SEQ_NAME list
+#define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_LIST_SIZE
+#include <boost/fusion/container/detail/forward_ctor.hpp>
+#undef BOOST_FUSION_MAX_SEQ_SIZE
+#undef BOOST_FUSION_SEQ_NAME
template <typename Seq>
list&
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -14,6 +14,8 @@
namespace boost { namespace fusion
{
struct list_tag;
+ struct list_iterator_tag;
+ struct forward_traversal_tag;
VARIADIC_TEMPLATE_WITH_DEFAULT(FUSION_MAX_LIST_SIZE)
struct list;
Deleted: sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/at_key_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/at_key_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,39 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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_CONTAINER_MAP_DETAIL_AT_KEY_IMPL_HPP
-#define BOOST_FUSION_CONTAINER_MAP_DETAIL_AT_KEY_IMPL_HPP
-
-namespace boost { namespace fusion { namespace extension
-{
- template <typename Tag>
- struct at_key_impl;
-
- template <>
- struct at_key_impl<map_tag>
- {
- template <typename SeqRef, typename Key>
- struct apply
- {
- typedef typename
- detail::forward_as<
- SeqRef
- , typename detail::remove_reference<SeqRef>::type::
- template meta_at_impl<Key>::type
- >::type
- type;
-
- static type
- call(SeqRef seq)
- {
- return seq.at_impl(mpl::identity<Key>());
- }
- };
- };
-}}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/begin_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -6,8 +6,6 @@
#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_BEGIN_IMPL_HPP
#define BOOST_FUSION_CONTAINER_MAP_DETAIL_BEGIN_IMPL_HPP
-#include <boost/fusion/sequence/intrinsic/begin.hpp>
-
namespace boost { namespace fusion { namespace extension
{
template <typename Tag>
@@ -19,21 +17,19 @@
template <typename SeqRef>
struct apply
{
- typedef typename
- result_of::begin<
- typename detail::forward_as<
- SeqRef
- , typename detail::remove_reference<
- SeqRef
- >::type::storage_type
- >::type
- >::type
+ typedef
+ basic_iterator<
+ map_iterator_tag
+ , map_category
+ , SeqRef
+ , 0
+ >
type;
static type
call(SeqRef seq)
{
- return fusion::begin(seq.get_data());
+ return type(seq,0);
}
};
};
Added: sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/deref_data_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/deref_data_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,41 @@
+// 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_CONTAINER_MAP_DETAIL_DEREF_DATA_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_DEREF_DATA_IMPL_HPP
+
+#include <boost/fusion/iterator/value_of.hpp>
+#include <boost/fusion/iterator/deref.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct deref_data_impl;
+
+ template <>
+ struct deref_data_impl<map_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+
+ typedef typename
+ detail::forward_as<
+ typename it::seq_type
+ , typename result_of::value_of<ItRef>::type::second_type
+ >::type
+ type;
+
+ static type
+ call(ItRef it)
+ {
+ return deref(it).second;
+ }
+ };
+ };
+}}}
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/deref_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/deref_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,45 @@
+// 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_CONTAINER_MAP_DETAIL_DEREF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_DEREF_IMPL_HPP
+
+#include <boost/fusion/sequence/intrinsic/at.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct deref_impl;
+
+ template <>
+ struct deref_impl<map_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+
+ typedef typename
+ result_of::at<
+ typename detail::forward_as<
+ typename it::seq_type
+ , typename detail::remove_reference<
+ typename it::seq_type
+ >::type::storage_type
+ >::type
+ , typename it::index
+ >::type
+ type;
+
+ static type
+ call(ItRef it_)
+ {
+ return at<typename it::index>(it_.seq->get_data());
+ }
+ };
+ };
+}}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/end_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -6,8 +6,6 @@
#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_END_IMPL_HPP
#define BOOST_FUSION_CONTAINER_MAP_DETAIL_END_IMPL_HPP
-#include <boost/fusion/sequence/intrinsic/end.hpp>
-
namespace boost { namespace fusion { namespace extension
{
template <typename Tag>
@@ -19,21 +17,19 @@
template <typename SeqRef>
struct apply
{
- typedef typename
- result_of::end<
- typename detail::forward_as<
- SeqRef
- , typename detail::remove_reference<
- SeqRef
- >::type::storage_type
- >::type
- >::type
+ typedef
+ basic_iterator<
+ map_iterator_tag
+ , map_category
+ , SeqRef
+ , detail::remove_reference<SeqRef>::type::size::value
+ >
type;
static type
call(SeqRef seq)
{
- return fusion::end(seq.get_data());
+ return type(seq,0);
}
};
};
Added: sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/key_of_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/key_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,30 @@
+// 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_CONTAINER_MAP_DETAIL_KEY_OF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_KEY_OF_IMPL_HPP
+
+#include <boost/fusion/container/map/detail/value_of_impl.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct key_of_impl;
+
+ template <>
+ struct key_of_impl<map_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename
+ value_of_impl<map_iterator_tag>::
+ template apply<ItRef>::type::first_type
+ type;
+ };
+ };
+}}}
+
+#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/value_at_key_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/value_at_key_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,31 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
- Copyright (c) 2006 Dan Marsden
-
- 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_CONTAINER_MAP_DETAIL_VALUE_AT_KEY_IMPL_HPP
-#define BOOST_FUSION_CONTAINER_MAP_DETAIL_VALUE_AT_KEY_IMPL_HPP
-
-namespace boost { namespace fusion { namespace extension
-{
- template <typename Tag>
- struct value_at_key_impl;
-
- template <>
- struct value_at_key_impl<map_tag>
- {
- template <typename SeqRef, typename Key>
- struct apply
- {
- typedef typename
- detail::remove_reference<SeqRef>::type::
- template meta_at_impl<Key>::type
- type;
- };
- };
-}}}
-
-#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/value_of_data_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/value_of_data_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,30 @@
+// 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_CONTAINER_MAP_DETAIL_VALUE_OF_DATA_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_VALUE_OF_DATA_IMPL_HPP
+
+#include <boost/fusion/container/map/detail/value_of_impl.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct value_of_data_impl;
+
+ template <>
+ struct value_of_data_impl<map_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename
+ value_of_impl<map_iterator_tag>::
+ template apply<ItRef>::type::second_type
+ type;
+ };
+ };
+}}}
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/value_of_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/value_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,36 @@
+// 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_CONTAINER_MAP_DETAIL_VALUE_OF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_VALUE_OF_IMPL_HPP
+
+#include <boost/fusion/sequence/intrinsic/value_at.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct value_of_impl;
+
+ template <>
+ struct value_of_impl<map_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+
+ typedef typename
+ result_of::value_at<
+ typename detail::remove_reference<
+ typename it::seq_type
+ >::type::storage_type
+ , typename it::index
+ >::type
+ type;
+ };
+ };
+}}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/map/limits.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/map/limits.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/limits.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/container/vector/limits.hpp>
#if defined(BOOST_NO_VARIADIC_TEMPLATES) || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
-# if !defined(FUSION_MAX_MAP_SIZE)
+# ifndef FUSION_MAX_MAP_SIZE
# define FUSION_MAX_MAP_SIZE FUSION_MAX_VECTOR_SIZE
# else
# if FUSION_MAX_MAP_SIZE < 3
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -1,44 +1,29 @@
-/*=============================================================================
- Copyright (c) 2005 Joel de Guzman
-
- 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)
-==============================================================================*/
+// 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_CONTAINER_MAP_MAP_HPP
#define BOOST_FUSION_CONTAINER_MAP_MAP_HPP
#include <boost/fusion/container/map/map_fwd.hpp>
#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/iterator/basic_iterator.hpp>
#include <boost/fusion/support/pair.hpp>
-#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/ref.hpp>
-#include <boost/mpl/identity.hpp>
-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/find_if.hpp>
-#include <boost/mpl/distance.hpp>
-#include <boost/mpl/begin.hpp>
-#include <boost/mpl/end.hpp>
-#include <boost/mpl/deref.hpp>
#include <boost/mpl/bool.hpp>
-#include <boost/mpl/identity.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/add_const.hpp>
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# include <boost/fusion/container/map/detail/pp/lookup_key.hpp>
-#endif
#include <boost/fusion/container/map/detail/begin_impl.hpp>
#include <boost/fusion/container/map/detail/end_impl.hpp>
-#include <boost/fusion/container/map/detail/at_key_impl.hpp>
-#include <boost/fusion/container/map/detail/value_at_key_impl.hpp>
+#include <boost/fusion/container/map/detail/deref_impl.hpp>
+#include <boost/fusion/container/map/detail/value_of_impl.hpp>
+#include <boost/fusion/container/map/detail/value_of_data_impl.hpp>
+#include <boost/fusion/container/map/detail/deref_data_impl.hpp>
+#include <boost/fusion/container/map/detail/key_of_impl.hpp>
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# include <boost/fusion/container/detail/pp/forward_ctor.hpp>
-#endif
+#include <boost/fusion/container/detail/forward_ctor.hpp>
namespace boost { namespace fusion
{
@@ -51,10 +36,9 @@
struct map
: sequence_base<map<EXPAND_TEMPLATE_ARGUMENTS(FUSION_MAX_MAP_SIZE)> >
{
- struct category : forward_traversal_tag, associative_sequence_tag {};
-
+ typedef map_category category;
typedef map_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
+ typedef fusion_sequence_tag tag;
typedef mpl::false_ is_view;
typedef
@@ -62,77 +46,6 @@
storage_type;
typedef typename storage_type::size size;
-private:
- template<class Key>struct is_key
- {
- template<class Pair>struct apply
- : is_same<Key,typename Pair::first_type>
- {
- };
- };
-public:
- template <typename Key>
- struct meta_at_impl
- {
- template<class It>
- struct get_type
- {
- typedef typename mpl::deref<It>::type::second_type type;
- };
-
- typedef typename
- mpl::find_if<
- typename storage_type::types
- , is_key<Key>
- >::type
- iterator;
-
- typedef typename
- mpl::eval_if<
- is_same<
- iterator
- , typename mpl::end<typename storage_type::types>::type
- >
- , mpl::identity<void_>
- , get_type<iterator>
- >::type
- type;
- };
-
- template <typename Key>
- struct meta_find_impl
- {
- typedef
- vector_iterator<
- storage_type&
- , mpl::distance<
- typename mpl::begin<typename storage_type::types>::type
- , typename mpl::find_if<
- typename storage_type::types
- , is_key<Key>
- >::type
- >::value
- >
- type;
- };
-
- template <typename Key>
- struct meta_find_impl_const
- {
- typedef
- vector_iterator<
- storage_type const&
- , mpl::distance<
- typename mpl::begin<typename storage_type::types>::type
- , typename mpl::find_if<
- typename storage_type::types
- , is_key<Key>
- >::type
- >::value
- >
- type;
- };
-
map()
{}
@@ -145,18 +58,11 @@
#undef MAP_CTOR
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# define BOOST_FUSION_SEQ_NAME map
-# define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_MAP_SIZE
-# include <boost/fusion/container/detail/pp/forward_ctor.hpp>
-# undef BOOST_FUSION_MAX_SEQ_SIZE
-# undef BOOST_FUSION_SEQ_NAME
-#else
- template <typename... OtherArguments>
- map(BOOST_FUSION_R_ELSE_CLREF(OtherArguments)... arguments)
- : data(BOOST_FUSION_FORWARD(OtherArguments,arguments)...)
- {}
-#endif
+#define BOOST_FUSION_SEQ_NAME map
+#define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_MAP_SIZE
+#include <boost/fusion/container/detail/forward_ctor.hpp>
+#undef BOOST_FUSION_MAX_SEQ_SIZE
+#undef BOOST_FUSION_SEQ_NAME
template <typename Seq>
map&
@@ -166,38 +72,6 @@
return *this;
}
- template <typename Key>
- typename meta_find_impl_const<Key>::type
- find_impl(mpl::identity<Key>) const
- {
- return typename meta_find_impl_const<Key>::type(data,0);
- }
-
- template <typename Key>
- typename meta_find_impl<Key>::type
- find_impl(mpl::identity<Key>)
- {
- return typename meta_find_impl<Key>::type(data,0);
- }
-
- template <class Key>
- typename detail::add_lref<typename meta_at_impl<Key>::type>::type
- at_impl(mpl::identity<Key>)
- {
- return data.at_impl(
- typename meta_find_impl<Key>::type::index()).second;
- }
-
- template <class Key>
- typename detail::add_lref<
- typename add_const<typename meta_at_impl<Key>::type>::type
- >::type
- at_impl(mpl::identity<Key>) const
- {
- return data.at_impl(
- typename meta_find_impl_const<Key>::type::index()).second;
- }
-
storage_type& get_data() { return data; }
storage_type const& get_data() const { return data; }
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,11 +9,17 @@
#define BOOST_FUSION_CONTAINER_MAP_MAP_FWD_HPP
#include <boost/fusion/container/map/limits.hpp>
+#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/support/template.hpp>
namespace boost { namespace fusion
{
struct map_tag;
+ struct map_iterator_tag;
+
+ struct map_category
+ : forward_traversal_tag, associative_sequence_tag
+ {};
VARIADIC_TEMPLATE_WITH_DEFAULT(FUSION_MAX_MAP_SIZE)
struct map;
Deleted: sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/at_key_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/at_key_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,39 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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_CONTAINER_SET_DETAIL_AT_KEY_IMPL_HPP
-#define BOOST_FUSION_CONTAINER_SET_DETAIL_AT_KEY_IMPL_HPP
-
-namespace boost { namespace fusion { namespace extension
-{
- template <typename Tag>
- struct at_key_impl;
-
- template <>
- struct at_key_impl<set_tag>
- {
- template <typename SeqRef, typename Key>
- struct apply
- {
- typedef typename
- detail::forward_as<
- SeqRef
- , typename detail::remove_reference<SeqRef>::type::
- template meta_at_impl<Key>::type
- >::type
- type;
-
- static type
- call(SeqRef seq)
- {
- return seq.at_impl(mpl::identity<Key>());
- }
- };
- };
-}}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/begin_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -6,8 +6,6 @@
#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_BEGIN_IMPL_HPP
#define BOOST_FUSION_CONTAINER_SET_DETAIL_BEGIN_IMPL_HPP
-#include <boost/fusion/sequence/intrinsic/begin.hpp>
-
namespace boost { namespace fusion { namespace extension
{
template <typename Tag>
@@ -19,21 +17,19 @@
template <typename SeqRef>
struct apply
{
- typedef typename
- result_of::begin<
- typename detail::forward_as<
- SeqRef
- , typename detail::remove_reference<
- SeqRef
- >::type::storage_type
- >::type
- >::type
+ typedef
+ basic_iterator<
+ set_iterator_tag
+ , set_category
+ , SeqRef
+ , 0
+ >
type;
static type
call(SeqRef seq)
{
- return fusion::begin(seq.get_data());
+ return type(seq,0);
}
};
};
Added: sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/deref_data_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/deref_data_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,22 @@
+// 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_CONTAINER_SET_DETAIL_DEREF_DATA_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_DEREF_DATA_IMPL_HPP
+
+#include <boost/fusion/container/set/detail/deref_impl.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct deref_data_impl;
+
+ template <>
+ struct deref_data_impl<set_iterator_tag>
+ : deref_impl<set_iterator_tag>
+ {};
+}}}
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/deref_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/deref_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,45 @@
+// 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_CONTAINER_SET_DETAIL_DEREF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_DEREF_IMPL_HPP
+
+#include <boost/fusion/sequence/intrinsic/at.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct deref_impl;
+
+ template <>
+ struct deref_impl<set_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+
+ typedef typename
+ result_of::at<
+ typename detail::forward_as<
+ typename it::seq_type
+ , typename detail::remove_reference<
+ typename it::seq_type
+ >::type::storage_type
+ >::type
+ , typename it::index
+ >::type
+ type;
+
+ static type
+ call(ItRef it_)
+ {
+ return at<typename it::index>(it_.seq->get_data());
+ }
+ };
+ };
+}}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/end_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -6,8 +6,6 @@
#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_END_IMPL_HPP
#define BOOST_FUSION_CONTAINER_SET_DETAIL_END_IMPL_HPP
-#include <boost/fusion/sequence/intrinsic/end.hpp>
-
namespace boost { namespace fusion { namespace extension
{
template <typename Tag>
@@ -19,21 +17,19 @@
template <typename SeqRef>
struct apply
{
- typedef typename
- result_of::end<
- typename detail::forward_as<
- SeqRef
- , typename detail::remove_reference<
- SeqRef
- >::type::storage_type
- >::type
- >::type
+ typedef
+ basic_iterator<
+ set_iterator_tag
+ , set_category
+ , SeqRef
+ , detail::remove_reference<SeqRef>::type::size::value
+ >
type;
static type
call(SeqRef seq)
{
- return fusion::end(seq.get_data());
+ return type(seq,0);
}
};
};
Added: sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/key_of_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/key_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,22 @@
+// 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_CONTAINER_SET_DETAIL_KEY_OF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_KEY_OF_IMPL_HPP
+
+#include <boost/fusion/container/set/detail/value_of_data_impl.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct key_of_impl;
+
+ template <>
+ struct key_of_impl<set_iterator_tag>
+ : value_of_impl<set_iterator_tag>
+ {};
+}}}
+
+#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/value_at_key_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/value_at_key_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,31 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
- Copyright (c) 2006 Dan Marsden
-
- 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_CONTAINER_SET_DETAIL_VALUE_AT_KEY_IMPL_HPP
-#define BOOST_FUSION_CONTAINER_SET_DETAIL_VALUE_AT_KEY_IMPL_HPP
-
-namespace boost { namespace fusion { namespace extension
-{
- template <typename Tag>
- struct value_at_key_impl;
-
- template <>
- struct value_at_key_impl<set_tag>
- {
- template <typename SeqRef, typename Key>
- struct apply
- {
- typedef typename
- detail::remove_reference<SeqRef>::type::
- template meta_at_impl<Key>::type
- type;
- };
- };
-}}}
-
-#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/value_of_data_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/value_of_data_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,22 @@
+// 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_CONTAINER_SET_DETAIL_VALUE_OF_DATA_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_VALUE_OF_DATA_IMPL_HPP
+
+#include <boost/fusion/container/set/detail/value_of_data_impl.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct value_of_data_impl;
+
+ template <>
+ struct value_of_data_impl<set_iterator_tag>
+ : value_of_impl<set_iterator_tag>
+ {};
+}}}
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/value_of_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/detail/value_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,36 @@
+// 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_CONTAINER_SET_DETAIL_VALUE_OF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_VALUE_OF_IMPL_HPP
+
+#include <boost/fusion/sequence/intrinsic/value_at.hpp>
+
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Tag>
+ struct value_of_impl;
+
+ template <>
+ struct value_of_impl<set_iterator_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ {
+ typedef typename detail::remove_reference<ItRef>::type it;
+
+ typedef typename
+ result_of::value_at<
+ typename detail::remove_reference<
+ typename it::seq_type
+ >::type::storage_type
+ , typename it::index
+ >::type
+ type;
+ };
+ };
+}}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/set/limits.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/set/limits.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/limits.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/fusion/container/vector/limits.hpp>
#if defined(BOOST_NO_VARIADIC_TEMPLATES) || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
-# if !defined(FUSION_MAX_SET_SIZE)
+# ifndef FUSION_MAX_SET_SIZE
# define FUSION_MAX_SET_SIZE FUSION_MAX_VECTOR_SIZE
# else
# if FUSION_MAX_SET_SIZE < 3
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -1,108 +1,47 @@
-/*=============================================================================
- Copyright (c) 2005 Joel de Guzman
-
- 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)
-==============================================================================*/
+// 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_CONTAINER_SET_SET_HPP
#define BOOST_FUSION_CONTAINER_SET_SET_HPP
#include <boost/fusion/container/set/set_fwd.hpp>
#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/support/category_of.hpp>
+#include <boost/fusion/iterator/basic_iterator.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/ref.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/contains.hpp>
-#include <boost/mpl/find.hpp>
-#include <boost/mpl/distance.hpp>
-#include <boost/mpl/begin.hpp>
#include <boost/mpl/bool.hpp>
-#include <boost/mpl/identity.hpp>
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# include <boost/fusion/container/set/detail/pp/lookup_key.hpp>
-#endif
#include <boost/fusion/container/set/detail/begin_impl.hpp>
#include <boost/fusion/container/set/detail/end_impl.hpp>
-#include <boost/fusion/container/set/detail/at_key_impl.hpp>
-#include <boost/fusion/container/set/detail/value_at_key_impl.hpp>
+#include <boost/fusion/container/set/detail/deref_impl.hpp>
+#include <boost/fusion/container/set/detail/value_of_impl.hpp>
+#include <boost/fusion/container/set/detail/value_of_data_impl.hpp>
+#include <boost/fusion/container/set/detail/deref_data_impl.hpp>
+#include <boost/fusion/container/set/detail/key_of_impl.hpp>
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# include <boost/fusion/container/detail/pp/forward_ctor.hpp>
-#endif
+#include <boost/fusion/container/detail/forward_ctor.hpp>
namespace boost { namespace fusion
{
struct fusion_sequence_tag;
-#ifndef BOOST_NO_VARIADIC_TEMPLATES
- struct void_;
-#endif
VARIADIC_TEMPLATE(FUSION_MAX_SET_SIZE)
struct set
: sequence_base<set<EXPAND_TEMPLATE_ARGUMENTS(FUSION_MAX_SET_SIZE)> >
{
- struct category : forward_traversal_tag, associative_sequence_tag {};
-
+ typedef set_category category;
typedef set_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
+ typedef fusion_sequence_tag tag;
typedef mpl::false_ is_view;
- typedef vector<EXPAND_TEMPLATE_ARGUMENTS(FUSION_MAX_SET_SIZE)> storage_type;
+ typedef
+ vector<EXPAND_TEMPLATE_ARGUMENTS(FUSION_MAX_SET_SIZE)>
+ storage_type;
typedef typename storage_type::size size;
- template <typename Key>
- struct meta_at_impl
- {
- typedef typename
- mpl::if_<
- typename mpl::contains<
- typename storage_type::types
- , Key
- >::type
- , Key
- , void_
- >::type
- type;
- };
-
- template <typename Key>
- struct meta_find_impl
- {
- typedef
- vector_iterator<
- storage_type&
- , mpl::distance<
- typename mpl::begin<typename storage_type::types>::type
- , typename mpl::find<
- typename storage_type::types
- , Key
- >::type
- >::value
- >
- type;
- };
-
- template <typename Key>
- struct meta_find_impl_const
- {
- typedef
- vector_iterator<
- storage_type const&
- , mpl::distance<
- typename mpl::begin<typename storage_type::types>::type
- , typename mpl::find<
- typename storage_type::types
- , Key
- >::type
- >::value
- >
- type;
- };
-
set()
{}
@@ -115,18 +54,11 @@
#undef SET_CTOR
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# define BOOST_FUSION_SEQ_NAME set
-# define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_SET_SIZE
-# include <boost/fusion/container/detail/pp/forward_ctor.hpp>
-# undef BOOST_FUSION_MAX_SEQ_SIZE
-# undef BOOST_FUSION_SEQ_NAME
-#else
- template <typename... OtherArguments>
- set(BOOST_FUSION_R_ELSE_CLREF(OtherArguments)... arguments)
- : data(BOOST_FUSION_FORWARD(OtherArguments,arguments)...)
- {}
-#endif
+#define BOOST_FUSION_SEQ_NAME set
+#define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_SET_SIZE
+#include <boost/fusion/container/detail/forward_ctor.hpp>
+#undef BOOST_FUSION_MAX_SEQ_SIZE
+#undef BOOST_FUSION_SEQ_NAME
template <typename Seq>
set&
@@ -136,40 +68,10 @@
return *this;
}
- template <typename Key>
- typename meta_find_impl_const<Key>::type
- find_impl(mpl::identity<Key>) const
- {
- return typename meta_find_impl_const<Key>::type(data,0);
- }
-
- template <typename Key>
- typename meta_find_impl<Key>::type
- find_impl(mpl::identity<Key>)
- {
- return typename meta_find_impl<Key>::type(data,0);
- }
-
- template <class Key>
- typename detail::add_lref<Key>::type
- at_impl(mpl::identity<Key>)
- {
- return data.at_impl(typename meta_find_impl<Key>::type::index());
- }
-
- template <class Key>
- typename detail::add_lref<typename add_const<Key>::type>::type
- at_impl(mpl::identity<Key>) const
- {
- return data.at_impl(
- typename meta_find_impl_const<Key>::type::index());
- }
-
storage_type& get_data() { return data; }
storage_type const& get_data() const { return data; }
private:
-
storage_type data;
};
}}
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,11 +9,17 @@
#define BOOST_FUSION_CONTAINER_SET_SET_FWD_HPP
#include <boost/fusion/container/set/limits.hpp>
+#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/support/template.hpp>
namespace boost { namespace fusion
{
struct set_tag;
+ struct set_iterator_tag;
+
+ struct set_category
+ : forward_traversal_tag, associative_sequence_tag
+ {};
VARIADIC_TEMPLATE_WITH_DEFAULT(FUSION_MAX_SET_SIZE)
struct set;
Deleted: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/advance_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/advance_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,39 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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_CONTAINER_VECTOR_DETAIL_ADVANCE_IMPL_HPP
-#define BOOST_FUSION_CONTAINER_VECTOR_DETAIL_ADVANCE_IMPL_HPP
-
-namespace boost { namespace fusion { namespace extension
-{
- template <typename Tag>
- struct advance_impl;
-
- template <>
- struct advance_impl<vector_iterator_tag>
- {
- template <typename ItRef, typename N>
- struct apply
- {
- typedef typename
- detail::remove_reference<ItRef>::type
- it;
-
- typedef
- vector_iterator<typename it::vector, it::index::value+N::value>
- type;
-
- static type
- call(ItRef it)
- {
- return type(*it.vec,0);
- }
- };
- };
-}}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/begin_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -19,7 +19,14 @@
template <typename SeqRef>
struct apply
{
- typedef vector_iterator<SeqRef, 0> type;
+ typedef
+ basic_iterator<
+ vector_iterator_tag
+ , random_access_traversal_tag
+ , SeqRef
+ , 0
+ >
+ type;
static type
call(SeqRef seq)
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/deref_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/deref_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/deref_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -22,7 +22,7 @@
struct apply
{
typedef typename detail::remove_reference<ItRef>::type it;
- typedef typename it::vector vector;
+ typedef typename it::seq_type vector;
typedef
typename detail::forward_as<
@@ -39,7 +39,7 @@
static type
call(ItRef it)
{
- return it.vec->at_impl(typename it::index());
+ return it.seq->at_impl(typename it::index());
}
};
};
Deleted: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/distance_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/distance_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,34 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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_CONTAINER_VECTOR_DETAIL_DISTANCE_IMPL_HPP
-#define BOOST_FUSION_CONTAINER_VECTOR_DETAIL_DISTANCE_IMPL_HPP
-
-#include <boost/mpl/minus.hpp>
-
-namespace boost { namespace fusion { namespace extension
-{
- template <typename Tag>
- struct distance_impl;
-
- template <>
- struct distance_impl<vector_iterator_tag>
- {
- template <typename First, typename Last>
- struct apply
- {
- typedef typename
- mpl::minus<
- typename detail::remove_reference<Last>::type::index
- , typename detail::remove_reference<First>::type::index
- >::type
- type;
- };
- };
-}}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/end_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -20,8 +20,10 @@
struct apply
{
typedef
- vector_iterator<
- SeqRef
+ basic_iterator<
+ vector_iterator_tag
+ , random_access_traversal_tag
+ , SeqRef
, detail::remove_reference<SeqRef>::type::size::value
>
type;
Deleted: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/equal_to_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/equal_to_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,53 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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_CONTAINER_VECTOR_DETAIL_EQUAL_TO_IMPL_HPP
-#define BOOST_FUSION_CONTAINER_VECTOR_DETAIL_EQUAL_TO_IMPL_HPP
-
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/equal_to.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-namespace boost { namespace fusion
-{
- namespace detail
- {
- template <typename It1, typename It2>
- struct vector_types_equal
- : is_same<
- typename detail::identity<typename It1::vector>::type
- , typename detail::identity<typename It2::vector>::type
- >
- {};
- }
-
- namespace extension
- {
- template <typename Tag>
- struct equal_to_impl;
-
- template <>
- struct equal_to_impl<vector_iterator_tag>
- {
- template <typename It1Ref, typename It2Ref>
- struct apply
- {
- typedef typename detail::remove_reference<It1Ref>::type it1;
- typedef typename detail::remove_reference<It2Ref>::type it2;
-
- typedef
- mpl::and_<
- mpl::equal_to<typename it1::index, typename it2::index>
- , detail::vector_types_equal<it1,it2>
- >
- type;
- };
- };
- }
-}}
-
-#endif
Deleted: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/next_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/next_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,40 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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_CONTAINER_VECTOR_DETAIL_NEXT_IMPL_HPP
-#define BOOST_FUSION_CONTAINER_VECTOR_DETAIL_NEXT_IMPL_HPP
-
-namespace boost { namespace fusion { namespace extension
-{
- template <typename Tag>
- struct next_impl;
-
- template <>
- struct next_impl<vector_iterator_tag>
- {
- template <typename ItRef>
- struct apply
- {
- typedef typename detail::remove_reference<ItRef>::type it;
-
- typedef
- vector_iterator<
- typename it::vector
- , it::index::value+1
- >
- type;
-
- static type
- call(ItRef it)
- {
- return type(*it.vec,0);
- }
- };
- };
-}}}
-
-#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -7,14 +7,13 @@
#define BOOST_FUSION_CONTAINER_VECTOR_DETAIL_PP_VECTOR_HPP
#include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/container/vector/detail/vector_iterator.hpp>
#include <boost/fusion/container/vector/detail/pp/vector_n_chooser.hpp>
#include <boost/mpl/at.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/type_traits/add_const.hpp>
-#include <boost/fusion/container/detail/pp/forward_ctor.hpp>
+#include <boost/fusion/container/detail/forward_ctor.hpp>
namespace boost { namespace fusion
{
@@ -53,7 +52,7 @@
#define BOOST_FUSION_SEQ_NAME vector
#define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_VECTOR_SIZE
- #include <boost/fusion/container/detail/pp/forward_ctor.hpp>
+#include <boost/fusion/container/detail/forward_ctor.hpp>
#undef BOOST_FUSION_MAX_SEQ_SIZE
#undef BOOST_FUSION_SEQ_NAME
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -6,6 +6,7 @@
#ifndef BOOST_PP_IS_ITERATING
# include <boost/fusion/container/vector/vector_fwd.hpp>
# include <boost/fusion/sequence/intrinsic/begin.hpp>
+# include <boost/fusion/iterator/basic_iterator.hpp>
# include <boost/fusion/iterator/deref.hpp>
# include <boost/fusion/iterator/next.hpp>
# include <boost/fusion/iterator/advance_c.hpp>
@@ -35,7 +36,6 @@
# include <boost/fusion/container/vector/detail/at_impl.hpp>
# include <boost/fusion/container/vector/detail/value_at_impl.hpp>
-# include <boost/fusion/container/vector/detail/vector_iterator.hpp>
# include <boost/fusion/container/vector/detail/begin_impl.hpp>
# include <boost/fusion/container/vector/detail/end_impl.hpp>
# include <boost/fusion/container/vector/detail/deref_impl.hpp>
@@ -58,7 +58,7 @@
# if !N
struct void_;
- template <class T0=void_>
+ template <typename T0=void_>
struct vector0;
template<>
@@ -72,7 +72,7 @@
{
typedef mpl::BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, T)> types;
typedef vector_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
+ typedef fusion_sequence_tag tag;
typedef mpl::false_ is_view;
typedef random_access_traversal_tag category;
typedef mpl::int_<N> size;
Deleted: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/prior_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/prior_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,42 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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_CONTAINER_VECTOR_DETAIL_PRIOR_IMPL_HPP
-#define BOOST_FUSION_CONTAINER_VECTOR_DETAIL_PRIOR_IMPL_HPP
-
-namespace boost { namespace fusion { namespace extension
-{
- template <typename Tag>
- struct prior_impl;
-
- template <>
- struct prior_impl<vector_iterator_tag>
- {
- template <typename ItRef>
- struct apply
- {
- typedef typename
- detail::remove_reference<ItRef>::type
- it;
-
- typedef
- vector_iterator<
- typename it::vector
- , it::index::value-1
- >
- type;
-
- static type
- call(ItRef it)
- {
- return type(*it.vec,0);
- }
- };
- };
-}}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/value_of_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/value_of_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/value_of_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -21,16 +21,13 @@
template <typename ItRef>
struct apply
{
- typedef typename
- detail::remove_reference<ItRef>::type
- it;
- typedef typename
- it::vector
- vector;
+ typedef typename detail::remove_reference<ItRef>::type it;
typedef typename
mpl::at<
- typename detail::remove_reference<vector>::type::types
+ typename detail::remove_reference<
+ typename it::seq_type
+ >::type::types
, typename it::index
>::type
type;
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -25,7 +25,7 @@
# if !N
struct void_;
- template <class T0=void_>
+ template <typename T0=void_>
struct vector0;
template<>
Deleted: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/vector_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/vector_iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,51 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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_CONTAINER_VECTOR_DETAIL_VECTOR_ITERATOR_HPP
-#define BOOST_FUSION_CONTAINER_VECTOR_DETAIL_VECTOR_ITERATOR_HPP
-
-#include <boost/fusion/support/iterator_base.hpp>
-#include <boost/type_traits/remove_const.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/mpl/int.hpp>
-
-namespace boost { namespace fusion
-{
- struct vector_iterator_tag;
- struct random_access_traversal_tag;
-
- template <typename VecRef, int Pos>
- struct vector_iterator
- : iterator_base<vector_iterator<VecRef, Pos> >
- {
- typedef mpl::int_<Pos> index;
- typedef VecRef vector;
- typedef vector_iterator_tag fusion_tag;
- typedef random_access_traversal_tag category;
-
- template<typename OtherIt>
- vector_iterator(OtherIt const& it)
- : vec(it.vec)
- {}
-
- vector_iterator(VecRef vec, int)
- : vec(&vec)
- {}
-
- template<typename OtherIt>
- vector_iterator&
- operator=(OtherIt const& it)
- {
- vec=it.vec;
- return *this;
- }
-
- typename detail::remove_reference<VecRef>::type* vec;
- };
-}}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/limits.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/limits.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/limits.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,14 +11,14 @@
#include <boost/config.hpp>
#if defined(BOOST_NO_VARIADIC_TEMPLATES) || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
-# if !defined(FUSION_MAX_VECTOR_SIZE)
-# define FUSION_MAX_VECTOR_SIZE 10
-# else
-# if FUSION_MAX_VECTOR_SIZE < 3
-# undef FUSION_MAX_VECTOR_SIZE
-# define FUSION_MAX_VECTOR_SIZE 10
-# endif
-# endif
+# ifndef FUSION_MAX_VECTOR_SIZE
+# define FUSION_MAX_VECTOR_SIZE 10
+# else
+# if FUSION_MAX_VECTOR_SIZE < 3
+# undef FUSION_MAX_VECTOR_SIZE
+# define FUSION_MAX_VECTOR_SIZE 10
+# endif
+# endif
#endif
#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -12,12 +12,11 @@
# include <boost/fusion/container/vector/detail/pp/vector.hpp>
#else
# include <boost/fusion/container/vector/vector_fwd.hpp>
+# include <boost/fusion/iterator/basic_iterator.hpp>
# include <boost/fusion/support/ref.hpp>
# include <boost/fusion/container/vector/detail/at_impl.hpp>
# include <boost/fusion/container/vector/detail/value_at_impl.hpp>
-
-# include <boost/fusion/container/vector/detail/vector_iterator.hpp>
# include <boost/fusion/container/vector/detail/begin_impl.hpp>
# include <boost/fusion/container/vector/detail/end_impl.hpp>
# include <boost/fusion/container/vector/detail/deref_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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -15,6 +15,8 @@
namespace boost { namespace fusion
{
struct vector_tag;
+ struct vector_iterator_tag;
+ struct random_access_traversal_tag;
VARIADIC_TEMPLATE_WITH_DEFAULT(FUSION_MAX_VECTOR_SIZE)
struct vector;
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -7,11 +7,11 @@
#define BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_HPP
#include <boost/config.hpp>
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES)
-# include <boost/fusion/functional/adapter/detail/no_decltype_or_variadic_templates/fused.hpp>
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES)
+# include <boost/fusion/functional/adapter/detail/no_0x/fused.hpp>
#else
# define BOOST_FUSION_ADAPTER_NAME fused
-# include <boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/fused_impl.hpp>
+# include <boost/fusion/functional/adapter/detail/0x/fused_impl.hpp>
# undef BOOST_FUSION_ADAPTER_NAME
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused_function_object.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused_function_object.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused_function_object.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -7,11 +7,11 @@
#define BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_FUNCTION_OBJECT_HPP
#include <boost/config.hpp>
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES)
-# include <boost/fusion/functional/adapter/detail/no_decltype_or_variadic_templates/fused_function_object.hpp>
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES)
+# include <boost/fusion/functional/adapter/detail/no_0x/fused_function_object.hpp>
#elif !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
# define BOOST_FUSION_ADAPTER_NAME fused_function_object
-# include <boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/fused_impl.hpp>
+# include <boost/fusion/functional/adapter/detail/0x/fused_impl.hpp>
# undef BOOST_FUSION_ADAPTER_NAME
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused_procedure.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused_procedure.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/fused_procedure.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -7,11 +7,11 @@
#define BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_PROCEDURE_HPP
#include <boost/config.hpp>
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES)
-# include <boost/fusion/functional/adapter/detail/no_decltype_or_variadic_templates/fused_procedure.hpp>
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES)
+# include <boost/fusion/functional/adapter/detail/no_0x/fused_procedure.hpp>
#elif !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
# define BOOST_FUSION_ADAPTER_NAME fused_procedure
-# include <boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/fused_impl.hpp>
+# include <boost/fusion/functional/adapter/detail/0x/fused_impl.hpp>
# undef BOOST_FUSION_ADAPTER_NAME
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/limits.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/limits.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/limits.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/config.hpp>
-#if defined(BOOST_NO_VARIADIC_TEMPLATES) || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES) || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
# include <boost/fusion/container/vector/limits.hpp>
# ifndef BOOST_FUSION_UNFUSED_MAX_ARITY
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -7,10 +7,10 @@
#define BOOST_FUSION_FUNCTIONAL_ADAPTER_UNFUSED_HPP
#include <boost/config.hpp>
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES)// || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
-# include <boost/fusion/functional/adapter/detail/no_decltype_or_variadic_templates/unfused.hpp>
-#else
-# include <boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/unfused_impl.hpp>
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES)
+# include <boost/fusion/functional/adapter/detail/no_0x/unfused.hpp>
+#elif !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
+# include <boost/fusion/functional/adapter/detail/0x/unfused_impl.hpp>
#endif
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused_typed.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused_typed.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused_typed.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -7,11 +7,11 @@
#define BOOST_FUSION_FUNCTIONAL_ADAPTER_UNFUSED_TYPED_HPP
#include <boost/config.hpp>
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES)// || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
-# include <boost/fusion/functional/adapter/detail/no_decltype_or_variadic_templates/unfused_typed.hpp>
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES)
+# include <boost/fusion/functional/adapter/detail/no_0x/unfused_typed.hpp>
#else
# define BOOST_FUSION_TYPED
-# include <boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/unfused_impl.hpp>
+# include <boost/fusion/functional/adapter/detail/0x/unfused_impl.hpp>
# undef BOOST_FUSION_TYPED
#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -22,7 +22,7 @@
{
typedef
BOOST_FUSION_CLASS_TPL_NAME<
- typename fusion::detail::as_fusion_element<F>::type
+ typename detail::as_fusion_element<F>::type
>
type;
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/detail/that_ptr.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/detail/that_ptr.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/detail/that_ptr.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -24,14 +24,14 @@
template<typename T>
static inline wanted
- do_get_pointer(BOOST_FUSION_R_ELSE_CLREF(T), wanted ptr)
+ do_get_pointer(BOOST_FUSION_R_ELSE_LREF(T), wanted ptr)
{
return ptr;
}
template<typename T>
static inline wanted
- do_get_pointer(BOOST_FUSION_R_ELSE_CLREF(T) t, void const*)
+ do_get_pointer(BOOST_FUSION_R_ELSE_LREF(T) t, void const*)
{
return get_pointer(BOOST_FUSION_FORWARD(T,t));
}
@@ -51,7 +51,7 @@
template <typename T>
static inline wanted
- get(BOOST_FUSION_R_ELSE_CLREF(T) t)
+ get(BOOST_FUSION_R_ELSE_LREF(T) t)
{
return do_get_pointer(
BOOST_FUSION_FORWARD(T,t),
@@ -59,7 +59,8 @@
}
};
- /*template <typename PtrOrSmartPtr>
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES)
+ template <typename PtrOrSmartPtr>
struct non_const_pointee;
namespace adl_barrier
@@ -87,7 +88,8 @@
{
typedef non_const_pointee type;
typedef bool value_type;
- };*/
+ };
+#endif
}}}
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -7,11 +7,11 @@
#define BOOST_FUSION_FUNCTIONAL_INVOCATION_INVOKE_HPP
#include <boost/config.hpp>
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES)
-# include <boost/fusion/functional/invocation/detail/no_decltype_or_variadic_templates/invoke.hpp>
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES)
+# include <boost/fusion/functional/invocation/detail/no_0x/invoke.hpp>
#else
# define BOOST_FUSION_INVOKE_NAME invoke
-# include <boost/fusion/functional/invocation/detail/decltype_and_variadic_templates/invoke_impl.hpp>
+# include <boost/fusion/functional/invocation/detail/0x/invoke_impl.hpp>
# undef BOOST_FUSION_INVOKE_NAME
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke_function_object.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke_function_object.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke_function_object.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -7,11 +7,11 @@
#define BOOST_FUSION_FUNCTIONAL_INVOCATION_INVOKE_FUNCTION_OBJECT_HPP
#include <boost/config.hpp>
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES)
-# include <boost/fusion/functional/invocation/detail/no_decltype_or_variadic_templates/invoke_function_object.hpp>
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES)
+# include <boost/fusion/functional/invocation/detail/no_0x/invoke_function_object.hpp>
#elif !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
# define BOOST_FUSION_INVOKE_NAME invoke_function_object
-# include <boost/fusion/functional/invocation/detail/decltype_and_variadic_templates/invoke_impl.hpp>
+# include <boost/fusion/functional/invocation/detail/0x/invoke_impl.hpp>
# undef BOOST_FUSION_INVOKE_NAME
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke_procedure.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke_procedure.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/invoke_procedure.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -7,11 +7,11 @@
#define BOOST_FUSION_FUNCTIONAL_INVOCATION_INVOKE_PROCEDURE_HPP
#include <boost/config.hpp>
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES)
-# include <boost/fusion/functional/invocation/detail/no_decltype_or_variadic_templates/invoke_procedure.hpp>
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES)
+# include <boost/fusion/functional/invocation/detail/no_0x/invoke_procedure.hpp>
#elif !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
# define BOOST_FUSION_INVOKE_NAME invoke_procedure
-# include <boost/fusion/functional/invocation/detail/decltype_and_variadic_templates/invoke_impl.hpp>
+# include <boost/fusion/functional/invocation/detail/0x/invoke_impl.hpp>
# undef BOOST_FUSION_INVOKE_NAME
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/limits.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/limits.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/invocation/limits.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,7 +11,7 @@
#include <boost/config.hpp>
-#if defined(BOOST_NO_VARIADIC_TEMPLATES) || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
+#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_RVALUE_REFERENCES) || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
# ifndef BOOST_FUSION_INVOKE_MAX_ARITY
# define BOOST_FUSION_INVOKE_MAX_ARITY 6
# endif
Added: sandbox/SOC/2009/fusion/boost/fusion/include/boost_array.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/include/boost_array.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,11 @@
+// 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_INCLUDE_BOOST_ARRAY_HPP
+#define BOOST_FUSION_INCLUDE_BOOST_ARRAY_HPP
+
+#include <boost/fusion/adapted/boost_array.hpp>
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/include/deref_data.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/include/deref_data.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,11 @@
+// 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_INCLUDE_DEREF_DATA_HPP
+#define BOOST_FUSION_INCLUDE_DEREF_DATA_HPP
+
+#include <boost/fusion/iterator/deref_data.hpp>
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/include/find_key.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/include/find_key.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,11 @@
+// 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_INCLUDE_FIND_KEY_HPP
+#define BOOST_FUSION_INCLUDE_FIND_KEY_HPP
+
+#include <boost/fusion/algorithm/query/find_key.hpp>
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/include/key_of.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/include/key_of.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,11 @@
+// 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_INCLUDE_KEY_OF_HPP
+#define BOOST_FUSION_INCLUDE_KEY_OF_HPP
+
+#include <boost/fusion/iterator/key_of.hpp>
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/include/std_array.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/include/std_array.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,11 @@
+// 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_INCLUDE_STD_ARRAY_HPP
+#define BOOST_FUSION_INCLUDE_STD_ARRAY_HPP
+
+#include <boost/fusion/adapted/std_array.hpp>
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/include/value_of_data.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/include/value_of_data.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,11 @@
+// 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_INCLUDE_VALUE_OF_DATA_HPP
+#define BOOST_FUSION_INCLUDE_VALUE_OF_DATA_HPP
+
+#include <boost/fusion/iterator/value_of_data.hpp>
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,6 +9,7 @@
#define BOOST_FUSION_ITERATOR_HPP
#include <boost/fusion/iterator/iterator_facade.hpp>
+#include <boost/fusion/iterator/basic_iterator.hpp>
#include <boost/fusion/iterator/advance.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/distance.hpp>
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,9 +9,7 @@
#define BOOST_FUSION_ITERATOR_ADVANCE_HPP
#include <boost/fusion/iterator/detail/advance.hpp>
-#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/support/assert.hpp>
-
#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace fusion
Added: sandbox/SOC/2009/fusion/boost/fusion/iterator/basic_iterator.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/basic_iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,152 @@
+// 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_ITERATOR_BASIC_ITERATOR_HPP
+#define BOOST_FUSION_ITERATOR_BASIC_ITERATOR_HPP
+
+#include <boost/fusion/iterator/iterator_facade.hpp>
+#include <boost/fusion/support/ref.hpp>
+
+#include <boost/mpl/and.hpp>
+#include <boost/mpl/equal_to.hpp>
+#include <boost/mpl/minus.hpp>
+#include <boost/mpl/int.hpp>
+#include <boost/type_traits/is_same.hpp>
+
+namespace boost { namespace fusion
+{
+ namespace extension
+ {
+ template <typename Tag>
+ struct value_of_impl;
+
+ template <typename Tag>
+ struct deref_impl;
+
+ template <typename Tag>
+ struct value_of_data_impl;
+
+ template <typename Tag>
+ struct key_of_impl;
+
+ template <typename Tag>
+ struct deref_data_impl;
+ }
+
+ template<
+ typename Tag
+ , typename Category
+ , typename SeqRef
+ , int Pos
+ >
+ struct basic_iterator
+ : iterator_facade<
+ basic_iterator<Tag,Category,SeqRef,Pos>
+ , Category
+ >
+ {
+ typedef mpl::int_<Pos> index;
+ typedef SeqRef seq_type;
+
+ template <typename ItRef>
+ struct value_of
+ : extension::value_of_impl<Tag>::template apply<ItRef>
+ {};
+
+ template <typename ItRef>
+ struct deref
+ : extension::deref_impl<Tag>::template apply<ItRef>
+ {};
+
+ template <typename ItRef>
+ struct value_of_data
+ : extension::value_of_data_impl<Tag>::template apply<ItRef>
+ {};
+
+ template <typename ItRef>
+ struct key_of
+ : extension::key_of_impl<Tag>::template apply<ItRef>
+ {};
+
+ template <typename ItRef>
+ struct deref_data
+ : extension::deref_data_impl<Tag>::template apply<ItRef>
+ {};
+
+ template <typename ItRef, typename N>
+ struct advance
+ {
+ typedef
+ basic_iterator<
+ Tag
+ , Category
+ , SeqRef
+ , Pos + N::value
+ >
+ type;
+
+ static type
+ call(ItRef it)
+ {
+ return type(*it.seq,0);
+ }
+ };
+
+ template <typename ItRef>
+ struct next
+ : advance<ItRef, mpl::int_<1> >
+ {};
+
+ template <typename ItRef>
+ struct prior
+ : advance<ItRef, mpl::int_<-1> >
+ {};
+
+ template <typename It1Ref, typename It2Ref>
+ struct distance
+ : mpl::minus<
+ typename detail::remove_reference<It2Ref>::type::index
+ , typename detail::remove_reference<It1Ref>::type::index
+ >
+ {};
+
+ template <typename It1Ref, typename It2Ref>
+ struct equal_to
+ {
+ typedef typename detail::remove_reference<It2Ref>::type it2;
+
+ typedef
+ mpl::and_<
+ is_same<
+ typename detail::identity<SeqRef>::type
+ , typename detail::identity<typename it2::seq_type>::type
+ >
+ , mpl::equal_to<index,typename it2::index>
+ >
+ type;
+ };
+
+ template<typename OtherIt>
+ basic_iterator(OtherIt const& it)
+ : seq(it.seq)
+ {}
+
+ basic_iterator(SeqRef seq, int)
+ : seq(&seq)
+ {}
+
+ template<typename OtherIt>
+ basic_iterator&
+ operator=(OtherIt const& it)
+ {
+ seq=it.seq;
+ return *this;
+ }
+
+ typename detail::remove_reference<SeqRef>::type* seq;
+ };
+}}
+
+#endif
Added: sandbox/SOC/2009/fusion/boost/fusion/iterator/deref_data.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/deref_data.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,51 @@
+/*=============================================================================
+ Copyright (c) 2001-2006 Joel de Guzman
+
+ 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_ITERATOR_DEREF_DATA_HPP
+#define BOOST_FUSION_ITERATOR_DEREF_DATA_HPP
+
+#include <boost/fusion/support/ref.hpp>
+#include <boost/fusion/support/tag_of.hpp>
+
+namespace boost { namespace fusion
+{
+ struct iterator_facade_tag;
+
+ namespace extension
+ {
+ template <typename Tag>
+ struct deref_data_impl;
+
+ template <>
+ struct deref_data_impl<iterator_facade_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ : detail::remove_reference<ItRef>::type::
+ template deref_data<ItRef>
+ {};
+ };
+ }
+
+ namespace result_of
+ {
+ template <typename It>
+ struct deref_data
+ : extension::deref_data_impl<typename traits::tag_of<It>::type>::
+ template apply<typename detail::add_lref<It>::type>
+ {};
+ }
+
+ template <typename It>
+ typename result_of::deref_data<It const&>::type
+ deref_data(It const& it)
+ {
+ return result_of::deref_data<It const&>::call(it);
+ }
+}}
+
+#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,9 +9,7 @@
#define BOOST_FUSION_ITERATOR_DISTANCE_HPP
#include <boost/fusion/iterator/detail/distance.hpp>
-#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/support/assert.hpp>
-
#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace fusion
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -1,9 +1,7 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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)
-==============================================================================*/
+// 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_ITERATOR_ITERATOR_FACADE_HPP
#define BOOST_FUSION_ITERATOR_ITERATOR_FACADE_HPP
@@ -11,15 +9,20 @@
#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/category_of.hpp>
#include <boost/fusion/support/assert.hpp>
-
-#include <boost/type_traits/is_same.hpp>
+#include <boost/fusion/support/dummy_tag.hpp>
namespace boost { namespace fusion
{
+ struct void_;
struct iterator_facade_tag;
+ namespace extension
+ {
+ template<typename Tag>
+ struct advance_impl;
+ }
+
template <typename Derived, typename Category>
struct iterator_facade
: iterator_base<Derived>
@@ -28,28 +31,15 @@
typedef Derived derived_type;
typedef Category category;
- // default implementation
- template <typename It1Ref, typename It2Ref>
- struct equal_to // default implementation
- : is_same<
- typename detail::remove_reference<It1Ref>::type::derived_type
- , typename detail::remove_reference<It2Ref>::type::derived_type
- >
- {};
+ //TODO doc
// default implementation
template <typename ItRef, typename N>
struct advance
- : mpl::if_c<
- (N::value > 0)
- , advance_detail::forward<ItRef, N::value>
- , advance_detail::backward<ItRef, N::value>
- >::type
- {
- // BOOST_FUSION_MPL_ASSERT_NOT(
- // traits::is_random_access<Iterator>,
- // "default implementation not available for random access iterators");
- };
+ : extension::advance_impl<
+ typename detail::get_dummy_tag<ItRef>::type
+ >::template apply<ItRef,N>
+ {};
};
}}
Added: sandbox/SOC/2009/fusion/boost/fusion/iterator/key_of.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/key_of.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,43 @@
+/*=============================================================================
+ Copyright (c) 2001-2006 Joel de Guzman
+
+ 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_ITERATOR_KEY_OF_HPP
+#define BOOST_FUSION_ITERATOR_KEY_OF_HPP
+
+#include <boost/fusion/support/tag_of.hpp>
+
+namespace boost { namespace fusion
+{
+ struct iterator_facade_tag;
+
+ namespace extension
+ {
+ template <typename Tag>
+ struct key_of_impl;
+
+ template <>
+ struct key_of_impl<iterator_facade_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ : detail::remove_reference<ItRef>::type::
+ template key_of<ItRef>
+ {};
+ };
+ }
+
+ namespace result_of
+ {
+ template <typename It>
+ struct key_of
+ : extension::key_of_impl<typename traits::tag_of<It>::type>::
+ template apply<typename detail::add_lref<It>::type>
+ {};
+ }
+}}
+
+#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,7 +8,6 @@
#ifndef BOOST_FUSION_ITERATOR_VALUE_OF_HPP
#define BOOST_FUSION_ITERATOR_VALUE_OF_HPP
-#include <boost/fusion/support/iterator_base.hpp>
#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace fusion
Added: sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of_data.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/value_of_data.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,43 @@
+/*=============================================================================
+ Copyright (c) 2001-2006 Joel de Guzman
+
+ 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_ITERATOR_VALUE_OF_DATA_HPP
+#define BOOST_FUSION_ITERATOR_VALUE_OF_DATA_HPP
+
+#include <boost/fusion/support/tag_of.hpp>
+
+namespace boost { namespace fusion
+{
+ struct iterator_facade_tag;
+
+ namespace extension
+ {
+ template <typename Tag>
+ struct value_of_data_impl;
+
+ template <>
+ struct value_of_data_impl<iterator_facade_tag>
+ {
+ template <typename ItRef>
+ struct apply
+ : detail::remove_reference<ItRef>::type::
+ template value_of_data<ItRef>
+ {};
+ };
+ }
+
+ namespace result_of
+ {
+ template <typename It>
+ struct value_of_data
+ : extension::value_of_data_impl<typename traits::tag_of<It>::type>::
+ template apply<typename detail::add_lref<It>::type>
+ {};
+ }
+}}
+
+#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/back.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/back.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/back.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_MPL_BACK_HPP
#define BOOST_FUSION_MPL_BACK_HPP
-#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/iterator/prior.hpp>
#include <boost/fusion/iterator/value_of.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
namespace boost { namespace mpl
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/begin.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/begin.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/begin.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,8 +8,8 @@
#ifndef BOOST_FUSION_MPL_BEGIN_HPP
#define BOOST_FUSION_MPL_BEGIN_HPP
-#include <boost/fusion/mpl/fusion_iterator.hpp>
#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/mpl/fusion_iterator.hpp>
namespace boost { namespace mpl
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/clear.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/clear.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/clear.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,8 +8,8 @@
#ifndef BOOST_FUSION_MPL_CLEAR_HPP
#define BOOST_FUSION_MPL_CLEAR_HPP
-#include <boost/fusion/support/tag_of.hpp>
#include <boost/fusion/algorithm/transformation/clear.hpp>
+#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace mpl
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/end.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/end.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/end.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,8 +8,8 @@
#ifndef BOOST_FUSION_MPL_END_HPP
#define BOOST_FUSION_MPL_END_HPP
-#include <boost/fusion/mpl/fusion_iterator.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/mpl/fusion_iterator.hpp>
namespace boost { namespace mpl
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/erase.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/erase.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/erase.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_MPL_ERASE_HPP
#define BOOST_FUSION_MPL_ERASE_HPP
-#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/algorithm/transformation/erase.hpp>
#include <boost/fusion/sequence/convert.hpp>
+#include <boost/fusion/algorithm/transformation/erase.hpp>
+#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace mpl
{
@@ -24,12 +24,9 @@
struct apply
{
typedef typename
- fusion::result_of::erase<Seq, First, Last>::type
- result;
-
- typedef typename
fusion::result_of::convert<
- typename fusion::traits::tag_of<Seq>::type, result
+ typename fusion::traits::tag_of<Seq>::type
+ , typename fusion::result_of::erase<Seq, First, Last>::type
>::type
type;
};
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -14,6 +14,7 @@
#include <boost/fusion/iterator/advance.hpp>
#include <boost/fusion/iterator/distance.hpp>
#include <boost/fusion/support/category_of.hpp>
+
#include <boost/mpl/next_prior.hpp>
#include <boost/mpl/advance_fwd.hpp>
#include <boost/mpl/distance_fwd.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/insert.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/insert.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/insert.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_MPL_INSERT_HPP
#define BOOST_FUSION_MPL_INSERT_HPP
-#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/algorithm/transformation/insert.hpp>
#include <boost/fusion/sequence/convert.hpp>
+#include <boost/fusion/algorithm/transformation/insert.hpp>
+#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace mpl
{
@@ -24,12 +24,9 @@
struct apply
{
typedef typename
- fusion::result_of::insert<Seq, Pos, T>::type
- result;
-
- typedef typename
fusion::result_of::convert<
- typename fusion::traits::tag_of<Seq>::type, result
+ typename fusion::traits::tag_of<Seq>::type
+ , typename fusion::result_of::insert<Seq, Pos, T>::type
>::type
type;
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/insert_range.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/insert_range.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/insert_range.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_MPL_INSERT_RANGE_HPP
#define BOOST_FUSION_MPL_INSERT_RANGE_HPP
-#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/algorithm/transformation/insert_range.hpp>
#include <boost/fusion/sequence/convert.hpp>
+#include <boost/fusion/algorithm/transformation/insert_range.hpp>
+#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace mpl
{
@@ -24,12 +24,9 @@
struct apply
{
typedef typename
- fusion::result_of::insert_range<Seq, Pos, Range>::type
- result;
-
- typedef typename
fusion::result_of::convert<
- typename fusion::traits::tag_of<Seq>::type, result
+ typename fusion::traits::tag_of<Seq>::type
+ , typename fusion::result_of::insert_range<Seq, Pos, Range>::type
>::type
type;
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/pop_back.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/pop_back.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/pop_back.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_MPL_POP_BACK_HPP
#define BOOST_FUSION_MPL_POP_BACK_HPP
-#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/algorithm/transformation/pop_back.hpp>
#include <boost/fusion/sequence/convert.hpp>
+#include <boost/fusion/algorithm/transformation/pop_back.hpp>
+#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace mpl
{
@@ -24,12 +24,9 @@
struct apply
{
typedef typename
- fusion::result_of::pop_back<Seq>::type
- result;
-
- typedef typename
fusion::result_of::convert<
- typename fusion::traits::tag_of<Seq>::type, result
+ typename fusion::traits::tag_of<Seq>::type
+ , typename fusion::result_of::pop_back<Seq>::type
>::type
type;
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/pop_front.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/pop_front.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/pop_front.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_MPL_POP_FRONT_HPP
#define BOOST_FUSION_MPL_POP_FRONT_HPP
-#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/algorithm/transformation/pop_front.hpp>
#include <boost/fusion/sequence/convert.hpp>
+#include <boost/fusion/algorithm/transformation/pop_front.hpp>
+#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace mpl
{
@@ -24,12 +24,9 @@
struct apply
{
typedef typename
- fusion::result_of::pop_front<Seq>::type
- result;
-
- typedef typename
fusion::result_of::convert<
- typename fusion::traits::tag_of<Seq>::type, result
+ typename fusion::traits::tag_of<Seq>::type
+ , typename fusion::result_of::pop_front<Seq>::type
>::type
type;
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/push_back.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/push_back.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/push_back.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_MPL_PUSH_BACK_HPP
#define BOOST_FUSION_MPL_PUSH_BACK_HPP
-#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/algorithm/transformation/push_back.hpp>
#include <boost/fusion/sequence/convert.hpp>
+#include <boost/fusion/algorithm/transformation/push_back.hpp>
+#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace mpl
{
@@ -24,12 +24,9 @@
struct apply
{
typedef typename
- fusion::result_of::push_back<Seq, T>::type
- result;
-
- typedef typename
fusion::result_of::convert<
- typename fusion::traits::tag_of<Seq>::type, result
+ typename fusion::traits::tag_of<Seq>::type
+ , typename fusion::result_of::push_back<Seq, T>::type
>::type
type;
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/mpl/push_front.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/mpl/push_front.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/mpl/push_front.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,9 +8,9 @@
#ifndef BOOST_FUSION_MPL_PUSH_FRONT_HPP
#define BOOST_FUSION_MPL_PUSH_FRONT_HPP
-#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/algorithm/transformation/push_front.hpp>
#include <boost/fusion/sequence/convert.hpp>
+#include <boost/fusion/algorithm/transformation/push_front.hpp>
+#include <boost/fusion/support/tag_of.hpp>
namespace boost { namespace mpl
{
@@ -24,12 +24,9 @@
struct apply
{
typedef typename
- fusion::result_of::push_front<Seq, T>::type
- result;
-
- typedef typename
fusion::result_of::convert<
- typename fusion::traits::tag_of<Seq>::type, result
+ typename fusion::traits::tag_of<Seq>::type
+ , typename fusion::result_of::push_front<Seq, T>::type
>::type
type;
};
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -25,7 +25,6 @@
inline bool
less_equal(Seq1 const& seq1, Seq2 const& seq2)
{
- //TODO TEST!
#ifdef FUSION_DIRECT_OPERATOR_USAGE
return
detail::sequence_less_equal<
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -12,7 +12,11 @@
#include <boost/fusion/support/ref.hpp>
#include <boost/mpl/int.hpp>
-#include <boost/type_traits/is_const.hpp>
+
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+# include <boost/type_traits/is_const.hpp>
+# include <boost/utility/enable_if.hpp>
+#endif
namespace boost { namespace fusion
{
@@ -54,9 +58,14 @@
return result_of::at<BOOST_FUSION_R_ELSE_CLREF(Seq), N>::call(seq);
}
+ //cschmidt: see https://svn.boost.org/trac/boost/ticket/3305
#ifdef BOOST_NO_RVALUE_REFERENCES
template <typename N, typename Seq>
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+ inline typename lazy_disable_if<is_const<Seq>,result_of::at<Seq&, N> >::type
+#else
inline typename result_of::at<Seq&, N>::type
+#endif
at(Seq& seq)
{
return result_of::at<Seq&, N>::call(seq);
@@ -73,7 +82,12 @@
#ifdef BOOST_NO_RVALUE_REFERENCES
template <int N, typename Seq>
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+ inline typename
+ lazy_disable_if<is_const<Seq>,result_of::at_c<Seq&, N> >::type
+#else
inline typename result_of::at_c<Seq&, N>::type
+#endif
at_c(Seq& seq)
{
return fusion::at<mpl::int_<N> >(seq);
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,10 +9,11 @@
#ifndef BOOST_FUSION_SEQUENCE_INTRINSIC_AT_KEY_HPP
#define BOOST_FUSION_SEQUENCE_INTRINSIC_AT_KEY_HPP
+#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/tag_of.hpp>
-#include <boost/type_traits/is_const.hpp>
namespace boost { namespace fusion
{
struct sequence_facade_tag;
@@ -20,7 +21,25 @@
namespace extension
{
template <typename Tag>
- struct at_key_impl;
+ struct at_key_impl
+ {
+ template <typename SeqRef, typename Key>
+ struct apply
+ {
+ typedef typename
+ result_of::deref_data<
+ typename result_of::find_key<SeqRef, Key>::type
+ >::type
+ type;
+
+ static type
+ call(SeqRef seq)
+ {
+ return deref_data(find_key<Key>(
+ BOOST_FUSION_FORWARD(SeqRef,seq)));
+ }
+ };
+ };
template <>
struct at_key_impl<sequence_facade_tag>
@@ -43,9 +62,11 @@
}
template <typename Key, typename Seq>
- inline typename result_of::at_key<
- BOOST_FUSION_R_ELSE_CLREF(Seq)
- , Key>::type
+ inline typename
+ result_of::at_key<
+ BOOST_FUSION_R_ELSE_CLREF(Seq)
+ , Key
+ >::type
at_key(BOOST_FUSION_R_ELSE_CLREF(Seq) seq)
{
return
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,15 +8,16 @@
#ifndef BOOST_FUSION_SEQUENCE_INTRINSIC_HAS_KEY_HPP
#define BOOST_FUSION_SEQUENCE_INTRINSIC_HAS_KEY_HPP
+#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/tag_of.hpp>
#include <boost/mpl/not.hpp>
-#include <boost/type_traits/is_same.hpp>
namespace boost { namespace fusion
{
- struct void_;
struct sequence_facade_tag;
namespace extension
@@ -26,11 +27,12 @@
{
template <typename SeqRef, typename Key>
struct apply
- : mpl::not_<is_same<
- typename detail::remove_reference<SeqRef>::type::
- template meta_at_impl<Key>::type
- , void_>
- >
+ : mpl::not_<
+ typename result_of::equal_to<
+ typename result_of::find_key<SeqRef, Key>::type
+ , typename result_of::end<SeqRef>::type
+ >::type
+ >::type
{};
};
@@ -49,7 +51,7 @@
{
template <typename Seq, typename Key>
struct has_key
- : extension::has_key_impl<typename traits::tag_of<Seq>::type>::
+ : extension::has_key_impl<typename traits::tag_of<Seq>::type>::
template apply<typename detail::add_lref<Seq>::type, Key>
{};
}
@@ -58,8 +60,7 @@
inline typename result_of::has_key<Seq const&, Key>::type
has_key(Seq const& seq)
{
- typedef typename result_of::has_key<Seq const&, Key>::type result;
- return result();
+ return typename result_of::has_key<Seq const&, Key>::type();
}
}}
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -45,8 +45,7 @@
struct size
: extension::size_impl<typename traits::tag_of<Seq>::type>::
template apply<typename detail::add_lref<Seq>::type>::type
- {
- };
+ {};
}
template <typename Seq>
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,7 +11,8 @@
#include <boost/config.hpp>
#ifdef BOOST_NO_RVALUE_REFERENCES
-# include <boost/fusion/algorithm/transformation/zip.hpp>
+# include <boost/fusion/container/generation/vector_tie.hpp>
+# include <boost/fusion/view/zip_view.hpp>
# include <boost/fusion/algorithm/iteration/for_each.hpp>
# include <boost/fusion/sequence/intrinsic/front.hpp>
# include <boost/fusion/sequence/intrinsic/back.hpp>
@@ -50,7 +51,9 @@
void
swap(Seq1& seq1, Seq2& seq2)
{
- for_each(zip(seq1, seq2), detail::swap());
+ for_each(zip_view<typename result_of::vector_tie<Seq1&,Seq2&>::type>(
+ vector_tie(seq1, seq2))
+ , detail::swap());
}
#else
using std::swap;
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -37,7 +37,7 @@
{
template <typename Seq, typename N>
struct value_at
- : extension::value_at_impl<typename traits::tag_of<Seq>::type>::
+ : extension::value_at_impl<typename traits::tag_of<Seq>::type>::
template apply<typename detail::add_lref<Seq>::type, N>
{};
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,6 +9,8 @@
#ifndef BOOST_FUSION_SEQUENCE_INTRINSIC_VALUE_AT_KEY_HPP
#define BOOST_FUSION_SEQUENCE_INTRINSIC_VALUE_AT_KEY_HPP
+#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>
@@ -21,7 +23,18 @@
namespace extension
{
template <typename Tag>
- struct value_at_key_impl;
+ struct value_at_key_impl
+ {
+ template <typename SeqRef, typename Key>
+ struct apply
+ {
+ typedef typename
+ result_of::value_of_data<
+ typename result_of::find_key<SeqRef, Key>::type
+ >::type
+ type;
+ };
+ };
template <>
struct value_at_key_impl<sequence_facade_tag>
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -1,27 +1,87 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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)
-==============================================================================*/
+// 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_SEQUENCE_SEQUENCE_FACADE_HPP
#define BOOST_FUSION_SEQUENCE_SEQUENCE_FACADE_HPP
#include <boost/fusion/support/sequence_base.hpp>
+#include <boost/fusion/support/dummy_tag.hpp>
+
#include <boost/mpl/bool.hpp>
namespace boost { namespace fusion
{
+ struct void_;
struct sequence_facade_tag;
- template <typename Derived, typename Category, typename IsView = mpl::false_>
- struct sequence_facade : sequence_base<Derived>
+ namespace extension
+ {
+ template<typename Tag>
+ struct at_key_impl;
+
+ template<typename Tag>
+ struct empty_impl;
+
+ template<typename Tag>
+ struct size_impl;
+
+ template<typename Tag>
+ struct has_key_impl;
+
+ template<typename Tag>
+ struct value_at_key_impl;
+ }
+
+ template<
+ typename Derived
+ , typename Category
+ , typename IsView = mpl::false_
+ >
+ struct sequence_facade
+ : sequence_base<Derived>
{
typedef sequence_facade_tag fusion_tag;
typedef Derived derived_type;
typedef Category category;
typedef IsView is_view;
+
+ template<typename SeqRef,typename Key>
+ struct at_key
+ : extension::at_key_impl<
+ typename detail::get_dummy_tag<SeqRef>::type
+ >::template apply<SeqRef,Key>
+ {};
+
+ template<typename SeqRef>
+ struct empty
+ : extension::empty_impl<
+ typename detail::get_dummy_tag<SeqRef>::type
+ >::template apply<SeqRef>
+ {};
+
+ template<typename SeqRef>
+ struct size
+ : extension::size_impl<
+ typename detail::get_dummy_tag<SeqRef>::type
+ >::template apply<SeqRef>
+ {};
+
+ template<typename SeqRef,typename Key>
+ struct has_key
+ : extension::has_key_impl<
+ typename detail::get_dummy_tag<SeqRef>::type
+ >::template apply<SeqRef,Key>
+ {};
+
+ template<typename SeqRef,typename Key>
+ struct value_at_key
+ : extension::value_at_key_impl<
+ typename detail::get_dummy_tag<SeqRef>::type
+ >::template apply<SeqRef,Key>
+ {};
+
};
}}
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -16,7 +16,6 @@
#include <boost/fusion/support/iterator_base.hpp>
#include <boost/fusion/support/pair.hpp>
#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/tag_of.hpp>
#include <boost/fusion/support/deduce.hpp>
#include <boost/fusion/support/deduce_sequence.hpp>
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/assign_tags.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/assign_tags.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/assign_tags.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,10 +8,11 @@
namespace boost { namespace fusion { namespace detail
{
+ struct assign_directly
+ {};
- struct assign_directly {};
- struct assign_by_deref {};
-
+ struct assign_by_deref
+ {};
}}}
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/deduce_sequence.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/deduce_sequence.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/deduce_sequence.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -31,7 +31,7 @@
namespace traits
{
- template <class Seq>
+ template <typename Seq>
struct deduce_sequence
: result_of::as_vector<fusion::transform_view<Seq, detail::deducer> >
{};
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/detail/as_fusion_element.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/detail/as_fusion_element.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/detail/as_fusion_element.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -69,9 +69,9 @@
};
template <typename T, int N>
- struct as_fusion_element<volatile const T(&)[N]>
+ struct as_fusion_element<const volatile T(&)[N]>
{
- typedef volatile const T(&type)[N];
+ typedef const volatile T(&type)[N];
};
template <typename T>
Added: sandbox/SOC/2009/fusion/boost/fusion/support/dummy_tag.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/dummy_tag.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -0,0 +1,23 @@
+// 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_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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,12 +8,9 @@
#ifndef BOOST_FUSION_SUPPORT_IS_SEQUENCE_HPP
#define BOOST_FUSION_SUPPORT_IS_SEQUENCE_HPP
-#include <boost/fusion/support/is_view.hpp>
#include <boost/fusion/support/tag_of.hpp>
#include <boost/fusion/support/ref.hpp>
-#include <boost/mpl/not.hpp>
-
namespace boost { namespace fusion
{
namespace extension
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -28,8 +28,8 @@
namespace traits
{
template <typename T>
- struct is_view :
- extension::is_view_impl<typename fusion::traits::tag_of<T>::type>::
+ struct is_view
+ : extension::is_view_impl<typename fusion::traits::tag_of<T>::type>::
template apply<typename detail::add_lref<T>::type>::type
{};
}
Deleted: sandbox/SOC/2009/fusion/boost/fusion/support/iterator_adapter.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/iterator_adapter.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
+++ (empty file)
@@ -1,54 +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_ITERATOR_ADAPTER_HPP
-#define BOOST_FUSION_SUPPORT_ITERATOR_ADAPTER_HPP
-
-#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/iterator_base.hpp>
-
-#include <boost/fusion/support/detail/iterator_adapter/iterator_adapter_fwd.hpp>
-#include <boost/fusion/support/detail/iterator_adapter/deref_impl.hpp>
-#include <boost/fusion/support/detail/iterator_adapter/value_of_impl.hpp>
-#include <boost/fusion/support/detail/iterator_adapter/next_impl.hpp>
-#include <boost/fusion/support/detail/iterator_adapter/prior_impl.hpp>
-#include <boost/fusion/support/detail/iterator_adapter/equal_to_impl.hpp>
-#include <boost/fusion/support/detail/iterator_adapter/distance_impl.hpp>
-#include <boost/fusion/support/detail/iterator_adapter/advance_impl.hpp>
-
-namespace boost { namespace fusion
-{
- struct iterator_adapter_tag;
-
- template<typename It, typename NewCategory>
- struct iterator_adapter
- : iterator_base<iterator_adapter<It, NewCategory> >
- {
- typedef iterator_adapter_tag fusion_tag;
- typedef NewCategory category;
- typedef It iterator_type;
-
- template<typename OtherIt>
- iterator_adapter(BOOST_FUSION_R_ELSE_CLREF(OtherIt) it)
- : it(BOOST_FUSION_FORWARD(OtherIt,it).it)
- {}
-
- iterator_adapter(It const& it, int)
- : it(it)
- {}
-
- template<typename OtherIt>
- iterator_adapter&
- operator=(BOOST_FUSION_R_ELSE_CLREF(OtherIt) other_it)
- {
- it=BOOST_FUSION_FORWARD(OtherIt,other_it).it;
- return *this;
- }
-
- It it;
- };
-}}
-
-#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -12,7 +12,9 @@
#include <boost/fusion/support/ref.hpp>
#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/call_traits.hpp>
+#if defined(BOOST_NO_VARIADIC_TEMPLATES) && defined(BOOST_NO_RVALUE_REFERENCES)
+# include <boost/call_traits.hpp>
+#endif
namespace boost { namespace fusion
{
@@ -80,17 +82,21 @@
template<typename First, typename Second>
struct make_pair
{
- typedef fusion::pair<First,
- typename detail::as_fusion_element<Second>::type> type;
+ typedef
+ fusion::pair<
+ First
+ , typename detail::as_fusion_element<Second>::type
+ >
+ type;
};
- template<class Pair>
+ template<typename Pair>
struct first
{
typedef typename Pair::first_type type;
};
- template<class Pair>
+ template<typename Pair>
struct second
{
typedef typename Pair::second_type type;
@@ -116,7 +122,6 @@
return os;
}
- //TODO cschmidt: rref?!
template <typename IStream, typename First, typename Second>
inline BOOST_FUSION_R_ELSE_LREF(IStream)
operator>>(
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -17,10 +17,8 @@
#include <boost/mpl/not.hpp>
#include <boost/mpl/and.hpp>
#include <boost/mpl/identity.hpp>
+#include <boost/mpl/bool.hpp>
-#ifndef BOOST_NO_RVALUE_REFERENCES
-# include <boost/utility/enable_if.hpp>
-#endif
#include <boost/type_traits/is_class.hpp>
#include <boost/type_traits/is_array.hpp>
#include <boost/type_traits/is_const.hpp>
@@ -32,18 +30,16 @@
#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
-# include <boost/mpl/bool.hpp>
-
# define BOOST_FUSION_R_ELSE_LREF(OBJECT) OBJECT&
# define BOOST_FUSION_R_ELSE_CLREF(OBJECT) OBJECT const&
-# define BOOST_FUSION_RREF_ELSE_OBJ(OBJECT) OBJECT
-# define BOOST_FUSION_OBJ_ELSE_LREF(OBJECT) OBJECT&
-# define BOOST_FUSION_OBJ_ELSE_CLREF(OBJECT) OBJECT const&
# define BOOST_FUSION_FORWARD(TYPE,ARGUMENT) ARGUMENT
@@ -53,22 +49,13 @@
MACRO(const&,ARG)\
MACRO(&,ARG)
#else
-# include <utility>
-
# define BOOST_FUSION_R_ELSE_LREF(OBJECT) OBJECT&&
# define BOOST_FUSION_R_ELSE_CLREF(OBJECT) OBJECT&&
-# define BOOST_FUSION_RREF_ELSE_OBJ(OBJECT) OBJECT&&
-# define BOOST_FUSION_OBJ_ELSE_LREF(OBJECT) OBJECT
-# define BOOST_FUSION_OBJ_ELSE_CLREF(OBJECT) OBJECT
# define BOOST_FUSION_FORWARD(TYPE,ARGUMENT) std::forward<TYPE>(ARGUMENT)
- //cschmidt: InstThis macro could be replaced with a single function using
- //enable if and is_convertible. This is a lot slower than five overloads/
- //specialisations though.
# 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)\
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/result_of.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/result_of.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/result_of.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -6,16 +6,14 @@
#ifndef BOOST_FUSION_SUPPORT_RESULT_OF_HPP
#define BOOST_FUSION_SUPPORT_RESULT_OF_HPP
-#include <boost/utility/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/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>
@@ -94,7 +92,7 @@
typedef Result type;
};
- //TODO cschmidt: Once we got a macro to find out whether the compiler
+ //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>
@@ -131,7 +129,7 @@
{};
#endif
-#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
+#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
@@ -156,40 +154,41 @@
>::type
type;
};
-
#else
- namespace detail
+}
+namespace detail
+{
+ BOOST_MPL_HAS_XXX_TRAIT_DEF(result_type)
+
+ template<typename IdentityF>
+ struct get_result_type
{
- BOOST_MPL_HAS_XXX_TRAIT_DEF(result_type)
+ typedef typename IdentityF::result_type 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>
- {};
-
- //TODO cschmidt: non-native variadic templates version
- 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;
- };
- }
+ 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>
@@ -199,7 +198,7 @@
template<typename F, typename... Args>
struct result_of<F(Args...)>
{
- typedef typename fusion::detail::identity<F>::type f;
+ typedef typename detail::identity<F>::type f;
typedef typename
mpl::eval_if<
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/sequence_assign.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/sequence_assign.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/sequence_assign.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -20,8 +20,7 @@
{
sequence_assign_type(Seq seq)
: seq(seq)
- {
- }
+ {}
Seq get()const
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/sequence_base.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/sequence_base.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/sequence_base.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -13,7 +13,8 @@
namespace boost { namespace fusion
{
- struct sequence_root {};
+ struct sequence_root
+ {};
template <typename Seq>
struct sequence_base
Modified: 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 (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/to_random_access_mpl_seq.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,6 +8,7 @@
#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>
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/variadic_templates/variadic_quote.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/variadic_templates/variadic_quote.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/variadic_templates/variadic_quote.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -19,7 +19,8 @@
BOOST_MPL_HAS_XXX_TRAIT_DEF(type)
}
- template<template<typename...>class Type>struct variadic_quote
+ template<template<typename...> class Type>
+ struct variadic_quote
{
private:
template<typename ConcreteType,typename/* HasType*/>
@@ -29,8 +30,8 @@
};
template<typename ConcreteType>
- struct apply_impl<ConcreteType,mpl::true_>:
- ConcreteType
+ struct apply_impl<ConcreteType,mpl::true_>
+ : ConcreteType
{
};
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -18,10 +18,13 @@
#include <boost/fusion/adapted/std_pair.hpp>
#include <boost/fusion/support/ref.hpp>
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# include <boost/fusion/container/detail/pp/forward_ctor.hpp>
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+# include <boost/type_traits/is_const.hpp>
+# include <boost/utility/enable_if.hpp>
#endif
+#include <boost/fusion/container/detail/forward_ctor.hpp>
+
namespace boost { namespace fusion
{
VARIADIC_TEMPLATE(FUSION_MAX_VECTOR_SIZE)
@@ -50,20 +53,13 @@
#undef TUPLE_CTOR
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
-# define BOOST_FUSION_USE_BASE_TYPE
-# define BOOST_FUSION_SEQ_NAME tuple
-# define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_VECTOR_SIZE
-# include <boost/fusion/container/detail/pp/forward_ctor.hpp>
-# undef BOOST_FUSION_MAX_SEQ_SIZE
-# undef BOOST_FUSION_SEQ_NAME
-# undef BOOST_FUSION_USE_BASE_TYPE
-#else
- template <typename... OtherArguments>
- tuple(BOOST_FUSION_R_ELSE_CLREF(OtherArguments)... other_arguments)
- : base_type(BOOST_FUSION_FORWARD(OtherArguments,other_arguments)...)
- {}
-#endif
+#define BOOST_FUSION_USE_BASE_TYPE
+#define BOOST_FUSION_SEQ_NAME tuple
+#define BOOST_FUSION_MAX_SEQ_SIZE FUSION_MAX_VECTOR_SIZE
+#include <boost/fusion/container/detail/forward_ctor.hpp>
+#undef BOOST_FUSION_MAX_SEQ_SIZE
+#undef BOOST_FUSION_SEQ_NAME
+#undef BOOST_FUSION_USE_BASE_TYPE
template <typename Seq>
tuple&
@@ -93,7 +89,12 @@
#ifdef BOOST_NO_RVALUE_REFERENCES
template <int N, typename Tuple>
+#if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__GNUC__,<4)
+ inline typename
+ lazy_disable_if<is_const<Tuple>,result_of::at_c<Tuple&, N> >::type
+#else
inline typename result_of::at_c<Tuple&, N>::type
+#endif
get(Tuple& tuple)
{
return at_c<N>(tuple);
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -22,23 +22,15 @@
{
private:
template<typename OtherT>
- static typename
- enable_if<
- traits::is_view<T>
- , BOOST_FUSION_R_ELSE_CLREF(OtherT)
- >::type
- get_init_type(BOOST_FUSION_R_ELSE_LREF(OtherT) other_t)
+ static BOOST_FUSION_R_ELSE_CLREF(OtherT)
+ get_init_type(BOOST_FUSION_R_ELSE_LREF(OtherT) other_t, mpl::true_)
{
return other_t;
}
template<typename OtherT>
- static typename
- disable_if<
- traits::is_view<T>
- , typename detail::remove_reference<OtherT>::type*
- >::type
- get_init_type(BOOST_FUSION_R_ELSE_LREF(OtherT) other_t)
+ static typename detail::remove_reference<OtherT>::type*
+ get_init_type(BOOST_FUSION_R_ELSE_LREF(OtherT) other_t, mpl::false_)
{
return &other_t;
}
@@ -65,7 +57,7 @@
#define VIEW_STORAGE_CTOR(COMBINATION,_)\
template<typename OtherT>\
view_storage(view_storage<OtherT> COMBINATION storage)\
- : t(get_init_type(storage.get()))\
+ : t(get_init_type(storage.get(), typename traits::is_view<T>::type()))\
{}
BOOST_FUSION_ALL_CTOR_COMBINATIONS(VIEW_STORAGE_CTOR,_)
@@ -74,12 +66,14 @@
#ifdef BOOST_NO_RVALUE_REFERENCES
view_storage(call_param t)
- : t(get_init_type(t))
+ : t(get_init_type(t, typename traits::is_view<T>::type()))
{}
#else
template<typename OtherT>
view_storage(OtherT&& t)
- : t(get_init_type(std::forward<OtherT>(t)))
+ : t(get_init_type(
+ std::forward<OtherT>(t),
+ typename traits::is_view<T>::type()))
{}
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/begin_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -26,8 +26,8 @@
typedef
filter_iterator<
- typename result_of::begin<typename seq::sequence_type>::type
- , typename result_of::end<typename seq::sequence_type>::type
+ typename result_of::begin<typename seq::seq_type>::type
+ , typename result_of::end<typename seq::seq_type>::type
, typename seq::pred_type
>
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/end_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -25,8 +25,8 @@
typedef
filter_iterator<
- typename result_of::end<typename seq::sequence_type>::type
- , typename result_of::end<typename seq::sequence_type>::type
+ typename result_of::end<typename seq::seq_type>::type
+ , typename result_of::end<typename seq::seq_type>::type
, typename seq::pred_type
>
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/filter_view_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/filter_view_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/filter_view_iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,8 +8,14 @@
#ifndef BOOST_FUSION_VIEW_FILTER_VIEW_DETAIL_FILTER_VIEW_ITERATOR_HPP
#define BOOST_FUSION_VIEW_FILTER_VIEW_DETAIL_FILTER_VIEW_ITERATOR_HPP
-#include <boost/fusion/support/iterator_base.hpp>
+#include <boost/fusion/iterator/value_of.hpp>
#include <boost/fusion/algorithm/query/detail/find_if.hpp>
+#include <boost/fusion/support/iterator_base.hpp>
+
+#include <boost/mpl/quote.hpp>
+#include <boost/mpl/lambda.hpp>
+#include <boost/mpl/bind.hpp>
+#include <boost/mpl/placeholders.hpp>
namespace boost { namespace fusion
{
@@ -20,12 +26,22 @@
struct filter_iterator
: iterator_base<filter_iterator<First, Last, Pred> >
{
- typedef filter_view_iterator_tag fusion_tag;
- typedef forward_traversal_tag category;
- typedef detail::static_find_if<First, Last, Pred> filter;
+ typedef Pred pred_type;
+ typedef
+ detail::static_find_if<
+ First
+ , Last
+ , mpl::bind1<
+ typename mpl::lambda<Pred>::type
+ , mpl::bind1<mpl::quote1<result_of::value_of>,mpl::_1>
+ >
+ >
+ filter;
typedef typename filter::type first_type;
typedef Last last_type;
- typedef Pred pred_type;
+
+ typedef filter_view_iterator_tag fusion_tag;
+ typedef forward_traversal_tag category;
template<typename OtherIt>
filter_iterator(BOOST_FUSION_R_ELSE_CLREF(OtherIt) it)
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/next_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/next_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/next_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -29,7 +29,10 @@
detail::static_find_if<
typename result_of::next<typename it::first_type>::type
, typename it::last_type
- , typename it::pred_type
+ , mpl::bind1<
+ typename mpl::lambda<typename it::pred_type>::type
+ , mpl::bind1<mpl::quote1<result_of::value_of>,mpl::_1>
+ >
>
filter;
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -10,12 +10,15 @@
#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/sequence_base.hpp>
-#include <boost/fusion/support/is_view.hpp>
#include <boost/fusion/view/detail/view_storage.hpp>
+#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/bool.hpp>
+#include <boost/mpl/inherit.hpp>
+#include <boost/mpl/identity.hpp>
#include <boost/fusion/view/filter_view/detail/filter_view_fwd.hpp>
#include <boost/fusion/view/filter_view/detail/size_impl.hpp>
@@ -30,22 +33,27 @@
namespace boost { namespace fusion
{
- struct forward_traversal_tag;
struct fusion_sequence_tag;
template <typename Seq, typename Pred>
struct filter_view
: sequence_base<filter_view<Seq, Pred> >
{
- typedef filter_view_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
- typedef forward_traversal_tag category;
- typedef mpl::true_ is_view;
-
typedef detail::view_storage<Seq> storage_type;
- typedef typename storage_type::type sequence_type;
+ typedef typename storage_type::type seq_type;
typedef Pred pred_type;
+ typedef typename
+ mpl::eval_if<
+ traits::is_associative<seq_type>
+ , mpl::inherit2<forward_traversal_tag,associative_sequence_tag>
+ , mpl::identity<forward_traversal_tag>
+ >::type
+ category;
+ typedef filter_view_tag fusion_tag;
+ typedef fusion_sequence_tag tag;
+ typedef mpl::true_ is_view;
+
#define FILTER_VIEW_CTOR(COMBINATION,_)\
template<typename OtherSeq>\
filter_view(filter_view<OtherSeq, Pred> COMBINATION view)\
@@ -57,12 +65,14 @@
#undef FILTER_VIEW_CTOR
#ifdef BOOST_NO_RVALUE_REFERENCES
- explicit filter_view(typename storage_type::call_param seq)
+ explicit
+ filter_view(typename storage_type::call_param seq)
: seq(seq)
{}
#else
template<typename OtherSeq>
- explicit filter_view(BOOST_FUSION_R_ELSE_CLREF(OtherSeq) seq)
+ explicit
+ filter_view(BOOST_FUSION_R_ELSE_CLREF(OtherSeq) seq)
: seq(BOOST_FUSION_FORWARD(OtherSeq,seq))
{}
#endif
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -13,7 +13,10 @@
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/category_of.hpp>
+#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/bool.hpp>
+#include <boost/mpl/inherit.hpp>
+#include <boost/mpl/identity.hpp>
#include <boost/fusion/view/iterator_range/detail/iterator_range_fwd.hpp>
#include <boost/fusion/view/iterator_range/detail/begin_impl.hpp>
@@ -30,14 +33,20 @@
struct iterator_range
: sequence_base<iterator_range<First, Last> >
{
- typedef iterator_range_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
- typedef mpl::true_ is_view;
- typedef typename result_of::distance<First, Last>::type size;
-
typedef First begin_type;
typedef Last end_type;
- typedef typename traits::category_of<First>::type category;
+
+ typedef typename
+ mpl::eval_if<
+ traits::is_associative<begin_type>
+ , mpl::inherit2<forward_traversal_tag,associative_sequence_tag>
+ , mpl::identity<forward_traversal_tag>
+ >::type
+ category;
+ typedef typename result_of::distance<begin_type, end_type>::type size;
+ typedef iterator_range_tag fusion_tag;
+ typedef fusion_sequence_tag tag;
+ typedef mpl::true_ is_view;
template<typename OtherIteratorRange>
iterator_range(BOOST_FUSION_R_ELSE_CLREF(OtherIteratorRange) range)
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/joint_view_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/joint_view_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/joint_view_iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -42,12 +42,13 @@
struct concat_iterator
: iterator_base<concat_iterator<First> >
{
+ typedef First first_type;
+
typedef concat_iterator_tag fusion_tag;
typedef forward_traversal_tag category;
- typedef First first_type;
-
- explicit concat_iterator(First const& first)
+ explicit
+ concat_iterator(First const& first)
: first(first)
{}
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -13,12 +13,15 @@
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/is_view.hpp>
+#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/view/detail/view_storage.hpp>
-#include <boost/mpl/if.hpp>
+#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/plus.hpp>
#include <boost/mpl/bool.hpp>
+#include <boost/mpl/inherit.hpp>
+#include <boost/mpl/identity.hpp>
+#include <boost/mpl/and.hpp>
#include <boost/fusion/view/joint_view/detail/joint_view_fwd.hpp>
#include <boost/fusion/view/joint_view/detail/joint_view_iterator.hpp>
@@ -38,17 +41,26 @@
struct joint_view
: sequence_base<joint_view<Seq1, Seq2> >
{
- typedef joint_view_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
- typedef forward_traversal_tag category;
- typedef mpl::true_ is_view;
-
typedef detail::view_storage<Seq1> storage1_type;
typedef typename storage1_type::type seq1_type;
typedef detail::view_storage<Seq2> storage2_type;
typedef typename storage2_type::type seq2_type;
typedef typename
+ mpl::eval_if<
+ mpl::and_<
+ traits::is_associative<seq1_type>
+ , traits::is_associative<seq2_type>
+ >
+ , mpl::inherit2<forward_traversal_tag,associative_sequence_tag>
+ , mpl::identity<forward_traversal_tag>
+ >::type
+ category;
+ typedef joint_view_tag fusion_tag;
+ typedef fusion_sequence_tag tag;
+ typedef mpl::true_ is_view;
+
+ typedef typename
mpl::plus<
result_of::size<seq1_type>
, result_of::size<seq2_type>
@@ -77,7 +89,7 @@
#endif
template<typename OtherJointView>
- OtherJointView&
+ joint_view&
operator=(BOOST_FUSION_R_ELSE_CLREF(OtherJointView) other_view)
{
seq1=BOOST_FUSION_FORWARD(OtherJointView,other_view).seq1;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/begin_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -26,7 +26,7 @@
typename result_of::end<
typename detail::remove_reference<
SeqRef
- >::type::sequence_type
+ >::type::seq_type
>::type
>
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/end_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -26,7 +26,7 @@
typename result_of::begin<
typename detail::remove_reference<
SeqRef
- >::type::sequence_type
+ >::type::seq_type
>::type
>
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/reverse_view_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/reverse_view_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/reverse_view_iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -23,6 +23,7 @@
: iterator_base<reverse_view_iterator<First> >
{
typedef First first_type;
+
typedef reverse_view_iterator_tag fusion_tag;
typedef typename traits::category_of<first_type>::type category;
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -12,14 +12,17 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/is_view.hpp>
#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/assert.hpp>
+#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/view/detail/view_storage.hpp>
-#include <boost/type_traits/is_base_of.hpp>
+#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/bool.hpp>
+#include <boost/mpl/inherit.hpp>
+#include <boost/mpl/identity.hpp>
+#include <boost/type_traits/is_base_of.hpp>
#include <boost/fusion/view/reverse_view/detail/reverse_view_fwd.hpp>
#include <boost/fusion/view/reverse_view/detail/reverse_view_iterator.hpp>
@@ -41,15 +44,22 @@
struct reverse_view
: sequence_base<reverse_view<Seq> >
{
+ typedef detail::view_storage<Seq> storage_type;
+ typedef typename storage_type::type seq_type;
+ typedef typename traits::category_of<seq_type>::type seq_category;
+
+ typedef typename
+ mpl::eval_if<
+ traits::is_associative<seq_type>
+ , mpl::inherit2<seq_category,associative_sequence_tag>
+ , mpl::identity<seq_category>
+ >::type
+ category;
+ typedef typename result_of::size<seq_type>::type size;
typedef reverse_view_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
+ typedef fusion_sequence_tag tag;
typedef mpl::true_ is_view;
- typedef detail::view_storage<Seq> storage_type;
- typedef typename storage_type::type sequence_type;
- typedef typename traits::category_of<sequence_type>::type category;
- typedef typename result_of::size<sequence_type>::type size;
-
//BOOST_FUSION_STATIC_ASSERT(
// (is_base_of<bidirectional_traversal_tag,
// typename traits::category_of<first_type>::type>::value),
@@ -67,18 +77,20 @@
#undef REVERSE_VIEW_CTOR
#ifdef BOOST_NO_RVALUE_REFERENCES
- explicit reverse_view(typename storage_type::call_param seq)
+ explicit
+ reverse_view(typename storage_type::call_param seq)
: seq(seq)
{}
#else
template<typename OtherSeq>
- explicit reverse_view(OtherSeq&& seq)
+ explicit
+ reverse_view(OtherSeq&& seq)
: seq(std::forward<OtherSeq>(seq))
{}
#endif
template<typename OtherReverseView>
- OtherReverseView&
+ reverse_view&
operator=(BOOST_FUSION_R_ELSE_CLREF(OtherReverseView) other_view)
{
seq=BOOST_FUSION_FORWARD(OtherReverseView,other_view).seq;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/single_view/detail/deref_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/single_view/detail/deref_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/single_view/detail/deref_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -9,7 +9,6 @@
#define BOOST_FUSION_VIEW_SINGLE_VIEW_DETAIL_DEREF_IMPL_HPP
#include <boost/mpl/identity.hpp>
-#include <boost/type_traits/is_const.hpp>
namespace boost { namespace fusion { namespace extension
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/single_view/detail/single_view_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/single_view/detail/single_view_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/single_view/detail/single_view_iterator.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -17,24 +17,20 @@
struct void_;
- //TODO???
template <typename SingleView>
struct single_view_iterator_end
: iterator_base<single_view_iterator_end<SingleView> >
{
+ typedef void_ view_type;
+
typedef single_view_iterator_tag fusion_tag;
typedef forward_traversal_tag category;
-
- typedef void_ view_type;
};
template <typename SingleViewRef>
struct single_view_iterator
: iterator_base<single_view_iterator<SingleViewRef> >
{
- typedef single_view_iterator_tag fusion_tag;
- typedef forward_traversal_tag category;
-
typedef SingleViewRef view_type;
typedef typename
detail::forward_as<
@@ -45,6 +41,9 @@
>::type
value_type;
+ typedef single_view_iterator_tag fusion_tag;
+ typedef forward_traversal_tag category;
+
template<typename OtherIt>
single_view_iterator(BOOST_FUSION_R_ELSE_CLREF(OtherIt) it)
: view(it.view)
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -16,6 +16,9 @@
#include <boost/mpl/bool.hpp>
#include <boost/mpl/int.hpp>
+#ifdef BOOST_NO_RVALUE_REFERENCES
+# include <boost/call_traits.hpp>
+#endif
#include <boost/fusion/view/single_view/detail/single_view_fwd.hpp>
#include <boost/fusion/view/single_view/detail/single_view_iterator.hpp>
@@ -36,12 +39,13 @@
struct single_view
: sequence_base<single_view<T> >
{
+ typedef T value_type;
+
typedef single_view_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
+ typedef fusion_sequence_tag tag;
typedef forward_traversal_tag category;
typedef mpl::true_ is_view;
typedef mpl::int_<1> size;
- typedef T value_type;
single_view()
: val()
@@ -56,10 +60,18 @@
#undef SINGLE_VIEW_CTOR
+#ifdef BOOST_NO_RVALUE_REFERENCES
+ explicit
+ single_view(typename call_traits<T>::param_type val)
+ : val(val)
+ {}
+#else
template<typename OtherT>
- explicit single_view(BOOST_FUSION_R_ELSE_CLREF(OtherT) val)
- : val(BOOST_FUSION_FORWARD(OtherT,val))
+ explicit
+ single_view(OtherT&& val)
+ : val(std::forward<OtherT>(val))
{}
+#endif
#define SINGLE_VIEW_ASSIGN_CTOR(COMBINATION,_)\
template<typename SeqRef>\
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -30,7 +30,7 @@
typename support::get_func_base<
typename seq::transform_type
>::type(
- typename result_of::at<typename seq::sequence_type, N>::type
+ typename result_of::at<typename seq::seq_type, N>::type
)
>::type
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/begin_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -28,7 +28,7 @@
typedef
transform_view_iterator<
- typename result_of::begin<typename seq::sequence_type>::type
+ typename result_of::begin<typename seq::seq_type>::type
, typename detail::forward_as<
SeqRef
, typename seq::transform_type
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -28,8 +28,6 @@
detail::remove_reference<ItRef>::type
it;
- //TODO reference on deref
- //TODO return only const
typedef typename
support::result_of<
typename support::get_func_base<
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/end_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -26,7 +26,7 @@
typedef
transform_view_iterator<
- typename result_of::end<typename seq::sequence_type>::type
+ typename result_of::end<typename seq::seq_type>::type
, typename detail::forward_as<
SeqRef
, typename seq::transform_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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -31,7 +31,7 @@
typename seq::transform_type
>::type(
typename boost::fusion::result_of::value_at<
- typename seq::sequence_type
+ typename seq::seq_type
, N
>::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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -20,11 +20,13 @@
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/assert.hpp>
#include <boost/fusion/support/ref.hpp>
-#include <boost/fusion/support/is_view.hpp>
#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/view/detail/strictest_traversal.hpp>
#include <boost/fusion/view/detail/view_storage.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/inherit.hpp>
+#include <boost/mpl/identity.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/call_traits.hpp>
@@ -51,9 +53,9 @@
struct fusion_sequence_tag;
// Binary Version
- template <typename Seq1, typename Seq2, typename F>
+ template <typename Seq1, typename Seq2, typename F, typename IsAssociative>
struct transform_view
- : sequence_base<transform_view<Seq1, Seq2, F> >
+ : sequence_base<transform_view<Seq1, Seq2, F,IsAssociative> >
{
//BOOST_FUSION_MPL_ASSERT_RELATION(
// result_of::size<Sequence1>,==,result_of::size<Sequence2>,
@@ -64,10 +66,6 @@
typedef detail::view_storage<Seq2> storage2_type;
typedef typename storage2_type::type seq2_type;
typedef F transform_type;
-
- typedef transform_view2_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
- typedef mpl::true_ is_view;
typedef typename
detail::strictest_traversal<
#ifdef BOOST_NO_VARIADIC_TEMPLATES
@@ -76,6 +74,18 @@
fusion::vector<seq1_type, seq2_type>
#endif
>::type
+ strictest_traversal;
+
+
+ typedef transform_view2_tag fusion_tag;
+ typedef fusion_sequence_tag tag;
+ typedef mpl::true_ is_view;
+ typedef typename
+ mpl::eval_if<
+ IsAssociative
+ , mpl::inherit2<strictest_traversal,associative_sequence_tag>
+ , mpl::identity<strictest_traversal>
+ >::type
category;
typedef typename result_of::size<seq1_type>::type size;
@@ -120,49 +130,51 @@
transform_type f;
};
- // Unary Version
- template <typename Seq, typename F>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
- struct transform_view<Seq, F, void_>
- : sequence_base<transform_view<Seq, F, void_> >
-#else
- struct transform_view<Seq, F>
- : sequence_base<transform_view<Seq, F> >
-#endif
+ // Unary Version implementation
+ template<typename Seq, typename F, typename IsAssociative>
+ struct unary_transform_view
+ : sequence_base<unary_transform_view<Seq, F, void_> >
{
typedef detail::view_storage<Seq> storage_type;
- typedef typename storage_type::type sequence_type;
+ typedef typename storage_type::type seq_type;
+ typedef typename traits::category_of<seq_type>::type seq_category;
typedef F transform_type;
- typedef typename traits::category_of<sequence_type>::type category;
- typedef typename result_of::size<sequence_type>::type size;
+ typedef typename
+ mpl::eval_if<
+ IsAssociative
+ , mpl::inherit2<seq_category,associative_sequence_tag>
+ , mpl::identity<seq_category>
+ >::type
+ category;
+ typedef typename result_of::size<seq_type>::type size;
typedef transform_view_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
+ typedef fusion_sequence_tag tag;
typedef mpl::true_ is_view;
template<typename OtherTransformView>
- transform_view(BOOST_FUSION_R_ELSE_CLREF(OtherTransformView) view)
+ unary_transform_view(BOOST_FUSION_R_ELSE_CLREF(OtherTransformView) view)
: seq(BOOST_FUSION_FORWARD(OtherTransformView,view).seq)
, f(BOOST_FUSION_FORWARD(OtherTransformView,view).f)
{}
#ifdef BOOST_NO_RVALUE_REFERENCES
- transform_view(
+ unary_transform_view(
typename storage_type::call_param seq,
- typename call_traits<F>::param_type f)
+ typename call_traits<transform_type>::param_type f)
: seq(seq)
, f(f)
{}
#else
template<typename OtherSeq, typename OtherF>
- transform_view(OtherSeq&& seq,OtherF&& f)
+ unary_transform_view(OtherSeq&& seq,OtherF&& f)
: seq(std::forward<OtherSeq>(seq))
, f(std::forward<OtherF>(f))
{}
#endif
template<typename OtherTransformView>
- OtherTransformView&
+ unary_transform_view&
operator=(BOOST_FUSION_R_ELSE_CLREF(OtherTransformView) view)
{
seq=BOOST_FUSION_FORWARD(OtherTransformView,view).seq;
@@ -173,6 +185,75 @@
storage_type seq;
transform_type f;
};
+
+ //TODO cschmidt: template typedef
+ template<typename Seq, typename F>
+ struct transform_view<Seq, F, mpl::true_,mpl::false_>
+ : unary_transform_view<Seq, F, mpl::true_>
+ {
+ typedef unary_transform_view<Seq, F, mpl::true_> base;
+
+ template<typename OtherTransformView>
+ transform_view(BOOST_FUSION_R_ELSE_CLREF(OtherTransformView) view)
+ : base(BOOST_FUSION_FORWARD(OtherTransformView,view))
+ {}
+
+#ifdef BOOST_NO_RVALUE_REFERENCES
+ transform_view(
+ typename base::storage_type::call_param seq,
+ typename call_traits<typename base::transform_type>::param_type f)
+ : base(seq,f)
+ {}
+#else
+ template<typename OtherSeq, typename OtherF>
+ transform_view(OtherSeq&& seq,OtherF&& f)
+ : base(std::forward<OtherSeq>(seq),std::forward<OtherF>(f))
+ {}
+#endif
+
+ template<typename OtherTransformView>
+ transform_view&
+ operator=(BOOST_FUSION_R_ELSE_CLREF(OtherTransformView) view)
+ {
+ *static_cast<base*>(this)=
+ BOOST_FUSION_FORWARD(OtherTransformView,view);
+ return *this;
+ }
+ };
+
+ template<typename Seq, typename F>
+ struct transform_view<Seq, F, mpl::false_,mpl::false_>
+ : unary_transform_view<Seq, F, mpl::false_>
+ {
+ typedef unary_transform_view<Seq, F, mpl::false_> base;
+
+ template<typename OtherTransformView>
+ transform_view(BOOST_FUSION_R_ELSE_CLREF(OtherTransformView) view)
+ : base(BOOST_FUSION_FORWARD(OtherTransformView,view))
+ {}
+
+#ifdef BOOST_NO_RVALUE_REFERENCES
+ transform_view(
+ typename base::storage_type::call_param seq,
+ typename call_traits<typename base::transform_type>::param_type f)
+ : base(seq,f)
+ {}
+#else
+ template<typename OtherSeq, typename OtherF>
+ transform_view(OtherSeq&& seq,OtherF&& f)
+ : base(std::forward<OtherSeq>(seq),std::forward<OtherF>(f))
+ {}
+#endif
+
+ template<typename OtherTransformView>
+ transform_view&
+ operator=(BOOST_FUSION_R_ELSE_CLREF(OtherTransformView) view)
+ {
+ *static_cast<base*>(this)=
+ BOOST_FUSION_FORWARD(OtherTransformView,view);
+ return *this;
+ }
+ };
}}
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view_fwd.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view_fwd.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view_fwd.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -8,13 +8,19 @@
#ifndef BOOST_FUSION_VIEW_TRANSFORM_VIEW_TRANSFORM_VIEW_FWD_HPP
#define BOOST_FUSION_VIEW_TRANSFORM_VIEW_TRANSFORM_VIEW_FWD_HPP
+#include <boost/mpl/bool.hpp>
+
namespace boost { namespace fusion
{
- struct void_;
struct transform_view_tag;
struct transform_view2_tag;
- template <typename A, typename B, typename C = void_>
+ template<
+ typename A
+ , typename B
+ , typename C = mpl::false_
+ , typename D = mpl::false_
+ >
struct transform_view;
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/at_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/at_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/at_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -33,9 +33,10 @@
template<typename Self, typename SeqRef>
struct result<Self(SeqRef)>
- : mpl::eval_if<is_same<SeqRef, unused_type const&>
- , mpl::identity<unused_type const&>
- , result_of::at<SeqRef, N>
+ : mpl::eval_if<
+ is_same<SeqRef, unused_type const&>
+ , mpl::identity<unused_type const&>
+ , result_of::at<SeqRef, N>
>
{
//BOOST_MPL_ASSERT((is_reference<SeqRef>));
@@ -81,7 +82,6 @@
static type
call(SeqRef seq)
{
- //TODO inside transform_view transform_type rref->llref
return type(sequence_assign(fusion::transform(
seq.seqs, detail::poly_at<N>())));
}
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/begin_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -30,9 +30,10 @@
template<typename Self, typename SeqRef>
struct result<Self(SeqRef)>
- : mpl::eval_if<is_same<SeqRef, unused_type const&>
- , mpl::identity<unused_type const&>
- , result_of::begin<SeqRef>
+ : mpl::eval_if<
+ is_same<SeqRef, unused_type const&>
+ , mpl::identity<unused_type const&>
+ , result_of::begin<SeqRef>
>
{
BOOST_MPL_ASSERT((detail::is_lrref<SeqRef>));
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/deref_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/deref_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/deref_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -30,15 +30,12 @@
template<typename Self, typename ItRef>
struct result<Self(ItRef)>
- {
- //TODO cschmidt: ?!
- typedef typename
- mpl::eval_if<is_same<ItRef, unused_type const&>
- , mpl::identity<unused_type const&>
- , result_of::deref<ItRef>
- >::type
- type;
- };
+ : mpl::eval_if<
+ is_same<ItRef, unused_type const&>
+ , mpl::identity<unused_type const&>
+ , result_of::deref<ItRef>
+ >
+ {};
template<typename It>
typename result<poly_deref(It const&)>::type
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/distance_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/distance_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/distance_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -33,7 +33,7 @@
result_of::find_if<
typename SearchIt::iterators
, is_same<
- traits::category_of<mpl::_>
+ traits::category_of<mpl::_1>
, random_access_iterator_tag
>
>
@@ -60,7 +60,7 @@
typedef typename
result_of::find_if<
typename It1::iterators
- , is_same<traits::category_of<mpl::_>
+ , is_same<traits::category_of<mpl::_1>
, random_access_iterator_tag>
>
finder;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/end_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -43,9 +43,10 @@
template<typename Self, typename SeqRef>
struct result<Self(SeqRef)>
- : mpl::eval_if<is_same<SeqRef, unused_type const&>
- , mpl::identity<unused_type const&>
- , get_endpoint<SeqRef, M>
+ : mpl::eval_if<
+ is_same<SeqRef, unused_type const&>
+ , mpl::identity<unused_type const&>
+ , get_endpoint<SeqRef, M>
>
{
BOOST_MPL_ASSERT((detail::is_lrref<SeqRef>));
@@ -94,8 +95,8 @@
{
return type(
fusion::transform(
- seq.seqs
- , detail::endpoints<typename seq::size>()
+ seq.seqs
+ , detail::endpoints<typename seq::size>()
)
, 0);
}
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/equal_to_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/equal_to_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/equal_to_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -12,7 +12,6 @@
#include <boost/fusion/mpl.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
-#include <boost/mpl/lambda.hpp>
#include <boost/mpl/and.hpp>
#include <boost/mpl/transform_view.hpp>
#include <boost/mpl/zip_view.hpp>
@@ -42,13 +41,13 @@
typedef
mpl::transform_view<
zipped
- , mpl::unpack_args<result_of::equal_to<mpl::_,mpl::_> >
+ , mpl::unpack_args<result_of::equal_to<mpl::_1,mpl::_1> >
>
transformed;
typedef typename
mpl::find_if<
transformed
- , mpl::equal_to<mpl::_, mpl::false_>
+ , mpl::equal_to<mpl::_1, mpl::false_>
>::type
found;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/next_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/next_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/next_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -27,17 +27,14 @@
template<typename Sig>
struct result;
- template<typename Self, typename It>
- struct result<Self(It)>
- {
- typedef typename
- mpl::eval_if<
- is_same<It, unused_type const&>
- , mpl::identity<unused_type const&>
- , result_of::next<It>
- >::type
- type;
- };
+ template<typename Self, typename ItRef>
+ struct result<Self(ItRef)>
+ : mpl::eval_if<
+ is_same<ItRef, unused_type const&>
+ , mpl::identity<unused_type const&>
+ , result_of::next<ItRef>
+ >
+ {};
template<typename It>
typename result<poly_next(It const&)>::type
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/prior_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/prior_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/prior_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -29,15 +29,12 @@
template<typename Self, typename ItRef>
struct result<Self(ItRef)>
- {
- typedef typename
- mpl::eval_if<
- is_same<ItRef, unused_type const&>
- , mpl::identity<unused_type const&>
- , result_of::prior<ItRef>
- >::type
- type;
- };
+ : mpl::eval_if<
+ is_same<ItRef, unused_type const&>
+ , mpl::identity<unused_type const&>
+ , result_of::prior<ItRef>
+ >
+ {};
template<typename It>
typename result<poly_prior(It const&)>::type
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-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -56,7 +56,7 @@
struct all_references
: fusion::result_of::equal_to<
typename fusion::result_of::find_if<
- Seqs, mpl::not_<is_lrref<mpl::_> >
+ Seqs, mpl::not_<is_lrref<mpl::_1> >
>::type
, typename fusion::result_of::end<Seqs>::type
>
@@ -105,10 +105,12 @@
sizes;
typedef typename
- result_of::fold<
- sizes
- , typename result_of::front<sizes>::type
- , detail::poly_min
+ detail::remove_reference<
+ typename result_of::fold<
+ sizes
+ , typename result_of::front<sizes>::type
+ , detail::poly_min
+ >::type
>::type
type;
};
@@ -121,17 +123,20 @@
struct zip_view
: sequence_base< zip_view<Seqs> >
{
- //TODO cschmidt: replace view& with view
typedef typename
result_of::remove<Seqs, unused_type const&>::type
real_seqs;
BOOST_MPL_ASSERT((detail::all_references<Seqs>));
typedef typename
+ fusion::result_of::as_vector<Seqs>::type
+ seqs_type;
+
+ typedef typename
detail::strictest_traversal<real_seqs>::type
category;
typedef zip_view_tag fusion_tag;
- typedef fusion_sequence_tag tag; // this gets picked up by MPL
+ typedef fusion_sequence_tag tag;
typedef mpl::true_ is_view;
typedef typename
mpl::eval_if<
@@ -141,10 +146,6 @@
>::type
size;
- typedef typename
- fusion::result_of::as_vector<Seqs>::type
- seqs_type;
-
#define ZIP_VIEW_CTOR(COMBINATION,_)\
template<typename OtherSeqs>\
zip_view(zip_view<OtherSeqs> COMBINATION view)\
@@ -157,7 +158,8 @@
#undef ZIP_VIEW_CTOR
template<typename OtherSeqs>
- explicit zip_view(BOOST_FUSION_R_ELSE_CLREF(OtherSeqs) seqs)
+ explicit
+ zip_view(BOOST_FUSION_R_ELSE_CLREF(OtherSeqs) seqs)
: seqs(fusion::sequence_assign(
BOOST_FUSION_FORWARD(OtherSeqs,seqs)))
{}
Modified: sandbox/SOC/2009/fusion/build.bat
==============================================================================
--- sandbox/SOC/2009/fusion/build.bat (original)
+++ sandbox/SOC/2009/fusion/build.bat 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -25,10 +25,11 @@
)
rem compile...
-%BOOST_ROOT%\bjam -sHOME="z:\projekte\cl_link_frontend\util\boost" --without-python --toolset=%TOOLSET% %2 %3 %4 %5 %6 %7 %8 %9
+%BOOST_ROOT%\bjam -sHOME="z:\projekte\cl_link_frontend\util\boost" --toolset=%TOOLSET% %2 %3 %4 %5 %6 %7 %8 %9
goto :eof
:gcc
+rem set PATH=C:\MinGW3\bin;%PATH%
set PATH=C:\MinGW\bin;%PATH%
set TOOLSET=gcc
goto :eof
Modified: sandbox/SOC/2009/fusion/libs/fusion/doc/container.qbk
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/doc/container.qbk (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/doc/container.qbk 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -715,9 +715,7 @@
[heading Example]
- make_map(
- __fusion_make_pair__<int>('X')
- , __fusion_make_pair__<double>("Men"))
+ make_map<int, double>('X', "Men")
[heading See also]
Modified: sandbox/SOC/2009/fusion/libs/fusion/doc/extension.qbk
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/doc/extension.qbk (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/doc/extension.qbk 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -321,7 +321,7 @@
In order for `example_struct` to serve as an associative container,
we need to enable 3 lookup features, __at_key__, __value_at_key__ and __has_key__.
-We also need to provide an implementation of the `is_associative` trait
+We also need to provide an implementation of the `category_of_impl` trait
so that our sequence can be correctly identified as an associative container.
To implement `at_key_impl` we need to associate the `fields::age` and `fields::age`
Modified: sandbox/SOC/2009/fusion/libs/fusion/example/extension/detail/size_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/example/extension/detail/size_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/example/extension/detail/size_impl.hpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -28,7 +28,7 @@
{
template<typename Sequence>
struct apply
- : mpl::int_<2>
+ : mpl::int_<2>
{};
};
}
Modified: sandbox/SOC/2009/fusion/libs/fusion/example/extension/triple.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/example/extension/triple.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/example/extension/triple.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -17,10 +17,8 @@
#include <boost/fusion/sequence/sequence_facade.hpp>
#include <boost/fusion/iterator/iterator_facade.hpp>
-
#include <boost/fusion/sequence/intrinsic.hpp>
#include <boost/fusion/iterator.hpp>
-
#include <boost/fusion/support/category_of.hpp>
#include <boost/mpl/int.hpp>
@@ -43,7 +41,7 @@
: fusion::iterator_facade<triple_iterator<Seq, N>, fusion::random_access_traversal_tag>
{
typedef mpl::int_<N> index;
- typedef Seq sequence_type;
+ typedef Seq seq_type;
triple_iterator(Seq& seq)
: seq_(seq) {}
@@ -129,7 +127,7 @@
struct next
{
typedef triple_iterator<
- typename It::sequence_type, It::index::value + 1> type;
+ typename It::seq_type, It::index::value + 1> type;
static type call(It const& it)
{
@@ -141,7 +139,7 @@
struct prior
{
typedef triple_iterator<
- typename It::sequence_type, It::index::value - 1> type;
+ typename It::seq_type, It::index::value - 1> type;
static type call(It const& it)
{
@@ -164,7 +162,7 @@
struct advance
{
typedef triple_iterator<
- typename It::sequence_type,
+ typename It::seq_type,
It::index::value + M::value> type;
static type call(It const& it)
Modified: sandbox/SOC/2009/fusion/libs/fusion/example/test/main.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/example/test/main.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/example/test/main.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -128,9 +128,9 @@
}
{
- vec v(0,0,0,0,0,0,0);
- vec v2=std::move(v);
- //vec v2=v;
+ fusion::vector<moveable> v(0);
+ fusion::vector<moveable> v2=std::move(v);
+ //fusion::vector<moveable> v2=v;
}
{
@@ -142,7 +142,7 @@
seq_test(make_map<int,float>(0,1.0f));
seq_test(single_view<int>(0));
- seq_test(filter_view<vector<int>&&,std::is_same<boost::mpl::_,int> >(vector<int>()));
+ seq_test(filter_view<vector<int>&&,std::is_same<boost::mpl::_1,int> >(vector<int>()));
vector<int> vec;
seq_test(iterator_range<result_of::begin<vector<int>>::type,result_of::end<vector<int>>::type>(begin(vec),end(vec)));
seq_test(joint_view<vector<int>&&,vector<int>&&>(vector<int>(),vector<int>()));
@@ -150,10 +150,5 @@
seq_test(transform_view<vector<int>&&,identity_int>(vector<int>(),identity_int()));
seq_test(reverse_view<vector<int>&&>(vector<int>()));
}
-
- {
- using namespace fusion;
- vector<moveable> m(0);
- replace(m, moveable(0), moveable(0))=replace(m, moveable(0), moveable(0));
- }
}
+
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/Jamfile
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/Jamfile (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/Jamfile 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -95,18 +95,18 @@
[ run sequence/zip_view.cpp : : : : ]
[ run sequence/zip_view2.cpp : : : : ]
-# [ run functional/fused_function_object.cpp : : : : ]
-# [ run functional/fused_procedure.cpp : : : : ]
-# [ run functional/fused.cpp : : : : ]
-# [ run functional/invoke_function_object.cpp : : : : ]
-# [ run functional/invoke_procedure.cpp : : : : ]
-# [ run functional/invoke.cpp : : : : ]
-# [ run functional/make_fused_function_object.cpp : : : : ]
-# [ run functional/make_fused_procedure.cpp : : : : ]
-# [ run functional/make_fused.cpp : : : : ]
-# [ run functional/make_unfused.cpp : : : : ]
-# [ run functional/unfused_typed.cpp : : : : ]
-# [ run functional/unfused.cpp : : : : ]
+ [ run functional/fused_function_object.cpp : : : : ]
+ [ run functional/fused_procedure.cpp : : : : ]
+ [ run functional/fused.cpp : : : : ]
+ [ run functional/invoke_function_object.cpp : : : : ]
+ [ run functional/invoke_procedure.cpp : : : : ]
+ [ run functional/invoke.cpp : : : : ]
+ [ run functional/make_fused_function_object.cpp : : : : ]
+ [ run functional/make_fused_procedure.cpp : : : : ]
+ [ run functional/make_fused.cpp : : : : ]
+ [ run functional/make_unfused.cpp : : : : ]
+ [ run functional/unfused_typed.cpp : : : : ]
+ [ run functional/unfused.cpp : : : : ]
# [ compile-fail xxx.cpp : : : : ]
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/clear.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/clear.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/clear.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -5,7 +5,8 @@
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/vector.hpp>
#include <boost/fusion/sequence/io/out.hpp>
#include <boost/fusion/sequence/comparison/equal_to.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
@@ -21,8 +22,6 @@
std::cout << tuple_close(']');
std::cout << tuple_delimiter(", ");
-/// Testing pop_back
-
{
char const* s = "Ruby";
typedef vector<int, char, double, char const*> vector_type;
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/erase_key.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/erase_key.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/erase_key.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -48,9 +48,10 @@
std::cout << map << std::endl;
BOOST_STATIC_ASSERT(result_of::size<Map>::value == 3);
- BOOST_TEST(((*find<_1>(map)).second == 1));
- BOOST_TEST(((*find<_3>(map)).second == 1.5));
- BOOST_TEST(((*find<_4>(map)).second == std::string("hello")));
+ //TODO!!!
+ //BOOST_TEST(((*find<_1>(map)).second == 1));
+ //BOOST_TEST(((*find<_3>(map)).second == 1.5));
+ //BOOST_TEST(((*find<_4>(map)).second == std::string("hello")));
}
int
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/find.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/find.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/find.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,6 +11,7 @@
#include <boost/fusion/container/map/map.hpp>
#include <boost/fusion/algorithm/query/find.hpp>
#include <boost/fusion/iterator/deref.hpp>
+#include <boost/fusion/sequence/io/out.hpp>
#include <boost/mpl/vector.hpp>
#include <string>
@@ -60,12 +61,13 @@
map_type seq(
make_pair<int>('X')
, make_pair<double>("Men"));
-
- std::cout << *boost::fusion::find<int>(seq) << std::endl;
- std::cout << *boost::fusion::find<double>(seq) << std::endl;
- BOOST_TEST((*boost::fusion::find<int>(seq)).second == 'X');
- BOOST_TEST((*boost::fusion::find<double>(seq)).second == "Men");
- BOOST_TEST(boost::fusion::find<bool>(seq) == boost::fusion::end(seq));
+
+ //TODO!!!
+ //std::cout << *boost::fusion::find<int>(seq) << std::endl;
+ //std::cout << *boost::fusion::find<double>(seq) << std::endl;
+ //BOOST_TEST((*boost::fusion::find<int>(seq)).second == 'X');
+ //BOOST_TEST((*boost::fusion::find<double>(seq)).second == "Men");
+ //BOOST_TEST(boost::fusion::find<bool>(seq) == boost::fusion::end(seq));
}
{
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/find_if.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/find_if.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/find_if.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -50,7 +50,6 @@
using boost::mpl::_;
typedef vector<int, char, X, double> mpl_vec;
- //TODO!!!
BOOST_TEST((*boost::fusion::find_if<is_same<_, X> >(mpl_vec()) == 12345));
}
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/replace_if.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/replace_if.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/replace_if.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -42,8 +42,9 @@
{
std::cout << replace_if(t1, gt3(), -456) << std::endl;
- BOOST_TEST((replace_if(t1, gt3(), -456)
- == make_vector(1, 2, -456, -456, s, -456)));
+ //TODO!!!
+ //BOOST_TEST((replace_if(t1, gt3(), -456)
+ // == make_vector(1, 2, -456, -456, s, -456)));
}
}
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/transform.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/transform.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/algorithm/transform.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -93,8 +93,8 @@
/// Testing the transform
{
- typedef range_c<int, 5, 9> sequence_type;
- sequence_type sequence;
+ typedef range_c<int, 5, 9> seq_type;
+ seq_type sequence;
std::cout << transform(sequence, square()) << std::endl;
BOOST_TEST((transform(sequence, square()) == make_vector(25, 36, 49, 64)));
}
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -16,6 +16,7 @@
#include <boost/fusion/sequence/intrinsic/at_key.hpp>
#include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
#include <boost/fusion/sequence/io/out.hpp>
+#include <boost/fusion/algorithm/transformation/erase_key.hpp>
#include <boost/fusion/container/vector/vector.hpp>
#include <boost/fusion/container/list/list.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
@@ -127,6 +128,8 @@
BOOST_TEST(at_key<ns::x_member>(p) == 5);
BOOST_TEST(at_key<ns::y_member>(p) == 3);
+
+ erase_key<ns::x_member>(p);
}
return boost::report_errors();
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/filter_view.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/filter_view.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/filter_view.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -13,6 +13,7 @@
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/adapted/mpl.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
+#include <boost/fusion/iterator/deref.hpp>
#include <boost/type_traits/is_class.hpp>
#include <boost/type_traits/is_same.hpp>
@@ -64,19 +65,6 @@
std::cout << tuple_close(']');
std::cout << tuple_delimiter(", ");
- { // Testing the static find_if (internal function)
-
- typedef vector<int, char, long, X> vector_type;
-
- vector_type v(1, 'x', 987654, X());
- typedef result_of::begin<vector_type>::type begin;
- typedef result_of::end<vector_type>::type end;
- typedef detail::static_find_if<begin, end, is_same<_, long> > filter;
-
- std::cout << *filter::call(boost::fusion::begin(v)) << std::endl;
- BOOST_TEST(*filter::call(boost::fusion::begin(v)) == 987654);
- }
-
{
typedef vector<Y, char, long, X, bool, double> vector_type;
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/joint_view.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/joint_view.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/joint_view.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -11,6 +11,7 @@
#include <boost/fusion/sequence/comparison/equal_to.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/sequence/intrinsic/at.hpp>
+#include <boost/fusion/iterator/deref.hpp>
#include <boost/mpl/vector_c.hpp>
struct X
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/transform_view.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/transform_view.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/transform_view.cpp 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -58,10 +58,10 @@
/// Testing the transform_view
{
- typedef boost::mpl::range_c<int, 5, 9> sequence_type;
- sequence_type sequence;
+ typedef boost::mpl::range_c<int, 5, 9> seq_type;
+ seq_type sequence;
square sq;
- typedef transform_view<sequence_type, square> xform_type;
+ typedef transform_view<seq_type, square> xform_type;
xform_type xform(sequence, sq);
std::cout << xform << std::endl;
Modified: sandbox/SOC/2009/fusion/project-root.jam
==============================================================================
--- sandbox/SOC/2009/fusion/project-root.jam (original)
+++ sandbox/SOC/2009/fusion/project-root.jam 2009-08-08 14:26:44 EDT (Sat, 08 Aug 2009)
@@ -6,22 +6,15 @@
import os ;
local BOOST_INCLUDES_PATH = [ os.environ BOOST_INCLUDES_PATH ] ;
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#to compile with conceptgcc you have to add this line to your user-config.jam !
-#using gcc : conceptgcc : c++ ; !
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
project
: requirements <include>.
- <toolset>gcc-conceptgcc:<include>workaround/conceptgcc
<include>$(BOOST_INCLUDES_PATH)
<toolset>gcc:<cxxflags>-std=c++0x
: build-dir ../bin
: default-build debug <link>shared <runtime-link>shared <threading>multi
;
-#build-project workaround/conceptgcc/test/mini-fusion ;
-#build-project libs/fusion/example/test ;
+build-project libs/fusion/example/test ;
#build-project libs/fusion/doc ;
#build-project libs/fusion/example/extension ;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk