Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r74325 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/date_time boost/date_time/posix_time boost/detail boost/dynamic_bitset boost/filesystem boost/function boost/functional boost/fusion boost/fusion/algorithm/iteration boost/fusion/algorithm/iteration/detail boost/fusion/algorithm/iteration/ext_ boost/fusion/algorithm/query boost/fusion/algorithm/query/detail boost/fusion/algorithm/query/ext_ boost/fusion/container/ext_ boost/fusion/container/list boost/fusion/container/list/detail boost/fusion/container/vector boost/fusion/include boost/fusion/iterator boost/fusion/iterator/detail boost/fusion/sequence boost/fusion/sequence/intrinsic boost/fusion/sequence/intrinsic/detail boost/fusion/sequence/intrinsic/ext_ boost/fusion/support boost/fusion/support/detail boost/fusion/support/ext_ boost/fusion/view/ext_ boost/fusion/view/filter_view boost/fusion/view/filter_view/detail boost/fusion/view/iterator_range boost/fusion/view/iterator_range/detail boost/fusion/view/joint_view boost/geometry boost/geometry/algorithms boost/geometry/arithmetic boost/geometry/core boost/geometry/domains boost/geometry/geometries boost/geometry/iterators boost/geometry/multi boost/geometry/policies boost/geometry/strategies boost/geometry/util boost/geometry/views boost/gil boost/graph boost/icl boost/integer boost/io boost/iostreams boost/iterator boost/locale boost/math boost/msm boost/msm/back boost/msm/front boost/msm/front/detail boost/msm/front/euml boost/msm/mpl_graph boost/numeric/ublas boost/pool boost/program_options boost/program_options/detail boost/property_tree boost/proto boost/python boost/range boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/system boost/thread boost/tr1 boost/type_traits boost/typeof boost/utility boost/uuid boost/variant boost/wave boost/xpressive doc libs libs/algorithm/string libs/array libs/array/test libs/bimap libs/config libs/date_time libs/date_time/data libs/date_time/example/gregorian libs/date_time/example/local_time libs/date_time/example/posix_time libs/date_time/example/tutorial libs/date_time/test/posix_time libs/date_time/xmldoc libs/detail libs/filesystem libs/function libs/functional libs/fusion libs/fusion/test libs/fusion/test/algorithm libs/fusion/test/algorithm/ext_ libs/fusion/test/compile_time libs/fusion/test/functional libs/fusion/test/sequence libs/fusion/test/sequence/ext_ libs/geometry libs/geometry/doc libs/geometry/doc/concept libs/geometry/doc/doxy libs/geometry/doc/generated libs/geometry/doc/html libs/geometry/doc/reference libs/geometry/doc/src libs/geometry/example libs/geometry/test libs/graph/doc libs/graph_parallel libs/icl libs/icl/doc libs/icl/doc/html libs/icl/doc/html/header/boost/icl libs/icl/test libs/icl/test/test_doc_code_ libs/integer libs/io libs/io/doc libs/iostreams libs/iterator libs/locale libs/math libs/math/doc/sf_and_dist libs/math/doc/sf_and_dist/html/math_toolkit/main_overview libs/math/test libs/mpi/build libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/numeric/ublas libs/numeric/ublas/doc libs/parameter/doc/html libs/phoenix/doc libs/phoenix/doc/examples libs/pool libs/program_options libs/program_options/test libs/property_tree libs/proto/test libs/python libs/range libs/regex libs/serialization libs/serialization/example libs/serialization/src libs/serialization/test libs/signals libs/signals2 libs/signals2/doc libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/system libs/thread libs/timer libs/tr1 libs/type_traits libs/typeof/doc libs/utility libs/utility/swap/test libs/uuid libs/wave more status tools tools/bcp tools/boostbook tools/build/v2 tools/build/v2/tools tools/inspect tools/regression tools/regression/src tools/release tools/wave
From: eric_at_[hidden]
Date: 2011-09-08 23:27:37

Next message: dnljms_at_[hidden]: "[Boost-commit] svn:boost r74326 - trunk/boost/unordered/detail"
Previous message: joel_at_[hidden]: "[Boost-commit] svn:boost r74324 - trunk/libs/spirit/example/qi/compiler_tutorial"

Author: eric_niebler
Date: 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
New Revision: 74325
URL: http://svn.boost.org/trac/boost/changeset/74325

Log:
merge [70965] [73644] [73668] [73669] [73683] [73770] [73771] [73831] [73834] [73854] [73892] [73898] [73899] [73906] [73908] [73927] [74019] [74048] [74113] from trunk to release
Added:
   branches/release/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
      - copied unchanged from r73906, /trunk/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
   branches/release/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
      - copied unchanged from r73906, /trunk/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
   branches/release/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
      - copied unchanged from r73899, /trunk/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
   branches/release/boost/fusion/algorithm/iteration/fold_fwd.hpp
      - copied unchanged from r73906, /trunk/boost/fusion/algorithm/iteration/fold_fwd.hpp
   branches/release/boost/fusion/algorithm/iteration/for_each_fwd.hpp
      - copied unchanged from r73899, /trunk/boost/fusion/algorithm/iteration/for_each_fwd.hpp
   branches/release/boost/fusion/algorithm/iteration/iter_fold_fwd.hpp
      - copied unchanged from r73906, /trunk/boost/fusion/algorithm/iteration/iter_fold_fwd.hpp
   branches/release/boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp
      - copied unchanged from r73906, /trunk/boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp
   branches/release/boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp
      - copied unchanged from r73906, /trunk/boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp
   branches/release/boost/fusion/algorithm/query/detail/segmented_find.hpp
      - copied, changed from r73892, /trunk/boost/fusion/algorithm/query/detail/segmented_find.hpp
   branches/release/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
      - copied, changed from r73892, /trunk/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
   branches/release/boost/fusion/algorithm/query/find_fwd.hpp
      - copied unchanged from r73892, /trunk/boost/fusion/algorithm/query/find_fwd.hpp
   branches/release/boost/fusion/algorithm/query/find_if_fwd.hpp
      - copied unchanged from r73892, /trunk/boost/fusion/algorithm/query/find_if_fwd.hpp
   branches/release/boost/fusion/container/list/cons_fwd.hpp
      - copied unchanged from r73854, /trunk/boost/fusion/container/list/cons_fwd.hpp
   branches/release/boost/fusion/container/list/detail/reverse_cons.hpp
      - copied, changed from r73831, /trunk/boost/fusion/container/list/detail/reverse_cons.hpp
   branches/release/boost/fusion/container/vector/vector10_fwd.hpp
      - copied unchanged from r73927, /trunk/boost/fusion/container/vector/vector10_fwd.hpp
   branches/release/boost/fusion/container/vector/vector20_fwd.hpp
      - copied unchanged from r73927, /trunk/boost/fusion/container/vector/vector20_fwd.hpp
   branches/release/boost/fusion/container/vector/vector30_fwd.hpp
      - copied unchanged from r73927, /trunk/boost/fusion/container/vector/vector30_fwd.hpp
   branches/release/boost/fusion/container/vector/vector40_fwd.hpp
      - copied unchanged from r73927, /trunk/boost/fusion/container/vector/vector40_fwd.hpp
   branches/release/boost/fusion/container/vector/vector50_fwd.hpp
      - copied unchanged from r73927, /trunk/boost/fusion/container/vector/vector50_fwd.hpp
   branches/release/boost/fusion/include/is_segmented.hpp
      - copied unchanged from r73854, /trunk/boost/fusion/include/is_segmented.hpp
   branches/release/boost/fusion/include/segmented_fold_until.hpp
      - copied unchanged from r73854, /trunk/boost/fusion/include/segmented_fold_until.hpp
   branches/release/boost/fusion/include/segmented_iterator.hpp
      - copied unchanged from r73854, /trunk/boost/fusion/include/segmented_iterator.hpp
   branches/release/boost/fusion/include/segments.hpp
      - copied unchanged from r73854, /trunk/boost/fusion/include/segments.hpp
   branches/release/boost/fusion/iterator/detail/segment_sequence.hpp
      - copied unchanged from r73854, /trunk/boost/fusion/iterator/detail/segment_sequence.hpp
   branches/release/boost/fusion/iterator/detail/segmented_equal_to.hpp
      - copied, changed from r73854, /trunk/boost/fusion/iterator/detail/segmented_equal_to.hpp
   branches/release/boost/fusion/iterator/detail/segmented_iterator.hpp
      - copied, changed from r73854, /trunk/boost/fusion/iterator/detail/segmented_iterator.hpp
   branches/release/boost/fusion/iterator/detail/segmented_next_impl.hpp
      - copied, changed from r73854, /trunk/boost/fusion/iterator/detail/segmented_next_impl.hpp
   branches/release/boost/fusion/iterator/segmented_iterator.hpp
      - copied, changed from r73831, /trunk/boost/fusion/iterator/segmented_iterator.hpp
   branches/release/boost/fusion/sequence/intrinsic/detail/
      - copied from r73831, /trunk/boost/fusion/sequence/intrinsic/detail/
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
      - copied, changed from r73831, /trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp
      - copied, changed from r73854, /trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
      - copied, changed from r73831, /trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp
      - copied, changed from r73854, /trunk/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp
      - copied, changed from r73831, /trunk/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp
   branches/release/boost/fusion/sequence/intrinsic/segments.hpp
      - copied, changed from r73831, /trunk/boost/fusion/sequence/intrinsic/segments.hpp
   branches/release/boost/fusion/sequence/intrinsic_fwd.hpp
      - copied unchanged from r73854, /trunk/boost/fusion/sequence/intrinsic_fwd.hpp
   branches/release/boost/fusion/support/detail/segmented_fold_until_impl.hpp
      - copied, changed from r73854, /trunk/boost/fusion/support/detail/segmented_fold_until_impl.hpp
   branches/release/boost/fusion/support/is_segmented.hpp
      - copied unchanged from r73831, /trunk/boost/fusion/support/is_segmented.hpp
   branches/release/boost/fusion/support/segmented_fold_until.hpp
      - copied, changed from r73854, /trunk/boost/fusion/support/segmented_fold_until.hpp
   branches/release/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp
      - copied, changed from r73854, /trunk/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp
   branches/release/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
      - copied, changed from r73831, /trunk/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
   branches/release/boost/fusion/view/iterator_range/detail/segments_impl.hpp
      - copied, changed from r73854, /trunk/boost/fusion/view/iterator_range/detail/segments_impl.hpp
   branches/release/boost/fusion/view/iterator_range/detail/size_impl.hpp
      - copied unchanged from r73644, /trunk/boost/fusion/view/iterator_range/detail/size_impl.hpp
   branches/release/boost/fusion/view/joint_view/joint_view_fwd.hpp
      - copied unchanged from r73927, /trunk/boost/fusion/view/joint_view/joint_view_fwd.hpp
   branches/release/libs/fusion/test/algorithm/segmented_find.cpp
      - copied, changed from r73834, /trunk/libs/fusion/test/algorithm/segmented_find.cpp
   branches/release/libs/fusion/test/algorithm/segmented_find_if.cpp
      - copied, changed from r73834, /trunk/libs/fusion/test/algorithm/segmented_find_if.cpp
   branches/release/libs/fusion/test/algorithm/segmented_fold.cpp
      - copied, changed from r73834, /trunk/libs/fusion/test/algorithm/segmented_fold.cpp
   branches/release/libs/fusion/test/algorithm/segmented_for_each.cpp
      - copied, changed from r73834, /trunk/libs/fusion/test/algorithm/segmented_for_each.cpp
   branches/release/libs/fusion/test/sequence/segmented_iterator_range.cpp
      - copied, changed from r73834, /trunk/libs/fusion/test/sequence/segmented_iterator_range.cpp
   branches/release/libs/fusion/test/sequence/tree.hpp
      - copied, changed from r73834, /trunk/libs/fusion/test/sequence/tree.hpp
   branches/release/libs/proto/test/flatten.cpp
      - copied unchanged from r74048, /trunk/libs/proto/test/flatten.cpp
Removed:
   branches/release/boost/fusion/algorithm/iteration/ext_/
   branches/release/boost/fusion/algorithm/query/ext_/
   branches/release/boost/fusion/container/ext_/
   branches/release/boost/fusion/sequence/intrinsic/ext_/
   branches/release/boost/fusion/support/ext_/
   branches/release/boost/fusion/view/ext_/
   branches/release/libs/fusion/test/algorithm/ext_/
   branches/release/libs/fusion/test/sequence/ext_/
   branches/release/libs/proto/test/proto_fusion.cpp
   branches/release/libs/proto/test/proto_fusion_s.cpp
Properties modified:
   branches/release/ (props changed)
   branches/release/INSTALL (props changed)
   branches/release/Jamroot (props changed)
   branches/release/LICENSE_1_0.txt (props changed)
   branches/release/boost/ (props changed)
   branches/release/boost-build.jam (props changed)
   branches/release/boost.css (props changed)
   branches/release/boost.png (props changed)
   branches/release/boost/algorithm/string/ (props changed)
   branches/release/boost/archive/ (props changed)
   branches/release/boost/array.hpp (props changed)
   branches/release/boost/bimap/ (props changed)
   branches/release/boost/concept_check.hpp (props changed)
   branches/release/boost/config/ (props changed)
   branches/release/boost/config.hpp (props changed)
   branches/release/boost/cregex.hpp (props changed)
   branches/release/boost/cstdint.hpp (props changed)
   branches/release/boost/date_time/c_time.hpp (props changed)
   branches/release/boost/date_time/date_formatting.hpp (props changed)
   branches/release/boost/date_time/filetime_functions.hpp (props changed)
   branches/release/boost/date_time/gregorian_calendar.ipp (props changed)
   branches/release/boost/date_time/posix_time/time_serialize.hpp (props changed)
   branches/release/boost/date_time/strings_from_facet.hpp (props changed)
   branches/release/boost/date_time/time_facet.hpp (props changed)
   branches/release/boost/date_time/tz_db_base.hpp (props changed)
   branches/release/boost/detail/ (props changed)
   branches/release/boost/detail/interlocked.hpp (props changed)
   branches/release/boost/dynamic_bitset/dynamic_bitset.hpp (props changed)
   branches/release/boost/filesystem/ (props changed)
   branches/release/boost/filesystem.hpp (props changed)
   branches/release/boost/function/ (props changed)
   branches/release/boost/function/function_template.hpp (props changed)
   branches/release/boost/functional/ (props changed)
   branches/release/boost/fusion/ (props changed)
   branches/release/boost/fusion/container/list/detail/build_cons.hpp (props changed)
   branches/release/boost/geometry/ (props changed)
   branches/release/boost/geometry/algorithms/ (props changed)
   branches/release/boost/geometry/arithmetic/ (props changed)
   branches/release/boost/geometry/core/ (props changed)
   branches/release/boost/geometry/domains/ (props changed)
   branches/release/boost/geometry/geometries/ (props changed)
   branches/release/boost/geometry/geometry.hpp (props changed)
   branches/release/boost/geometry/iterators/ (props changed)
   branches/release/boost/geometry/multi/ (props changed)
   branches/release/boost/geometry/policies/ (props changed)
   branches/release/boost/geometry/strategies/ (props changed)
   branches/release/boost/geometry/util/ (props changed)
   branches/release/boost/geometry/views/ (props changed)
   branches/release/boost/gil/ (props changed)
   branches/release/boost/graph/ (props changed)
   branches/release/boost/icl/ (props changed)
   branches/release/boost/integer/ (props changed)
   branches/release/boost/integer.hpp (props changed)
   branches/release/boost/integer_fwd.hpp (props changed)
   branches/release/boost/integer_traits.hpp (props changed)
   branches/release/boost/io/ (props changed)
   branches/release/boost/iostreams/ (props changed)
   branches/release/boost/iterator/ (props changed)
   branches/release/boost/iterator/iterator_facade.hpp (props changed)
   branches/release/boost/locale/ (props changed)
   branches/release/boost/locale.hpp (props changed)
   branches/release/boost/math/ (props changed)
   branches/release/boost/math_fwd.hpp (props changed)
   branches/release/boost/msm/ (props changed)
   branches/release/boost/msm/active_state_switching_policies.hpp (props changed)
   branches/release/boost/msm/back/ (props changed)
   branches/release/boost/msm/back/any_event.hpp (props changed)
   branches/release/boost/msm/back/args.hpp (props changed)
   branches/release/boost/msm/back/bind_helpers.hpp (props changed)
   branches/release/boost/msm/back/common_types.hpp (props changed)
   branches/release/boost/msm/back/copy_policies.hpp (props changed)
   branches/release/boost/msm/back/default_compile_policy.hpp (props changed)
   branches/release/boost/msm/back/dispatch_table.hpp (props changed)
   branches/release/boost/msm/back/favor_compile_time.hpp (props changed)
   branches/release/boost/msm/back/fold_to_list.hpp (props changed)
   branches/release/boost/msm/back/history_policies.hpp (props changed)
   branches/release/boost/msm/back/metafunctions.hpp (props changed)
   branches/release/boost/msm/back/mpl_graph_fsm_check.hpp (props changed)
   branches/release/boost/msm/back/no_fsm_check.hpp (props changed)
   branches/release/boost/msm/back/queue_container_circular.hpp (props changed)
   branches/release/boost/msm/back/queue_container_deque.hpp (props changed)
   branches/release/boost/msm/back/state_machine.hpp (props changed)
   branches/release/boost/msm/back/tools.hpp (props changed)
   branches/release/boost/msm/common.hpp (props changed)
   branches/release/boost/msm/front/ (props changed)
   branches/release/boost/msm/front/common_states.hpp (props changed)
   branches/release/boost/msm/front/completion_event.hpp (props changed)
   branches/release/boost/msm/front/detail/ (props changed)
   branches/release/boost/msm/front/detail/common_states.hpp (props changed)
   branches/release/boost/msm/front/detail/row2_helper.hpp (props changed)
   branches/release/boost/msm/front/euml/ (props changed)
   branches/release/boost/msm/front/euml/algorithm.hpp (props changed)
   branches/release/boost/msm/front/euml/common.hpp (props changed)
   branches/release/boost/msm/front/euml/container.hpp (props changed)
   branches/release/boost/msm/front/euml/euml.hpp (props changed)
   branches/release/boost/msm/front/euml/euml_typeof.hpp (props changed)
   branches/release/boost/msm/front/euml/guard_grammar.hpp (props changed)
   branches/release/boost/msm/front/euml/iteration.hpp (props changed)
   branches/release/boost/msm/front/euml/operator.hpp (props changed)
   branches/release/boost/msm/front/euml/phoenix_placeholders.hpp (props changed)
   branches/release/boost/msm/front/euml/querying.hpp (props changed)
   branches/release/boost/msm/front/euml/state_grammar.hpp (props changed)
   branches/release/boost/msm/front/euml/stl.hpp (props changed)
   branches/release/boost/msm/front/euml/stt_grammar.hpp (props changed)
   branches/release/boost/msm/front/euml/transformation.hpp (props changed)
   branches/release/boost/msm/front/functor_row.hpp (props changed)
   branches/release/boost/msm/front/internal_row.hpp (props changed)
   branches/release/boost/msm/front/row2.hpp (props changed)
   branches/release/boost/msm/front/state_machine_def.hpp (props changed)
   branches/release/boost/msm/front/states.hpp (props changed)
   branches/release/boost/msm/mpl_graph/ (props changed)
   branches/release/boost/msm/msm_grammar.hpp (props changed)
   branches/release/boost/msm/proto_config.hpp (props changed)
   branches/release/boost/msm/row_tags.hpp (props changed)
   branches/release/boost/numeric/ublas/ (props changed)
   branches/release/boost/numeric/ublas/functional.hpp (props changed)
   branches/release/boost/pool/ (props changed)
   branches/release/boost/program_options/ (props changed)
   branches/release/boost/program_options/detail/parsers.hpp (props changed)
   branches/release/boost/program_options/parsers.hpp (props changed)
   branches/release/boost/property_tree/ (props changed)
   branches/release/boost/python/ (props changed)
   branches/release/boost/range/ (props changed)
   branches/release/boost/regex/ (props changed)
   branches/release/boost/regex.h (props changed)
   branches/release/boost/regex.hpp (props changed)
   branches/release/boost/regex_fwd.hpp (props changed)
   branches/release/boost/serialization/ (props changed)
   branches/release/boost/signals/ (props changed)
   branches/release/boost/signals2/ (props changed)
   branches/release/boost/signals2.hpp (props changed)
   branches/release/boost/spirit/ (props changed)
   branches/release/boost/spirit/home/ (props changed)
   branches/release/boost/spirit/home/karma/ (props changed)
   branches/release/boost/spirit/home/support/attributes.hpp (props changed)
   branches/release/boost/statechart/ (props changed)
   branches/release/boost/static_assert.hpp (props changed)
   branches/release/boost/system/ (props changed)
   branches/release/boost/thread/ (props changed)
   branches/release/boost/thread.hpp (props changed)
   branches/release/boost/token_functions.hpp (props changed)
   branches/release/boost/tr1/ (props changed)
   branches/release/boost/type_traits/ (props changed)
   branches/release/boost/type_traits.hpp (props changed)
   branches/release/boost/typeof/message.hpp (props changed)
   branches/release/boost/typeof/register_functions.hpp (props changed)
   branches/release/boost/typeof/register_functions_iterate.hpp (props changed)
   branches/release/boost/typeof/typeof.hpp (props changed)
   branches/release/boost/typeof/unsupported.hpp (props changed)
   branches/release/boost/utility/ (props changed)
   branches/release/boost/utility/value_init.hpp (props changed)
   branches/release/boost/uuid/ (props changed)
   branches/release/boost/variant/ (props changed)
   branches/release/boost/version.hpp (props changed)
   branches/release/boost/wave/ (props changed)
   branches/release/boost/xpressive/ (props changed)
   branches/release/boostcpp.jam (props changed)
   branches/release/bootstrap.bat (props changed)
   branches/release/bootstrap.sh (props changed)
   branches/release/doc/ (props changed)
   branches/release/index.htm (props changed)
   branches/release/index.html (props changed)
   branches/release/libs/ (props changed)
   branches/release/libs/algorithm/string/ (props changed)
   branches/release/libs/array/ (props changed)
   branches/release/libs/array/test/array0.cpp (props changed)
   branches/release/libs/array/test/array2.cpp (props changed)
   branches/release/libs/array/test/array6.cpp (props changed)
   branches/release/libs/bimap/ (props changed)
   branches/release/libs/config/ (props changed)
   branches/release/libs/date_time/ (props changed)
   branches/release/libs/date_time/data/date_time_zonespec.csv (props changed)
   branches/release/libs/date_time/example/gregorian/days_between_new_years.cpp (props changed)
   branches/release/libs/date_time/example/gregorian/days_since_year_start.cpp (props changed)
   branches/release/libs/date_time/example/gregorian/days_till_new_year.cpp (props changed)
   branches/release/libs/date_time/example/gregorian/month_add.cpp (props changed)
   branches/release/libs/date_time/example/local_time/flight.cpp (props changed)
   branches/release/libs/date_time/example/local_time/local_date_time.cpp (props changed)
   branches/release/libs/date_time/example/posix_time/print_hours.cpp (props changed)
   branches/release/libs/date_time/example/posix_time/time_math.cpp (props changed)
   branches/release/libs/date_time/example/tutorial/io_tutorial.cpp (props changed)
   branches/release/libs/date_time/test/posix_time/testtime_facet.cpp (props changed)
   branches/release/libs/date_time/test/posix_time/testtime_input_facet.cpp (props changed)
   branches/release/libs/date_time/xmldoc/date_class.xml (props changed)
   branches/release/libs/date_time/xmldoc/usage_examples.xml (props changed)
   branches/release/libs/detail/ (props changed)
   branches/release/libs/filesystem/ (props changed)
   branches/release/libs/function/ (props changed)
   branches/release/libs/functional/ (props changed)
   branches/release/libs/fusion/ (props changed)
   branches/release/libs/geometry/ (props changed)
   branches/release/libs/geometry/doc/ (props changed)
   branches/release/libs/geometry/doc/Jamfile.v2 (props changed)
   branches/release/libs/geometry/doc/about_documentation.qbk (props changed)
   branches/release/libs/geometry/doc/acknowledgments.qbk (props changed)
   branches/release/libs/geometry/doc/compiling.qbk (props changed)
   branches/release/libs/geometry/doc/concept/ (props changed)
   branches/release/libs/geometry/doc/copyright_note_policy.txt (props changed)
   branches/release/libs/geometry/doc/design_rationale.qbk (props changed)
   branches/release/libs/geometry/doc/doxy/ (props changed)
   branches/release/libs/geometry/doc/generated/ (props changed)
   branches/release/libs/geometry/doc/geometry.qbk (props changed)
   branches/release/libs/geometry/doc/html/ (props changed)
   branches/release/libs/geometry/doc/imports.qbk (props changed)
   branches/release/libs/geometry/doc/introduction.qbk (props changed)
   branches/release/libs/geometry/doc/make_qbk.py (props changed)
   branches/release/libs/geometry/doc/matrix.qbk (props changed)
   branches/release/libs/geometry/doc/quickref.xml (props changed)
   branches/release/libs/geometry/doc/quickstart.qbk (props changed)
   branches/release/libs/geometry/doc/readme.txt (props changed)
   branches/release/libs/geometry/doc/reference/ (props changed)
   branches/release/libs/geometry/doc/reference.qbk (props changed)
   branches/release/libs/geometry/doc/src/ (props changed)
   branches/release/libs/geometry/example/ (props changed)
   branches/release/libs/geometry/index.html (props changed)
   branches/release/libs/geometry/test/ (props changed)
   branches/release/libs/graph/doc/ (props changed)
   branches/release/libs/graph_parallel/ (props changed)
   branches/release/libs/icl/ (props changed)
   branches/release/libs/icl/doc/ (props changed)
   branches/release/libs/icl/doc/html/ (props changed)
   branches/release/libs/icl/doc/html/header/boost/icl/ (props changed)
   branches/release/libs/icl/test/ (props changed)
   branches/release/libs/icl/test/test_doc_code_/ (props changed)
   branches/release/libs/integer/ (props changed)
   branches/release/libs/io/ (props changed)
   branches/release/libs/io/doc/ (props changed)
   branches/release/libs/iostreams/ (props changed)
   branches/release/libs/iterator/ (props changed)
   branches/release/libs/libraries.htm (props changed)
   branches/release/libs/locale/ (props changed)
   branches/release/libs/maintainers.txt (props changed)
   branches/release/libs/math/ (props changed)
   branches/release/libs/math/doc/sf_and_dist/faq.qbk (props changed)
   branches/release/libs/math/doc/sf_and_dist/html/math_toolkit/main_overview/faq.html (props changed)
   branches/release/libs/math/test/s_.ipp (props changed)
   branches/release/libs/mpi/build/ (props changed)
   branches/release/libs/mpl/doc/refmanual/broken-compiler-workarounds.html (props changed)
   branches/release/libs/mpl/doc/refmanual/categorized-index-concepts.html (props changed)
   branches/release/libs/mpl/doc/refmanual/cfg-no-preprocessed-headers.html (props changed)
   branches/release/libs/mpl/doc/refmanual/composition-and-argument-binding.html (props changed)
   branches/release/libs/mpl/doc/refmanual/data-types-concepts.html (props changed)
   branches/release/libs/mpl/doc/refmanual/data-types-miscellaneous.html (props changed)
   branches/release/libs/mpl/doc/refmanual/extensible-associative-sequence.html (props changed)
   branches/release/libs/mpl/doc/refmanual/inserter-class.html (props changed)
   branches/release/libs/mpl/doc/refmanual/tag-dispatched-metafunction.html (props changed)
   branches/release/libs/mpl/doc/refmanual/trivial-metafunctions-summary.html (props changed)
   branches/release/libs/mpl/doc/src/refmanual/Iterators-Iterator.rst (props changed)
   branches/release/libs/msm/ (props changed)
   branches/release/libs/numeric/ublas/ (props changed)
   branches/release/libs/numeric/ublas/doc/ (props changed)
   branches/release/libs/parameter/doc/html/index.html (props changed)
   branches/release/libs/phoenix/doc/basics.qbk (props changed)
   branches/release/libs/phoenix/doc/examples/extending_actors.qbk (props changed)
   branches/release/libs/phoenix/doc/organisation.qbk (props changed)
   branches/release/libs/pool/ (props changed)
   branches/release/libs/program_options/ (props changed)
   branches/release/libs/program_options/test/parsers_test.cpp (props changed)
   branches/release/libs/property_tree/ (props changed)
   branches/release/libs/python/ (props changed)
   branches/release/libs/range/ (props changed)
   branches/release/libs/regex/ (props changed)
   branches/release/libs/serialization/ (props changed)
   branches/release/libs/serialization/example/ (props changed)
   branches/release/libs/serialization/src/ (props changed)
   branches/release/libs/serialization/test/test_diamond_complex.cpp (props changed)
   branches/release/libs/signals/ (props changed)
   branches/release/libs/signals2/ (props changed)
   branches/release/libs/signals2/doc/ (props changed)
   branches/release/libs/spirit/ (props changed)
   branches/release/libs/spirit/classic/example/ (props changed)
   branches/release/libs/spirit/doc/ (props changed)
   branches/release/libs/spirit/example/ (props changed)
   branches/release/libs/spirit/phoenix/ (props changed)
   branches/release/libs/spirit/test/ (props changed)
   branches/release/libs/spirit/test/qi/optional.cpp (props changed)
   branches/release/libs/statechart/ (props changed)
   branches/release/libs/static_assert/ (props changed)
   branches/release/libs/system/ (props changed)
   branches/release/libs/thread/ (props changed)
   branches/release/libs/timer/ (props changed)
   branches/release/libs/tr1/ (props changed)
   branches/release/libs/type_traits/ (props changed)
   branches/release/libs/typeof/doc/typeof.qbk (props changed)
   branches/release/libs/utility/ (props changed)
   branches/release/libs/utility/assert.html (props changed)
   branches/release/libs/utility/assert_test.cpp (props changed)
   branches/release/libs/utility/swap.html (props changed)
   branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
   branches/release/libs/utility/value_init.htm (props changed)
   branches/release/libs/utility/value_init_test.cpp (props changed)
   branches/release/libs/uuid/ (props changed)
   branches/release/libs/wave/ (props changed)
   branches/release/more/ (props changed)
   branches/release/rst.css (props changed)
   branches/release/status/ (props changed)
   branches/release/status/Jamfile.v2 (props changed)
   branches/release/status/expected_results.xml (props changed)
   branches/release/status/explicit-failures-markup.xml (props changed)
   branches/release/status/explicit-failures.xsd (props changed)
   branches/release/tools/ (props changed)
   branches/release/tools/bcp/ (props changed)
   branches/release/tools/boostbook/ (props changed)
   branches/release/tools/build/v2/ (props changed)
   branches/release/tools/build/v2/tools/mpi.jam (props changed)
   branches/release/tools/inspect/ (props changed)
   branches/release/tools/regression/ (props changed)
   branches/release/tools/regression/src/library_status.cpp (props changed)
   branches/release/tools/release/ (props changed)
   branches/release/tools/wave/ (props changed)
Text files modified:
   branches/release/boost/fusion/algorithm/iteration/accumulate.hpp | 1
   branches/release/boost/fusion/algorithm/iteration/detail/fold.hpp | 85 +++++++++--
   branches/release/boost/fusion/algorithm/iteration/detail/for_each.hpp | 12 +
   branches/release/boost/fusion/algorithm/iteration/fold.hpp | 2
   branches/release/boost/fusion/algorithm/iteration/for_each.hpp | 14 -
   branches/release/boost/fusion/algorithm/iteration/iter_fold.hpp | 1
   branches/release/boost/fusion/algorithm/iteration/reverse_fold.hpp | 1
   branches/release/boost/fusion/algorithm/iteration/reverse_iter_fold.hpp | 1
   branches/release/boost/fusion/algorithm/query/detail/find_if.hpp | 36 ++++-
   branches/release/boost/fusion/algorithm/query/detail/segmented_find.hpp | 66 +++-----
   branches/release/boost/fusion/algorithm/query/detail/segmented_find_if.hpp | 68 +++------
   branches/release/boost/fusion/algorithm/query/find.hpp | 35 ++--
   branches/release/boost/fusion/algorithm/query/find_if.hpp | 36 ++--
   branches/release/boost/fusion/container/list/cons.hpp | 3
   branches/release/boost/fusion/container/list/detail/reverse_cons.hpp | 6
   branches/release/boost/fusion/container/vector/vector10.hpp | 3
   branches/release/boost/fusion/container/vector/vector20.hpp | 1
   branches/release/boost/fusion/container/vector/vector30.hpp | 1
   branches/release/boost/fusion/container/vector/vector40.hpp | 1
   branches/release/boost/fusion/container/vector/vector50.hpp | 1
   branches/release/boost/fusion/container/vector/vector_fwd.hpp | 5
   branches/release/boost/fusion/iterator.hpp | 1
   branches/release/boost/fusion/iterator/detail/segmented_equal_to.hpp | 18 --
   branches/release/boost/fusion/iterator/detail/segmented_iterator.hpp | 74 +++++++++-
   branches/release/boost/fusion/iterator/detail/segmented_next_impl.hpp | 16 +-
   branches/release/boost/fusion/iterator/segmented_iterator.hpp | 5
   branches/release/boost/fusion/sequence/intrinsic.hpp | 1
   branches/release/boost/fusion/sequence/intrinsic/at.hpp | 1
   branches/release/boost/fusion/sequence/intrinsic/at_key.hpp | 1
   branches/release/boost/fusion/sequence/intrinsic/back.hpp | 1
   branches/release/boost/fusion/sequence/intrinsic/begin.hpp | 15 +
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp | 27 ++-
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp | 72 ++++------
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp | 22 +-
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp | 16 +-
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp | 46 ++---
   branches/release/boost/fusion/sequence/intrinsic/empty.hpp | 1
   branches/release/boost/fusion/sequence/intrinsic/end.hpp | 15 +
   branches/release/boost/fusion/sequence/intrinsic/front.hpp | 1
   branches/release/boost/fusion/sequence/intrinsic/has_key.hpp | 1
   branches/release/boost/fusion/sequence/intrinsic/segments.hpp | 13 +
   branches/release/boost/fusion/sequence/intrinsic/size.hpp | 16 ++
   branches/release/boost/fusion/sequence/intrinsic/value_at.hpp | 1
   branches/release/boost/fusion/sequence/intrinsic/value_at_key.hpp | 1
   branches/release/boost/fusion/support.hpp | 1
   branches/release/boost/fusion/support/detail/segmented_fold_until_impl.hpp | 274 +++++++++++++++++++--------------------
   branches/release/boost/fusion/support/segmented_fold_until.hpp | 51 ++++--
   branches/release/boost/fusion/view/filter_view/detail/next_impl.hpp | 2
   branches/release/boost/fusion/view/filter_view/filter_view_iterator.hpp | 2
   branches/release/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp | 6
   branches/release/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp | 234 +++++++++++----------------------
   branches/release/boost/fusion/view/iterator_range/detail/segments_impl.hpp | 4
   branches/release/boost/fusion/view/iterator_range/iterator_range.hpp | 4
   branches/release/boost/fusion/view/joint_view/joint_view.hpp | 7
   branches/release/boost/proto/fusion.hpp | 32 ----
   branches/release/libs/fusion/test/Jamfile | 19 --
   branches/release/libs/fusion/test/algorithm/erase_key.cpp | 4
   branches/release/libs/fusion/test/algorithm/fold.hpp | 12
   branches/release/libs/fusion/test/algorithm/segmented_find.cpp | 14 +-
   branches/release/libs/fusion/test/algorithm/segmented_find_if.cpp | 16 +-
   branches/release/libs/fusion/test/algorithm/segmented_fold.cpp | 5
   branches/release/libs/fusion/test/algorithm/segmented_for_each.cpp | 4
   branches/release/libs/fusion/test/algorithm/transform.cpp | 26 +-
   branches/release/libs/fusion/test/compile_time/vector_intrinsic.cpp | 20 +-
   branches/release/libs/fusion/test/functional/invoke.cpp | 10
   branches/release/libs/fusion/test/functional/invoke_function_object.cpp | 8
   branches/release/libs/fusion/test/functional/invoke_procedure.cpp | 2
   branches/release/libs/fusion/test/functional/make_fused.cpp | 2
   branches/release/libs/fusion/test/functional/make_fused_function_object.cpp | 2
   branches/release/libs/fusion/test/functional/make_fused_procedure.cpp | 2
   branches/release/libs/fusion/test/functional/make_unfused.cpp | 8
   branches/release/libs/fusion/test/sequence/adapt_adt.cpp | 19 +-
   branches/release/libs/fusion/test/sequence/adapt_adt_named.cpp | 6
   branches/release/libs/fusion/test/sequence/adapt_assoc_adt.cpp | 14 +-
   branches/release/libs/fusion/test/sequence/adapt_assoc_adt_named.cpp | 14 +-
   branches/release/libs/fusion/test/sequence/adapt_assoc_struct.cpp | 16 +-
   branches/release/libs/fusion/test/sequence/adapt_assoc_struct_named.cpp | 14 +-
   branches/release/libs/fusion/test/sequence/adapt_assoc_tpl_adt.cpp | 14 +-
   branches/release/libs/fusion/test/sequence/adapt_assoc_tpl_struct.cpp | 14 +-
   branches/release/libs/fusion/test/sequence/adapt_struct.cpp | 12
   branches/release/libs/fusion/test/sequence/adapt_struct_named.cpp | 12
   branches/release/libs/fusion/test/sequence/adapt_tpl_adt.cpp | 4
   branches/release/libs/fusion/test/sequence/adapt_tpl_struct.cpp | 10
   branches/release/libs/fusion/test/sequence/adt_attribute_proxy.cpp | 36 ++--
   branches/release/libs/fusion/test/sequence/as_map.cpp | 2
   branches/release/libs/fusion/test/sequence/as_set.cpp | 2
   branches/release/libs/fusion/test/sequence/boost_tuple.cpp | 4
   branches/release/libs/fusion/test/sequence/define_assoc_struct.cpp | 14 +-
   branches/release/libs/fusion/test/sequence/define_assoc_tpl_struct.cpp | 14 +-
   branches/release/libs/fusion/test/sequence/define_struct.cpp | 10
   branches/release/libs/fusion/test/sequence/define_tpl_struct.cpp | 10
   branches/release/libs/fusion/test/sequence/filter_view.cpp | 14 +-
   branches/release/libs/fusion/test/sequence/iterator.hpp | 56 ++++----
   branches/release/libs/fusion/test/sequence/iterator_range.cpp | 22 +-
   branches/release/libs/fusion/test/sequence/joint_view.cpp | 18 +-
   branches/release/libs/fusion/test/sequence/map.cpp | 18 +-
   branches/release/libs/fusion/test/sequence/misc.hpp | 6
   branches/release/libs/fusion/test/sequence/reverse_view.cpp | 12
   branches/release/libs/fusion/test/sequence/segmented_iterator_range.cpp | 23 +-
   branches/release/libs/fusion/test/sequence/set.cpp | 18 +-
   branches/release/libs/fusion/test/sequence/single_view.cpp | 2
   branches/release/libs/fusion/test/sequence/std_pair.cpp | 4
   branches/release/libs/fusion/test/sequence/swap.cpp | 2
   branches/release/libs/fusion/test/sequence/tree.hpp | 49 +-----
   branches/release/libs/fusion/test/sequence/value_at.hpp | 2
   branches/release/libs/fusion/test/sequence/vector_n.cpp | 32 ++--
   branches/release/libs/fusion/test/sequence/zip_view_ignore.cpp | 14 +-
   branches/release/libs/proto/test/Jamfile.v2 | 4
   108 files changed, 1025 insertions(+), 1027 deletions(-)

Modified: branches/release/boost/fusion/algorithm/iteration/accumulate.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/iteration/accumulate.hpp (original)
+++ branches/release/boost/fusion/algorithm/iteration/accumulate.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,7 @@
#if !defined(FUSION_ACCUMULATE_09172005_1032)
#define FUSION_ACCUMULATE_09172005_1032

+#include <boost/fusion/algorithm/iteration/accumulate_fwd.hpp>
#include <boost/fusion/algorithm/iteration/fold.hpp>

namespace boost { namespace fusion

Modified: branches/release/boost/fusion/algorithm/iteration/detail/fold.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/iteration/detail/fold.hpp (original)
+++ branches/release/boost/fusion/algorithm/iteration/detail/fold.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -15,6 +15,7 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/empty.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/value_of.hpp>
@@ -347,53 +348,73 @@
 type;
 };

- template<int SeqSize, typename StateRef, typename It0, typename F>
+ template<int SeqSize, typename StateRef, typename Seq, typename F>
 struct BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME,_impl)
 {
 typedef typename
 BOOST_PP_CAT(
 result_of_first_unrolled,BOOST_FUSION_FOLD_NAME)<
 StateRef
- , BOOST_FUSION_FOLD_IMPL_FIRST_IT_META_TRANSFORM(It0)
+ , BOOST_FUSION_FOLD_IMPL_FIRST_IT_META_TRANSFORM(
+ typename result_of::BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION<Seq>::type
+ )
 , F
 , SeqSize
>::type
 type;

 static type
- call(StateRef state, It0 const& it0, F f)
+ call(StateRef state, Seq& seq, F f)
 {
- return BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<
- type
- , SeqSize
- >::call(state,BOOST_FUSION_FOLD_IMPL_FIRST_IT_TRANSFORM(it0),f);
+ typedef
+ BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<
+ type
+ , SeqSize
+ >
+ unrolled_impl;
+
+ return unrolled_impl::call(
+ state,
+ BOOST_FUSION_FOLD_IMPL_FIRST_IT_TRANSFORM(
+ fusion::BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION(seq)),
+ f);
 }
 };

- template<typename StateRef, typename It0, typename F>
- struct BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME,_impl)<0,StateRef,It0,F>
+ template<typename StateRef, typename Seq, typename F>
+ struct BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME,_impl)<0,StateRef,Seq,F>
 {
 typedef StateRef type;

 static StateRef
- call(StateRef state, It0 const&, F)
+ call(StateRef state, Seq&, F)
 {
 return static_cast<StateRef>(state);
 }
 };
+
+ template<typename Seq, typename State, typename F, bool IsSegmented>
+ struct BOOST_PP_CAT(result_of_, BOOST_FUSION_FOLD_NAME)
+ : BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME,_impl)<
+ result_of::size<Seq>::value
+ , typename add_reference<
+ typename add_const<State>::type
+ >::type
+ , Seq
+ , F
+ >
+ {};
 }

 namespace result_of
 {
 template<typename Seq, typename State, typename F>
 struct BOOST_FUSION_FOLD_NAME
- : detail::BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME,_impl)<
- size<Seq>::value
- , typename add_reference<
- typename add_const<State>::type
- >::type
- , typename BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION<Seq>::type
+ : detail::BOOST_PP_CAT(result_of_, BOOST_FUSION_FOLD_NAME)<
+ Seq
+ , State
 , F
+ , traits::is_segmented<Seq>::type::value
>
 {};
 }
@@ -408,7 +429,7 @@
 {
 return result_of::BOOST_FUSION_FOLD_NAME<Seq,State const,F>::call(
 state,
- fusion::BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION(seq),
+ seq,
 f);
 }

@@ -422,7 +443,35 @@
 {
 return result_of::BOOST_FUSION_FOLD_NAME<Seq const,State const,F>::call(
 state,
- fusion::BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION(seq),
+ seq,
+ f);
+ }
+
+ template<typename Seq, typename State, typename F>
+ inline typename result_of::BOOST_FUSION_FOLD_NAME<
+ Seq
+ , State const
+ , F
+ >::type
+ BOOST_FUSION_FOLD_NAME(Seq& seq, State& state, F f)
+ {
+ return result_of::BOOST_FUSION_FOLD_NAME<Seq,State,F>::call(
+ state,
+ seq,
+ f);
+ }
+
+ template<typename Seq, typename State, typename F>
+ inline typename result_of::BOOST_FUSION_FOLD_NAME<
+ Seq const
+ , State const
+ , F
+ >::type
+ BOOST_FUSION_FOLD_NAME(Seq const& seq, State& state, F f)
+ {
+ return result_of::BOOST_FUSION_FOLD_NAME<Seq const,State,F>::call(
+ state,
+ seq,
 f);
 }
}}

Modified: branches/release/boost/fusion/algorithm/iteration/detail/for_each.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/iteration/detail/for_each.hpp (original)
+++ branches/release/boost/fusion/algorithm/iteration/detail/for_each.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -13,6 +13,7 @@
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/distance.hpp>
+#include <boost/fusion/support/category_of.hpp>
#include <boost/mpl/bool.hpp>

namespace boost { namespace fusion {
@@ -36,7 +37,7 @@

 template <typename Sequence, typename F, typename Tag>
 inline void
- for_each(Sequence& seq, F const& f, Tag)
+ for_each_dispatch(Sequence& seq, F const& f, Tag)
 {
 detail::for_each_linear(
 fusion::begin(seq)
@@ -117,12 +118,19 @@

 template <typename Sequence, typename F>
 inline void
- for_each(Sequence& seq, F const& f, random_access_traversal_tag)
+ for_each_dispatch(Sequence& seq, F const& f, random_access_traversal_tag)
 {
 typedef typename result_of::begin<Sequence>::type begin;
 typedef typename result_of::end<Sequence>::type end;
 for_each_unrolled<result_of::distance<begin, end>::type::value>::call(fusion::begin(seq), f);
 }
+
+ template <typename Sequence, typename F>
+ inline void
+ for_each(Sequence& seq, F const& f, mpl::false_) // unsegmented implementation
+ {
+ detail::for_each_dispatch(seq, f, typename traits::category_of<Sequence>::type());
+ }
}}}

Modified: branches/release/boost/fusion/algorithm/iteration/fold.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/iteration/fold.hpp (original)
+++ branches/release/boost/fusion/algorithm/iteration/fold.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -10,6 +10,8 @@
#ifndef BOOST_FUSION_ALGORITHM_ITERATION_FOLD_HPP
#define BOOST_FUSION_ALGORITHM_ITERATION_FOLD_HPP

+#include <boost/fusion/algorithm/iteration/fold_fwd.hpp>
#include <boost/fusion/algorithm/iteration/detail/fold.hpp>
+#include <boost/fusion/algorithm/iteration/detail/segmented_fold.hpp>

#endif

Modified: branches/release/boost/fusion/algorithm/iteration/for_each.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/iteration/for_each.hpp (original)
+++ branches/release/boost/fusion/algorithm/iteration/for_each.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -9,11 +9,11 @@
#define BOOST_FUSION_FOR_EACH_20070527_0943

#include <boost/fusion/algorithm/iteration/detail/for_each.hpp>
+#include <boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp>
+#include <boost/fusion/support/is_segmented.hpp>

-#include <boost/fusion/support/category_of.hpp>
-
-namespace boost { namespace fusion {
-
+namespace boost { namespace fusion
+{
 namespace result_of
 {
 template <typename Sequence, typename F>
@@ -23,20 +23,18 @@
 };
 }

- struct random_access_traversal_tag;
-
 template <typename Sequence, typename F>
 inline void
 for_each(Sequence& seq, F const& f)
 {
- detail::for_each(seq, f, typename traits::category_of<Sequence>::type());
+ detail::for_each(seq, f, typename traits::is_segmented<Sequence>::type());
 }

 template <typename Sequence, typename F>
 inline void
 for_each(Sequence const& seq, F const& f)
 {
- detail::for_each(seq, f, typename traits::category_of<Sequence>::type());
+ detail::for_each(seq, f, typename traits::is_segmented<Sequence>::type());
 }
}}

Modified: branches/release/boost/fusion/algorithm/iteration/iter_fold.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/iteration/iter_fold.hpp (original)
+++ branches/release/boost/fusion/algorithm/iteration/iter_fold.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -10,6 +10,7 @@

#define BOOST_FUSION_ITER_FOLD

+#include <boost/fusion/algorithm/iteration/iter_fold_fwd.hpp>
#include <boost/fusion/algorithm/iteration/detail/fold.hpp>

#undef BOOST_FUSION_ITER_FOLD

Modified: branches/release/boost/fusion/algorithm/iteration/reverse_fold.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/iteration/reverse_fold.hpp (original)
+++ branches/release/boost/fusion/algorithm/iteration/reverse_fold.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -10,6 +10,7 @@

#define BOOST_FUSION_REVERSE_FOLD

+#include <boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp>
#include <boost/fusion/algorithm/iteration/detail/fold.hpp>

#undef BOOST_FUSION_REVERSE_FOLD

Modified: branches/release/boost/fusion/algorithm/iteration/reverse_iter_fold.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/iteration/reverse_iter_fold.hpp (original)
+++ branches/release/boost/fusion/algorithm/iteration/reverse_iter_fold.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -11,6 +11,7 @@
#define BOOST_FUSION_REVERSE_FOLD
#define BOOST_FUSION_ITER_FOLD

+#include <boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp>
#include <boost/fusion/algorithm/iteration/detail/fold.hpp>

#undef BOOST_FUSION_REVERSE_FOLD

Modified: branches/release/boost/fusion/algorithm/query/detail/find_if.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/query/detail/find_if.hpp (original)
+++ branches/release/boost/fusion/algorithm/query/detail/find_if.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -9,19 +9,18 @@
#if !defined(FUSION_FIND_IF_05052005_1107)
#define FUSION_FIND_IF_05052005_1107

-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/mpl/lambda.hpp>
#include <boost/mpl/apply.hpp>
+#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/identity.hpp>
+#include <boost/mpl/lambda.hpp>
+#include <boost/mpl/or.hpp>
+#include <boost/fusion/iterator/advance.hpp>
+#include <boost/fusion/iterator/distance.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/iterator/advance.hpp>
-#include <boost/fusion/iterator/distance.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/identity.hpp>

namespace boost { namespace fusion {
 struct random_access_traversal_tag;
@@ -222,10 +221,31 @@

 template <typename Iterator>
 static type
- call(Iterator const& iter)
+ iter_call(Iterator const& iter)
 {
 return choose_call(iter, typename traits::category_of<Iterator>::type());
 }
+
+ template <typename Sequence>
+ static type
+ call(Sequence& seq)
+ {
+ return iter_call(fusion::begin(seq));
+ }
+ };
+
+ template <typename Sequence, typename Pred>
+ struct result_of_find_if
+ {
+ typedef
+ static_find_if<
+ typename result_of::begin<Sequence>::type
+ , typename result_of::end<Sequence>::type
+ , Pred
+ >
+ filter;
+
+ typedef typename filter::type type;
 };
}}}

Copied: branches/release/boost/fusion/algorithm/query/detail/segmented_find.hpp (from r73892, /trunk/boost/fusion/algorithm/query/detail/segmented_find.hpp)
==============================================================================
--- /trunk/boost/fusion/algorithm/query/detail/segmented_find.hpp (original)
+++ branches/release/boost/fusion/algorithm/query/detail/segmented_find.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,7 +7,8 @@
#if !defined(BOOST_FUSION_SEGMENTED_FIND_HPP_INCLUDED)
#define BOOST_FUSION_SEGMENTED_FIND_HPP_INCLUDED

-#include <boost/type_traits/remove_const.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
#include <boost/fusion/algorithm/query/find_fwd.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
@@ -18,63 +19,46 @@
 template <typename T>
 struct segmented_find_fun
 {
- template <typename Sig>
- struct result;
-
- template <typename This, typename Sequence, typename State, typename Context>
- struct result<This(Sequence&, State&, Context&)>
+ template <typename Sequence, typename State, typename Context>
+ struct apply
 {
 typedef
 typename result_of::find<Sequence, T>::type
 iterator_type;

 typedef
- typename result_of::make_segmented_iterator<
+ typename result_of::equal_to<
 iterator_type
- , typename remove_const<Context>::type
+ , typename result_of::end<Sequence>::type
>::type
- segmented_iterator_type;
+ continue_type;

 typedef
- typename mpl::if_<
- result_of::equal_to<
+ typename mpl::eval_if<
+ continue_type
+ , mpl::identity<State>
+ , result_of::make_segmented_iterator<
 iterator_type
- , typename result_of::end<Sequence>::type
+ , Context
>
- , fusion::result<typename remove_const<State>::type, continue_>, // NOT FOUND
- fusion::result<segmented_iterator_type, break_> // FOUND
>::type
 type;
- };
-
- template <typename Sequence, typename State, typename Context>
- typename result<segmented_find_fun(Sequence&, State const&, Context const&)>::type
- operator()(Sequence& seq, State const&state, Context const& context) const
- {
- typedef
- typename result_of::equal_to<
- typename result_of::find<Sequence, T>::type
- , typename result_of::end<Sequence>::type
- >::type
- not_found;

- return call(seq, state, context, not_found());
- }
+ static type call(Sequence& seq, State const&state, Context const& context, segmented_find_fun)
+ {
+ return call_impl(seq, state, context, continue_type());
+ }

- private:
- template <typename Sequence, typename State, typename Context>
- typename result<segmented_find_fun(Sequence&, State const&, Context const&)>::type
- call(Sequence&, State const&state, Context const&, mpl::true_) const
- {
- return state;
- }
+ static type call_impl(Sequence&, State const&state, Context const&, mpl::true_)
+ {
+ return state;
+ }

- template <typename Sequence, typename State, typename Context>
- typename result<segmented_find_fun(Sequence&, State const&, Context const&)>::type
- call(Sequence& seq, State const&, Context const& context, mpl::false_) const
- {
- return fusion::make_segmented_iterator(fusion::find<T>(seq), context);
- }
+ static type call_impl(Sequence& seq, State const&, Context const& context, mpl::false_)
+ {
+ return fusion::make_segmented_iterator(fusion::find<T>(seq), context);
+ }
+ };
 };

 template <typename Sequence, typename T>

Copied: branches/release/boost/fusion/algorithm/query/detail/segmented_find_if.hpp (from r73892, /trunk/boost/fusion/algorithm/query/detail/segmented_find_if.hpp)
==============================================================================
--- /trunk/boost/fusion/algorithm/query/detail/segmented_find_if.hpp (original)
+++ branches/release/boost/fusion/algorithm/query/detail/segmented_find_if.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,9 +7,8 @@
#if !defined(BOOST_FUSION_SEGMENTED_FIND_IF_HPP_INCLUDED)
#define BOOST_FUSION_SEGMENTED_FIND_IF_HPP_INCLUDED

-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/remove_const.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
#include <boost/fusion/algorithm/query/find_if_fwd.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
@@ -20,63 +19,46 @@
 template <typename Pred>
 struct segmented_find_if_fun
 {
- template <typename Sig>
- struct result;
-
- template <typename This, typename Sequence, typename State, typename Context>
- struct result<This(Sequence&, State&, Context&)>
+ template <typename Sequence, typename State, typename Context>
+ struct apply
 {
 typedef
 typename result_of::find_if<Sequence, Pred>::type
 iterator_type;

 typedef
- typename result_of::make_segmented_iterator<
+ typename result_of::equal_to<
 iterator_type
- , typename remove_const<Context>::type
+ , typename result_of::end<Sequence>::type
>::type
- segmented_iterator_type;
+ continue_type;

 typedef
- typename mpl::if_<
- result_of::equal_to<
+ typename mpl::eval_if<
+ continue_type
+ , mpl::identity<State>
+ , result_of::make_segmented_iterator<
 iterator_type
- , typename result_of::end<Sequence>::type
+ , Context
>
- , fusion::result<typename remove_const<State>::type, continue_>, // NOT FOUND
- fusion::result<segmented_iterator_type, break_> // FOUND
>::type
 type;
- };
-
- template <typename Sequence, typename State, typename Context>
- typename result<segmented_find_if_fun(Sequence&, State const&, Context const&)>::type
- operator()(Sequence& seq, State const& state, Context const& context) const
- {
- typedef
- typename result_of::equal_to<
- typename result_of::find_if<Sequence, Pred>::type
- , typename result_of::end<Sequence>::type
- >::type
- not_found;

- return call(seq, state, context, not_found());
- }
+ static type call(Sequence& seq, State const&state, Context const& context, segmented_find_if_fun)
+ {
+ return call_impl(seq, state, context, continue_type());
+ }

- private:
- template <typename Sequence, typename State, typename Context>
- typename result<segmented_find_if_fun(Sequence&, State const&, Context const&)>::type
- call(Sequence&, State const& state, Context const&, mpl::true_) const
- {
- return state;
- }
+ static type call_impl(Sequence&, State const&state, Context const&, mpl::true_)
+ {
+ return state;
+ }

- template <typename Sequence, typename State, typename Context>
- typename result<segmented_find_if_fun(Sequence&, State const&, Context const&)>::type
- call(Sequence& seq, State const&, Context const& context, mpl::false_) const
- {
- return fusion::make_segmented_iterator(fusion::find_if<Pred>(seq), context);
- }
+ static type call_impl(Sequence& seq, State const&, Context const& context, mpl::false_)
+ {
+ return fusion::make_segmented_iterator(fusion::find_if<Pred>(seq), context);
+ }
+ };
 };

 template <typename Sequence, typename Pred>

Modified: branches/release/boost/fusion/algorithm/query/find.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/query/find.hpp (original)
+++ branches/release/boost/fusion/algorithm/query/find.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -1,5 +1,6 @@
/*=============================================================================
 Copyright (c) 2001-2006 Joel de Guzman
+ Copyright (c) 2011 Eric Niebler

 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)
@@ -7,13 +8,15 @@
#if !defined(FUSION_FIND_05052005_1107)
#define FUSION_FIND_05052005_1107

+#include <boost/fusion/algorithm/query/find_if_fwd.hpp>
#include <boost/fusion/algorithm/query/detail/find_if.hpp>
-#include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/algorithm/query/detail/segmented_find.hpp>
#include <boost/fusion/iterator/key_of.hpp>
#include <boost/fusion/iterator/value_of.hpp>
#include <boost/fusion/support/category_of.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
#include <boost/mpl/if.hpp>
+#include <boost/mpl/placeholders.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/type_traits/is_const.hpp>
#include <boost/utility/enable_if.hpp>
@@ -22,17 +25,14 @@
{
 namespace result_of
 {
- template <
- typename Sequence
- , typename T
- >
+ template <typename Sequence, typename T>
 struct find
- {
- typedef
- detail::static_find_if<
- typename result_of::begin<Sequence>::type
- , typename result_of::end<Sequence>::type
- , is_same<
+ : mpl::if_<
+ traits::is_segmented<Sequence>
+ , detail::result_of_segmented_find<Sequence, T>
+ , detail::result_of_find_if<
+ Sequence,
+ is_same<
 typename mpl::if_<
 traits::is_associative<Sequence>
 , key_of<mpl::_1>
@@ -41,10 +41,8 @@
 , T
>
>
- filter;
-
- typedef typename filter::type type;
- };
+ >::type
+ {};
 }

 template <typename T, typename Sequence>
@@ -56,7 +54,7 @@
 find(Sequence& seq)
 {
 typedef typename result_of::find<Sequence, T>::filter filter;
- return filter::call(fusion::begin(seq));
+ return filter::call(seq);
 }

 template <typename T, typename Sequence>
@@ -64,9 +62,8 @@
 find(Sequence const& seq)
 {
 typedef typename result_of::find<Sequence const, T>::filter filter;
- return filter::call(fusion::begin(seq));
+ return filter::call(seq);
 }
}}

#endif
-

Modified: branches/release/boost/fusion/algorithm/query/find_if.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/query/find_if.hpp (original)
+++ branches/release/boost/fusion/algorithm/query/find_if.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -1,5 +1,6 @@
/*=============================================================================
 Copyright (c) 2001-2006 Joel de Guzman
+ Copyright (c) 2011 Eric Niebler

 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)
@@ -7,15 +8,17 @@
#if !defined(FUSION_FIND_IF_05052005_1108)
#define FUSION_FIND_IF_05052005_1108

+#include <boost/fusion/algorithm/query/find_if_fwd.hpp>
#include <boost/fusion/algorithm/query/detail/find_if.hpp>
-#include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/algorithm/query/detail/segmented_find_if.hpp>
#include <boost/fusion/iterator/value_of.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_const.hpp>
#include <boost/mpl/bind.hpp>
#include <boost/mpl/lambda.hpp>
+#include <boost/mpl/placeholders.hpp>
#include <boost/mpl/quote.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_const.hpp>

namespace boost { namespace fusion
{
@@ -23,20 +26,18 @@
 {
 template <typename Sequence, typename Pred>
 struct find_if
- {
- typedef
- detail::static_find_if<
- typename result_of::begin<Sequence>::type
- , typename result_of::end<Sequence>::type
- , mpl::bind1<
+ : mpl::if_<
+ traits::is_segmented<Sequence>
+ , detail::result_of_segmented_find_if<Sequence, Pred>
+ , detail::result_of_find_if<
+ Sequence,
+ mpl::bind1<
 typename mpl::lambda<Pred>::type
- , mpl::bind1<mpl::quote1<value_of>,mpl::_1>
+ , mpl::bind1<mpl::quote1<value_of>, mpl::_1>
>
>
- filter;
-
- typedef typename filter::type type;
- };
+ >::type
+ {};
 }

 template <typename Pred, typename Sequence>
@@ -48,7 +49,7 @@
 find_if(Sequence& seq)
 {
 typedef typename result_of::find_if<Sequence, Pred>::filter filter;
- return filter::call(fusion::begin(seq));
+ return filter::call(seq);
 }

 template <typename Pred, typename Sequence>
@@ -56,9 +57,8 @@
 find_if(Sequence const& seq)
 {
 typedef typename result_of::find_if<Sequence const, Pred>::filter filter;
- return filter::call(fusion::begin(seq));
+ return filter::call(seq);
 }
}}

#endif
-

Modified: branches/release/boost/fusion/container/list/cons.hpp
==============================================================================
--- branches/release/boost/fusion/container/list/cons.hpp (original)
+++ branches/release/boost/fusion/container/list/cons.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -8,6 +8,7 @@
#if !defined(FUSION_CONS_07172005_0843)
#define FUSION_CONS_07172005_0843

+#include <boost/fusion/container/list/cons_fwd.hpp>
#include <boost/fusion/support/detail/access.hpp>
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
@@ -55,7 +56,7 @@
 }
 };

- template <typename Car, typename Cdr = nil>
+ template <typename Car, typename Cdr /*= nil*/>
 struct cons : sequence_base<cons<Car, Cdr> >
 {
 typedef mpl::int_<Cdr::size::value+1> size;

Copied: branches/release/boost/fusion/container/list/detail/reverse_cons.hpp (from r73831, /trunk/boost/fusion/container/list/detail/reverse_cons.hpp)
==============================================================================
--- /trunk/boost/fusion/container/list/detail/reverse_cons.hpp (original)
+++ branches/release/boost/fusion/container/list/detail/reverse_cons.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,8 +7,7 @@
#if !defined(BOOST_FUSION_REVERSE_CONS_HPP_INCLUDED)
#define BOOST_FUSION_REVERSE_CONS_HPP_INCLUDED

-#include <boost/fusion/container/list/cons.hpp>
-#include <boost/fusion/container/generation/make_cons.hpp>
+#include <boost/fusion/container/list/cons_fwd.hpp>

namespace boost { namespace fusion { namespace detail
{
@@ -24,7 +23,8 @@

 static type call(cons<Car, Cdr> const &cons, State const &state = State())
 {
- return impl::call(cons.cdr, fusion::make_cons(cons.car, state));
+ typedef fusion::cons<Car, State> cdr_type;
+ return impl::call(cons.cdr, cdr_type(cons.car, state));
 }
 };

Modified: branches/release/boost/fusion/container/vector/vector10.hpp
==============================================================================
--- branches/release/boost/fusion/container/vector/vector10.hpp (original)
+++ branches/release/boost/fusion/container/vector/vector10.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,7 @@
#if !defined(FUSION_VECTOR10_05042005_0257)
#define FUSION_VECTOR10_05042005_0257

+#include <boost/fusion/container/vector/vector10_fwd.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/detail/access.hpp>
#include <boost/fusion/iterator/next.hpp>
@@ -39,7 +40,7 @@
 struct fusion_sequence_tag;
 struct random_access_traversal_tag;

- template <typename Dummy = void>
+ template <typename Dummy>
 struct vector0 : sequence_base<vector0<Dummy> >
 {
 typedef mpl::vector0<> types;

Modified: branches/release/boost/fusion/container/vector/vector20.hpp
==============================================================================
--- branches/release/boost/fusion/container/vector/vector20.hpp (original)
+++ branches/release/boost/fusion/container/vector/vector20.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,7 @@
#if !defined(FUSION_VECTOR20_05052005_0205)
#define FUSION_VECTOR20_05052005_0205

+#include <boost/fusion/container/vector/vector20_fwd.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/detail/access.hpp>
#include <boost/fusion/iterator/next.hpp>

Modified: branches/release/boost/fusion/container/vector/vector30.hpp
==============================================================================
--- branches/release/boost/fusion/container/vector/vector30.hpp (original)
+++ branches/release/boost/fusion/container/vector/vector30.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,7 @@
#if !defined(FUSION_VECTOR30_05052005_0206)
#define FUSION_VECTOR30_05052005_0206

+#include <boost/fusion/container/vector/vector30_fwd.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/detail/access.hpp>
#include <boost/fusion/iterator/next.hpp>

Modified: branches/release/boost/fusion/container/vector/vector40.hpp
==============================================================================
--- branches/release/boost/fusion/container/vector/vector40.hpp (original)
+++ branches/release/boost/fusion/container/vector/vector40.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,7 @@
#if !defined(FUSION_VECTOR40_05052005_0208)
#define FUSION_VECTOR40_05052005_0208

+#include <boost/fusion/container/vector/vector40_fwd.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/detail/access.hpp>
#include <boost/fusion/iterator/next.hpp>

Modified: branches/release/boost/fusion/container/vector/vector50.hpp
==============================================================================
--- branches/release/boost/fusion/container/vector/vector50.hpp (original)
+++ branches/release/boost/fusion/container/vector/vector50.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,7 @@
#if !defined(FUSION_VECTOR50_05052005_0207)
#define FUSION_VECTOR50_05052005_0207

+#include <boost/fusion/container/vector/vector50_fwd.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/detail/access.hpp>
#include <boost/fusion/iterator/next.hpp>

Modified: branches/release/boost/fusion/container/vector/vector_fwd.hpp
==============================================================================
--- branches/release/boost/fusion/container/vector/vector_fwd.hpp (original)
+++ branches/release/boost/fusion/container/vector/vector_fwd.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -10,6 +10,11 @@

#include <boost/fusion/container/vector/limits.hpp>
#include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
+#include <boost/fusion/container/vector/vector10_fwd.hpp>
+#include <boost/fusion/container/vector/vector20_fwd.hpp>
+#include <boost/fusion/container/vector/vector30_fwd.hpp>
+#include <boost/fusion/container/vector/vector40_fwd.hpp>
+#include <boost/fusion/container/vector/vector50_fwd.hpp>

namespace boost { namespace fusion
{

Modified: branches/release/boost/fusion/iterator.hpp
==============================================================================
--- branches/release/boost/fusion/iterator.hpp (original)
+++ branches/release/boost/fusion/iterator.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -8,6 +8,7 @@
#define FUSION_ITERATOR_10022005_0559

#include <boost/fusion/iterator/iterator_facade.hpp>
+#include <boost/fusion/iterator/segmented_iterator.hpp>
#include <boost/fusion/iterator/advance.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/distance.hpp>

Copied: branches/release/boost/fusion/iterator/detail/segmented_equal_to.hpp (from r73854, /trunk/boost/fusion/iterator/detail/segmented_equal_to.hpp)
==============================================================================
--- /trunk/boost/fusion/iterator/detail/segmented_equal_to.hpp (original)
+++ branches/release/boost/fusion/iterator/detail/segmented_equal_to.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -20,27 +20,17 @@
 template <typename Stack1, typename Stack2>
 struct segmented_equal_to
 : mpl::and_<
- result_of::equal_to<
- typename Stack1::car_type::begin_type,
- typename Stack2::car_type::begin_type
- >,
 segmented_equal_to<
 typename Stack1::cdr_type,
 typename Stack2::cdr_type
>
+ , result_of::equal_to<
+ typename Stack1::car_type::begin_type,
+ typename Stack2::car_type::begin_type
+ >
>
 {};

- template <typename Stack1>
- struct segmented_equal_to<Stack1, fusion::nil>
- : mpl::false_
- {};
-
- template <typename Stack2>
- struct segmented_equal_to<fusion::nil, Stack2>
- : mpl::false_
- {};
-
 template <>
 struct segmented_equal_to<fusion::nil, fusion::nil>
 : mpl::true_

Copied: branches/release/boost/fusion/iterator/detail/segmented_iterator.hpp (from r73854, /trunk/boost/fusion/iterator/detail/segmented_iterator.hpp)
==============================================================================
--- /trunk/boost/fusion/iterator/detail/segmented_iterator.hpp (original)
+++ branches/release/boost/fusion/iterator/detail/segmented_iterator.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,11 +7,15 @@
#if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED)
#define BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED

+#include <boost/mpl/bool.hpp>
#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/iterator/iterator_facade.hpp>
#include <boost/fusion/iterator/deref.hpp>
+#include <boost/fusion/iterator/deref_data.hpp>
+#include <boost/fusion/iterator/key_of.hpp>
+#include <boost/fusion/iterator/value_of.hpp>
+#include <boost/fusion/iterator/value_of_data.hpp>
#include <boost/fusion/iterator/detail/segmented_equal_to.hpp>
-#include <boost/fusion/container/list/detail/reverse_cons.hpp>

namespace boost { namespace fusion
{
@@ -26,7 +30,7 @@
 // A segmented iterator wraps a "context", which is a cons list
 // of ranges, the frontmost is range over values and the rest
 // are ranges over internal segments.
- template<typename Context>
+ template <typename Context>
 struct segmented_iterator
 : iterator_facade<segmented_iterator<Context>, forward_traversal_tag>
 {
@@ -38,7 +42,7 @@
 //{
 // return deref(begin(car(it.context)))
 //}
- template<typename It>
+ template <typename It>
 struct deref
 {
 typedef
@@ -53,17 +57,73 @@
 }
 };

+ //auto deref_data(it)
+ //{
+ // return deref_data(begin(car(it.context)))
+ //}
+ template <typename It>
+ struct deref_data
+ {
+ typedef
+ typename result_of::deref_data<
+ typename It::context_type::car_type::begin_type
+ >::type
+ type;
+
+ static type call(It const& it)
+ {
+ return fusion::deref_data(it.context.car.first);
+ }
+ };
+
+ //auto key_of(it)
+ //{
+ // return key_of(begin(car(it.context)))
+ //}
+ template <typename It>
+ struct key_of
+ : result_of::key_of<typename It::context_type::car_type::begin_type>
+ {};
+
+ //auto value_of(it)
+ //{
+ // return value_of(begin(car(it.context)))
+ //}
+ template <typename It>
+ struct value_of
+ : result_of::value_of<typename It::context_type::car_type::begin_type>
+ {};
+
+ //auto value_of_data(it)
+ //{
+ // return value_of_data(begin(car(it.context)))
+ //}
+ template <typename It>
+ struct value_of_data
+ : result_of::value_of_data<typename It::context_type::car_type::begin_type>
+ {};
+
 // Compare all the segment iterators in each stack, starting with
 // the bottom-most.
- template<typename It1, typename It2>
+ template <
+ typename It1
+ , typename It2
+ , int Size1 = It1::context_type::size::value
+ , int Size2 = It2::context_type::size::value
+ >
 struct equal_to
+ : mpl::false_
+ {};
+
+ template <typename It1, typename It2, int Size>
+ struct equal_to<It1, It2, Size, Size>
 : detail::segmented_equal_to<
- typename detail::reverse_cons<typename It1::context_type>::type,
- typename detail::reverse_cons<typename It2::context_type>::type
+ typename It1::context_type
+ , typename It2::context_type
>
 {};

- template<typename It>
+ template <typename It>
 struct next
 {
 typedef detail::segmented_next_impl<typename It::context_type> impl;

Copied: branches/release/boost/fusion/iterator/detail/segmented_next_impl.hpp (from r73854, /trunk/boost/fusion/iterator/detail/segmented_next_impl.hpp)
==============================================================================
--- /trunk/boost/fusion/iterator/detail/segmented_next_impl.hpp (original)
+++ branches/release/boost/fusion/iterator/detail/segmented_next_impl.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -24,7 +24,7 @@

 namespace detail
 {
- template <typename Range, typename Stack>
+ template <typename Sequence, typename Stack>
 struct segmented_begin_impl;

 //bool is_invalid(stack)
@@ -40,7 +40,7 @@
>
 {};

- ////Advance the first iterator in the range at the
+ ////Advance the first iterator in the seq at the
 ////top of a stack of iterator ranges. Return the
 ////new stack.
 //auto pop_front_car(stack)
@@ -126,7 +126,7 @@

 template <
 typename Stack,
- typename Range =
+ typename Sequence =
 typename remove_reference<
 typename add_const<
 typename result_of::deref<
@@ -135,7 +135,7 @@
>::type
>::type,
 typename Result =
- typename segmented_begin_impl<Range, Stack>::type,
+ typename segmented_begin_impl<Sequence, Stack>::type,
 bool IsInvalid =
 is_invalid<Result>::value>
 struct segmented_next_impl_recurse2
@@ -149,14 +149,14 @@
 }
 };

- template <typename Stack, typename Range, typename Result>
- struct segmented_next_impl_recurse2<Stack, Range, Result, false>
+ template <typename Stack, typename Sequence, typename Result>
+ struct segmented_next_impl_recurse2<Stack, Sequence, Result, false>
 {
 typedef Result type;

 static type call(Stack const & stack)
 {
- return segmented_begin_impl<Range, Stack>::call(*stack.car.first, stack);
+ return segmented_begin_impl<Sequence, Stack>::call(*stack.car.first, stack);
 }
 };

@@ -210,7 +210,7 @@

 //auto segmented_next_impl(stack)
 //{
- // // car(stack) is a range of values, not a range of segments
+ // // car(stack) is a seq of values, not a seq of segments
 // auto next = pop_front_car(stack);
 // if (is_invalid(next))
 // return segmented_next_impl_recurse(cdr(next));

Copied: branches/release/boost/fusion/iterator/segmented_iterator.hpp (from r73831, /trunk/boost/fusion/iterator/segmented_iterator.hpp)
==============================================================================
--- /trunk/boost/fusion/iterator/segmented_iterator.hpp (original)
+++ branches/release/boost/fusion/iterator/segmented_iterator.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,9 @@
#if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_HPP_INCLUDED)
#define BOOST_FUSION_SEGMENTED_ITERATOR_HPP_INCLUDED

-#include <boost/fusion/iterator/segmented_iterator/segmented_iterator.hpp>
+#include <boost/fusion/iterator/detail/segmented_iterator.hpp>
+#include <boost/fusion/iterator/detail/segmented_next_impl.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/container/list/cons.hpp>

#endif

Modified: branches/release/boost/fusion/sequence/intrinsic.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -14,6 +14,7 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/front.hpp>
#include <boost/fusion/sequence/intrinsic/has_key.hpp>
+#include <boost/fusion/sequence/intrinsic/segments.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/intrinsic/value_at.hpp>
#include <boost/fusion/sequence/intrinsic/at_key.hpp>

Modified: branches/release/boost/fusion/sequence/intrinsic/at.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/at.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/at.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -9,6 +9,7 @@

#include <boost/mpl/int.hpp>
#include <boost/type_traits/is_const.hpp>
+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/support/tag_of.hpp>
#include <boost/fusion/support/detail/access.hpp>

Modified: branches/release/boost/fusion/sequence/intrinsic/at_key.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/at_key.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/at_key.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -9,6 +9,7 @@
#define BOOST_FUSION_AT_KEY_20060304_1755

#include <boost/type_traits/is_const.hpp>
+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/algorithm/query/find.hpp>
#include <boost/fusion/iterator/deref_data.hpp>
#include <boost/fusion/support/tag_of.hpp>

Modified: branches/release/boost/fusion/sequence/intrinsic/back.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/back.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/back.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,7 @@
#if !defined(FUSION_BACK_09162005_0350)
#define FUSION_BACK_09162005_0350

+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/iterator/prior.hpp>
#include <boost/fusion/iterator/deref.hpp>

Modified: branches/release/boost/fusion/sequence/intrinsic/begin.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/begin.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/begin.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,9 +7,14 @@
#if !defined(FUSION_BEGIN_04052005_1132)
#define FUSION_BEGIN_04052005_1132

+#include <boost/blank.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/support/tag_of.hpp>
#include <boost/fusion/support/is_sequence.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp>

namespace boost { namespace fusion
{
@@ -26,7 +31,13 @@
 struct begin_impl
 {
 template <typename Sequence>
- struct apply;
+ struct apply
+ : mpl::if_<
+ traits::is_segmented<Sequence>
+ , detail::segmented_begin<Sequence>
+ , blank
+ >::type
+ {};
 };

 template <>

Copied: branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp (from r73831, /trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp)
==============================================================================
--- /trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,34 +7,37 @@
#if !defined(BOOST_FUSION_SEGMENTED_BEGIN_HPP_INCLUDED)
#define BOOST_FUSION_SEGMENTED_BEGIN_HPP_INCLUDED

-#include <boost/fusion/iterator/segmented_iterator/detail/begin_impl.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp>
+#include <boost/fusion/iterator/segmented_iterator.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/sequence/intrinsic/empty.hpp>
+#include <boost/fusion/container/list/cons.hpp>

-namespace boost { namespace fusion
+namespace boost { namespace fusion { namespace detail
{
- template<typename Context>
- struct segmented_iterator;
-
- //auto segmented_begin( rng )
+ //auto segmented_begin( seq )
 //{
- // return make_segmented_iterator( segmented_begin_impl( rng, nil ) );
+ // return make_segmented_iterator( segmented_begin_impl( seq, nil ) );
 //}

- template<typename Range>
+ template <typename Sequence, typename Nil = fusion::nil>
 struct segmented_begin
 {
 typedef
 segmented_iterator<
- typename detail::segmented_begin_impl<Range, fusion::nil>::type
+ typename segmented_begin_impl<Sequence, Nil>::type
>
 type;

- static type call(Range & rng)
+ static type call(Sequence& seq)
 {
 return type(
- detail::segmented_begin_impl<Range, fusion::nil>::call(rng, fusion::nil()));
+ segmented_begin_impl<Sequence, Nil>::call(seq, Nil()));
 }
 };

-}}
+}}}

#endif

Copied: branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp (from r73854, /trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp)
==============================================================================
--- /trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -24,83 +24,67 @@
{
 struct segmented_begin_fun
 {
- template <typename Sig>
- struct result;
-
- template <typename This, typename Range, typename State, typename Context>
- struct result<This(Range&, State&, Context&)>
+ template <typename Sequence, typename State, typename Context>
+ struct apply
 {
 typedef
 iterator_range<
- typename fusion::result_of::begin<Range>::type,
- typename fusion::result_of::end<Range>::type
+ typename fusion::result_of::begin<Sequence>::type
+ , typename fusion::result_of::end<Sequence>::type
>
 range_type;

- typedef
- fusion::result<
- cons<range_type, typename remove_const<Context>::type>,
- fusion::break_
- >
- type;
- };
+ typedef cons<range_type, Context> type;
+ typedef mpl::false_ continue_type;

- template <typename Range, typename State, typename Context>
- typename result<segmented_begin_fun(Range&, State const&, Context const&)>::type
- operator()(Range& rng, State const&, Context const& context) const
- {
- typedef
- iterator_range<
- typename fusion::result_of::begin<Range>::type,
- typename fusion::result_of::end<Range>::type
- >
- range_type;
-
- return cons<range_type, Context>(range_type(fusion::begin(rng), fusion::end(rng)), context);
- }
+ static type call(Sequence& seq, State const&, Context const& context, segmented_begin_fun)
+ {
+ return type(range_type(fusion::begin(seq), fusion::end(seq)), context);
+ }
+ };
 };

- template <typename Range, typename Stack, bool IsSegmented = traits::is_segmented<Range>::type::value>
+ template <typename Sequence, typename Stack, bool IsSegmented = traits::is_segmented<Sequence>::type::value>
 struct segmented_begin_impl_aux
 {
 typedef
- segmented_end_impl<Range, Stack>
+ segmented_end_impl<Sequence, Stack>
 end_impl;

 typedef
 segmented_fold_until_impl<
- Range,
- result<typename end_impl::type, continue_>,
- Stack,
- segmented_begin_fun
+ Sequence
+ , typename end_impl::type
+ , Stack
+ , segmented_begin_fun
>
 fold_impl;

- typedef typename fold_impl::type::value_type type;
+ typedef typename fold_impl::type type;

- static type call(Range& rng, Stack const& stack)
+ static type call(Sequence& seq, Stack const& stack)
 {
- return fold_impl::call(rng, end_impl::call(rng, stack), stack, segmented_begin_fun()).value;
+ return fold_impl::call(seq, end_impl::call(seq, stack), stack, segmented_begin_fun());
 }
 };

- template <typename Range, typename Stack>
- struct segmented_begin_impl_aux<Range, Stack, false>
+ template <typename Sequence, typename Stack>
+ struct segmented_begin_impl_aux<Sequence, Stack, false>
 {
- typedef typename result_of::begin<Range>::type begin_type;
- typedef typename result_of::end<Range>::type end_type;
+ typedef typename result_of::begin<Sequence>::type begin_type;
+ typedef typename result_of::end<Sequence>::type end_type;
 typedef iterator_range<begin_type, end_type> pair_type;
 typedef cons<pair_type, Stack> type;

- static type call(Range& rng, Stack stack)
+ static type call(Sequence& seq, Stack stack)
 {
- return type(pair_type(fusion::begin(rng), fusion::end(rng)), stack);
+ return type(pair_type(fusion::begin(seq), fusion::end(seq)), stack);
 }
 };

- template <typename Range, typename Stack>
+ template <typename Sequence, typename Stack>
 struct segmented_begin_impl
- : segmented_begin_impl_aux<Range, Stack>
+ : segmented_begin_impl_aux<Sequence, Stack>
 {};

}}}

Copied: branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp (from r73831, /trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp)
==============================================================================
--- /trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,35 +7,33 @@
#if !defined(BOOST_FUSION_SEGMENTED_END_HPP_INCLUDED)
#define BOOST_FUSION_SEGMENTED_END_HPP_INCLUDED

+#include <boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp>
+#include <boost/fusion/iterator/segmented_iterator.hpp>
#include <boost/fusion/container/list/cons.hpp>
-#include <boost/fusion/iterator/segmented_iterator/detail/end_impl.hpp>

-namespace boost { namespace fusion
+namespace boost { namespace fusion { namespace detail
{
- template<typename Context>
- struct segmented_iterator;
-
- //auto segmented_end( rng )
+ //auto segmented_end( seq )
 //{
- // return make_segmented_iterator( segmented_end_impl( rng ) );
+ // return make_segmented_iterator( segmented_end_impl( seq ) );
 //}

- template<typename Range>
+ template <typename Sequence, typename Nil = fusion::nil>
 struct segmented_end
 {
 typedef
 segmented_iterator<
- typename detail::segmented_end_impl<Range, fusion::nil>::type
+ typename segmented_end_impl<Sequence, Nil>::type
>
 type;

- static type call(Range & rng)
+ static type call(Sequence & seq)
 {
 return type(
- detail::segmented_end_impl<Range, fusion::nil>::call(rng, fusion::nil()));
+ segmented_end_impl<Sequence, Nil>::call(seq, Nil()));
 }
 };

-}}
+}}}

#endif

Copied: branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp (from r73854, /trunk/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp)
==============================================================================
--- /trunk/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -22,23 +22,23 @@

namespace boost { namespace fusion { namespace detail
{
- //auto segmented_end_impl( rng, stack )
+ //auto segmented_end_impl( seq, stack )
 //{
- // assert(is_segmented(rng));
- // auto it = end(segments(rng));
+ // assert(is_segmented(seq));
+ // auto it = end(segments(seq));
 // return cons(iterator_range(it, it), stack);
 //}

- template<typename Range, typename Stack>
+ template <typename Sequence, typename Stack>
 struct segmented_end_impl
 {
- BOOST_MPL_ASSERT((traits::is_segmented<Range>));
+ BOOST_MPL_ASSERT((traits::is_segmented<Sequence>));

 typedef
 typename result_of::end<
 typename remove_reference<
 typename add_const<
- typename result_of::segments<Range>::type
+ typename result_of::segments<Sequence>::type
>::type
>::type
>::type
@@ -47,9 +47,9 @@
 typedef iterator_range<end_type, end_type> pair_type;
 typedef cons<pair_type, Stack> type;

- static type call(Range & rng, Stack stack)
+ static type call(Sequence & seq, Stack stack)
 {
- end_type end = fusion::end(fusion::segments(rng));
+ end_type end = fusion::end(fusion::segments(seq));
 return type(pair_type(end, end), stack);
 }
 };

Copied: branches/release/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp (from r73831, /trunk/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp)
==============================================================================
--- /trunk/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -13,48 +13,42 @@
#include <boost/mpl/plus.hpp>
#include <boost/mpl/size_t.hpp>
#include <boost/mpl/placeholders.hpp>
+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/mpl/begin.hpp>
#include <boost/fusion/mpl/end.hpp>
-#include <boost/fusion/mpl/clear.hpp>
-#include <boost/fusion/mpl/push_front.hpp>
-#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/intrinsic/segments.hpp>
#include <boost/fusion/support/is_segmented.hpp>

-namespace boost { namespace fusion
+namespace boost { namespace fusion { namespace detail
{
 ///////////////////////////////////////////////////////////////////////////
 // calculates the size of any segmented data structure.
 template<typename Sequence>
 struct segmented_size;

- namespace detail
- {
- ///////////////////////////////////////////////////////////////////////////
- template<typename Sequence, bool IsSegmented = traits::is_segmented<Sequence>::value>
- struct segmented_size_impl
- : mpl::fold<
- typename remove_reference<
- typename add_const<
- typename result_of::segments<Sequence>::type
- >::type
- >::type,
- mpl::size_t<0>,
- mpl::plus<mpl::_1, segmented_size<mpl::_2> >
+ ///////////////////////////////////////////////////////////////////////////
+ template<typename Sequence, bool IsSegmented = traits::is_segmented<Sequence>::value>
+ struct segmented_size_impl
+ : mpl::fold<
+ typename remove_reference<
+ typename add_const<
+ typename result_of::segments<Sequence>::type
+ >::type
>::type
- {};
+ , mpl::size_t<0>
+ , mpl::plus<mpl::_1, segmented_size<remove_reference<mpl::_2> > >
+ >::type
+ {};

- template<typename Sequence>
- struct segmented_size_impl<Sequence, false>
- : result_of::size<Sequence>::type
- {};
- }
+ template<typename Sequence>
+ struct segmented_size_impl<Sequence, false>
+ : result_of::size<Sequence>::type
+ {};

 template<typename Sequence>
 struct segmented_size
- : detail::segmented_size_impl<Sequence>
+ : segmented_size_impl<Sequence>
 {};

-}}
+}}}

#endif

Modified: branches/release/boost/fusion/sequence/intrinsic/empty.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/empty.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/empty.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,7 @@
#if !defined(FUSION_EMPTY_09162005_0335)
#define FUSION_EMPTY_09162005_0335

+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/fusion/support/tag_of.hpp>

Modified: branches/release/boost/fusion/sequence/intrinsic/end.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/end.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/end.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,9 +7,14 @@
#if !defined(FUSION_END_04052005_1141)
#define FUSION_END_04052005_1141

+#include <boost/blank.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/support/tag_of.hpp>
#include <boost/fusion/support/is_sequence.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_end.hpp>

namespace boost { namespace fusion
{
@@ -26,7 +31,13 @@
 struct end_impl
 {
 template <typename Sequence>
- struct apply;
+ struct apply
+ : mpl::if_<
+ traits::is_segmented<Sequence>
+ , detail::segmented_end<Sequence>
+ , blank
+ >::type
+ {};
 };

 template <>

Modified: branches/release/boost/fusion/sequence/intrinsic/front.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/front.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/front.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,7 @@
#if !defined(FUSION_FRONT_09162005_0343)
#define FUSION_FRONT_09162005_0343

+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/mpl/bool.hpp>

Modified: branches/release/boost/fusion/sequence/intrinsic/has_key.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/has_key.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/has_key.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,7 @@
#if !defined(FUSION_HAS_KEY_09232005_1454)
#define FUSION_HAS_KEY_09232005_1454

+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/support/tag_of.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/algorithm/query/find.hpp>

Copied: branches/release/boost/fusion/sequence/intrinsic/segments.hpp (from r73831, /trunk/boost/fusion/sequence/intrinsic/segments.hpp)
==============================================================================
--- /trunk/boost/fusion/sequence/intrinsic/segments.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/segments.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,9 @@
#if !defined(BOOST_FUSION_SEGMENTS_04052005_1141)
#define BOOST_FUSION_SEGMENTS_04052005_1141

+#include <boost/type_traits/is_const.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/support/tag_of.hpp>

namespace boost { namespace fusion
@@ -50,15 +53,19 @@
 }

 template <typename Sequence>
- typename result_of::segments<Sequence>::type
- segments(Sequence & seq)
+ inline typename
+ lazy_disable_if<
+ is_const<Sequence>
+ , result_of::segments<Sequence>
+ >::type
+ segments(Sequence& seq)
 {
 typedef typename traits::tag_of<Sequence>::type tag_type;
 return extension::segments_impl<tag_type>::template apply<Sequence>::call(seq);
 }

 template <typename Sequence>
- typename result_of::segments<Sequence const>::type
+ inline typename result_of::segments<Sequence const>::type
 segments(Sequence const& seq)
 {
 typedef typename traits::tag_of<Sequence const>::type tag_type;

Modified: branches/release/boost/fusion/sequence/intrinsic/size.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/size.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/size.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,8 +7,13 @@
#if !defined(FUSION_SIZE_05052005_0214)
#define FUSION_SIZE_05052005_0214

+#include <boost/utility/enable_if.hpp>
+#include <boost/mpl/if.hpp>
#include <boost/mpl/int.hpp>
+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/support/tag_of.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_size.hpp>

namespace boost { namespace fusion
{
@@ -24,8 +29,17 @@
 template <typename Tag>
 struct size_impl
 {
+ template<typename Sequence>
+ struct unsegmented_size : Sequence::size {};
+
 template <typename Sequence>
- struct apply : Sequence::size {};
+ struct apply
+ : mpl::if_<
+ traits::is_segmented<Sequence>
+ , detail::segmented_size<Sequence>
+ , unsegmented_size<Sequence>
+ >::type
+ {};
 };

 template <>

Modified: branches/release/boost/fusion/sequence/intrinsic/value_at.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/value_at.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/value_at.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -8,6 +8,7 @@
#define FUSION_VALUE_AT_05052005_0229

#include <boost/mpl/int.hpp>
+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/support/tag_of.hpp>

namespace boost { namespace fusion

Modified: branches/release/boost/fusion/sequence/intrinsic/value_at_key.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/value_at_key.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/value_at_key.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -9,6 +9,7 @@
#define FUSION_VALUE_AT_KEY_05052005_0229

#include <boost/mpl/int.hpp>
+#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/iterator/value_of_data.hpp>
#include <boost/fusion/algorithm/query/find.hpp>
#include <boost/fusion/support/tag_of.hpp>

Modified: branches/release/boost/fusion/support.hpp
==============================================================================
--- branches/release/boost/fusion/support.hpp (original)
+++ branches/release/boost/fusion/support.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -10,6 +10,7 @@
#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/support/is_iterator.hpp>
#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
#include <boost/fusion/support/iterator_base.hpp>
#include <boost/fusion/support/pair.hpp>
#include <boost/fusion/support/sequence_base.hpp>

Copied: branches/release/boost/fusion/support/detail/segmented_fold_until_impl.hpp (from r73854, /trunk/boost/fusion/support/detail/segmented_fold_until_impl.hpp)
==============================================================================
--- /trunk/boost/fusion/support/detail/segmented_fold_until_impl.hpp (original)
+++ branches/release/boost/fusion/support/detail/segmented_fold_until_impl.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -17,15 +17,14 @@
#include <boost/fusion/support/void.hpp>
#include <boost/fusion/container/list/cons_fwd.hpp>
#include <boost/fusion/sequence/intrinsic_fwd.hpp>
-#include <boost/fusion/iterator/value_of.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/support/is_segmented.hpp>
#include <boost/fusion/sequence/intrinsic/segments.hpp>

-// fun(rng, state, context)
-// rng: a non-segmented range
+// fun(seq, state, context)
+// seq: a non-segmented range
// state: the state of the fold so far
// context: the path to the current range
//
@@ -46,8 +45,8 @@
 {
 typedef
 iterator_range<
- Cur,
- typename result_of::end<
+ Cur
+ , typename result_of::end<
 typename remove_reference<
 typename add_const<
 typename result_of::deref<
@@ -75,74 +74,35 @@
 return type(cons<range_type, Context>(range_type(cur, fusion::end(*context.car.first)), context));
 }

- typedef mpl::true_ continue_;
- typedef mpl::false_ break_;
-
- template <typename Value, typename Continue>
- struct result
- {
- typedef Value value_type;
- typedef Continue continue_type;
-
- result(Value const& val)
- : value(val)
- {}
-
- value_type value;
- };
-
- template <typename Continue>
- struct result<void, Continue>
- {
- typedef void_ value_type;
- typedef Continue continue_type;
-
- result(void_ const&)
- {}
-
- value_type value;
- };
-
- template <typename Value>
- result<Value, continue_> make_result_continue(Value const& val)
- {
- return result<Value, continue_>(val);
- }
-
- template <typename Value>
- result<Value, break_> make_result_break(Value const& val)
- {
- return result<Value, break_>(val);
- }
-
 namespace detail
 {
 template <
- typename Begin,
- typename End,
- typename State,
- typename Context,
- typename Fun,
- bool IsEmpty = result_of::empty<
- typename result_of::value_of<Begin>::type
- >::type::value>
+ typename Begin
+ , typename End
+ , typename State
+ , typename Context
+ , typename Fun
+ , bool IsEmpty
+ >
 struct segmented_fold_until_iterate_skip_empty;

 template <
- typename Begin,
- typename End,
- typename State,
- typename Context,
- typename Fun,
- bool IsDone = result_of::equal_to<Begin, End>::type::value>
+ typename Begin
+ , typename End
+ , typename State
+ , typename Context
+ , typename Fun
+ , bool IsDone = result_of::equal_to<Begin, End>::type::value
+ >
 struct segmented_fold_until_iterate;

 template <
- typename Range,
- typename State,
- typename Context,
- typename Fun,
- bool IsSegmented = traits::is_segmented<Range>::type::value>
+ typename Sequence
+ , typename State
+ , typename Context
+ , typename Fun
+ , bool IsSegmented = traits::is_segmented<Sequence>::type::value
+ >
 struct segmented_fold_until_impl;

 template <typename Segments, typename State, typename Context, typename Fun>
@@ -170,65 +130,67 @@
 // return segmented_iterator(push_context(cur, end, context));
 //}
 //
- //auto segmented_fold_until_impl(rng, state, context, fun)
+ //auto segmented_fold_until_impl(seq, state, context, fun)
 //{
- // if (is_segmented(rng))
+ // if (is_segmented(seq))
 // {
- // segmented_fold_until_on_segments(segments(rng), state, context, fun);
+ // segmented_fold_until_on_segments(segments(seq), state, context, fun);
 // }
 // else
 // {
- // return fun(rng, state, context);
+ // return fun(seq, state, context);
 // }
 //}

 template <
- typename Range,
- typename State,
- typename Context,
- typename Fun,
- bool IsSegmented>
+ typename Sequence
+ , typename State
+ , typename Context
+ , typename Fun
+ , bool IsSegmented
+ >
 struct segmented_fold_until_impl
 {
 typedef
 segmented_fold_until_on_segments<
 typename remove_reference<
 typename add_const<
- typename result_of::segments<Range>::type
+ typename result_of::segments<Sequence>::type
>::type
- >::type,
- State,
- Context,
- Fun
+ >::type
+ , State
+ , Context
+ , Fun
>
 impl;

 typedef typename impl::type type;
+ typedef typename impl::continue_type continue_type;

- static type call(Range& rng, State const& state, Context const& context, Fun const& fun)
+ static type call(Sequence& seq, State const& state, Context const& context, Fun const& fun)
 {
- return impl::call(fusion::segments(rng), state, context, fun);
+ return impl::call(fusion::segments(seq), state, context, fun);
 }
 };

 template <
- typename Range,
- typename State,
- typename Context,
- typename Fun>
- struct segmented_fold_until_impl<Range, State, Context, Fun, false>
+ typename Sequence
+ , typename State
+ , typename Context
+ , typename Fun
+ >
+ struct segmented_fold_until_impl<Sequence, State, Context, Fun, false>
 {
 typedef
- typename boost::result_of<Fun(
- Range&,
- typename add_reference<typename add_const<typename State::value_type>::type>::type,
- Context const&
- )>::type
- type;
-
- static type call(Range& rng, State const& state, Context const& context, Fun const& fun)
+ typename Fun::template apply<Sequence, State, Context>
+ apply_type;
+
+ typedef typename apply_type::type type;
+ typedef typename apply_type::continue_type continue_type;
+
+ static type call(Sequence& seq, State const& state, Context const& context, Fun const& fun)
 {
- return fun(rng, state.value, context);
+ return apply_type::call(seq, state, context, fun);
 }
 };

@@ -246,6 +208,12 @@
 // }
 //}

+ template <typename Apply>
+ struct continue_wrap
+ {
+ typedef typename Apply::continue_type type;
+ };
+
 template <typename Begin, typename End, typename State, typename Context, typename Fun, bool IsEmpty>
 struct segmented_fold_until_iterate_skip_empty
 {
@@ -264,10 +232,10 @@
 typename add_const<
 typename result_of::deref<Begin>::type
>::type
- >::type,
- State,
- next_context_type,
- Fun
+ >::type
+ , State
+ , next_context_type
+ , Fun
>
 fold_recurse_impl;

@@ -277,51 +245,59 @@

 typedef
 segmented_fold_until_iterate<
- typename result_of::next<Begin>::type,
- End,
- next_state_type,
- Context,
- Fun
+ typename result_of::next<Begin>::type
+ , End
+ , next_state_type
+ , Context
+ , Fun
>
 next_iteration_impl;

 typedef
 typename mpl::eval_if<
- typename next_state_type::continue_type,
- next_iteration_impl,
- mpl::identity<next_state_type>
+ typename fold_recurse_impl::continue_type
+ , next_iteration_impl
+ , mpl::identity<next_state_type>
>::type
 type;

- static type call(Begin const& beg, End const& end, State const& state,
- Context const& context, Fun const& fun)
+ typedef
+ typename mpl::eval_if<
+ typename fold_recurse_impl::continue_type
+ , continue_wrap<next_iteration_impl>
+ , mpl::identity<mpl::false_>
+ >::type
+ continue_type;
+
+ static type call(Begin const& beg, End const& end, State const& state
+ , Context const& context, Fun const& fun)
 {
- return call(beg, end, state, context, fun, typename next_state_type::continue_type());
+ return call(beg, end, state, context, fun, typename fold_recurse_impl::continue_type());
 }

- static type call(Begin const& beg, End const& end, State const& state,
- Context const& context, Fun const& fun, mpl::true_) // continue
+ static type call(Begin const& beg, End const& end, State const& state
+ , Context const& context, Fun const& fun, mpl::true_) // continue
 {
 return next_iteration_impl::call(
- fusion::next(beg),
- end,
- fold_recurse_impl::call(
- *beg,
- state,
- push_context_impl::call(beg, end, context),
- fun),
- context,
- fun);
+ fusion::next(beg)
+ , end
+ , fold_recurse_impl::call(
+ *beg
+ , state
+ , push_context_impl::call(beg, end, context)
+ , fun)
+ , context
+ , fun);
 }

- static type call(Begin const& beg, End const& end, State const& state,
- Context const& context, Fun const& fun, mpl::false_) // break
+ static type call(Begin const& beg, End const& end, State const& state
+ , Context const& context, Fun const& fun, mpl::false_) // break
 {
 return fold_recurse_impl::call(
- *beg,
- state,
- push_context_impl::call(beg, end, context),
- fun);
+ *beg
+ , state
+ , push_context_impl::call(beg, end, context)
+ , fun);
 }
 };

@@ -330,18 +306,19 @@
 {
 typedef
 segmented_fold_until_iterate<
- typename result_of::next<Begin>::type,
- End,
- State,
- Context,
- Fun
+ typename result_of::next<Begin>::type
+ , End
+ , State
+ , Context
+ , Fun
>
 impl;

 typedef typename impl::type type;
+ typedef typename impl::continue_type continue_type;

- static type call(Begin const& beg, End const& end, State const& state,
- Context const& context, Fun const& fun)
+ static type call(Begin const& beg, End const& end, State const& state
+ , Context const& context, Fun const& fun)
 {
 return impl::call(fusion::next(beg), end, state, context, fun);
 }
@@ -351,13 +328,22 @@
 struct segmented_fold_until_iterate
 {
 typedef
- segmented_fold_until_iterate_skip_empty<Begin, End, State, Context, Fun>
+ typename result_of::empty<
+ typename remove_reference<
+ typename result_of::deref<Begin>::type
+ >::type
+ >::type
+ empty_type;
+
+ typedef
+ segmented_fold_until_iterate_skip_empty<Begin, End, State, Context, Fun, empty_type::value>
 impl;

 typedef typename impl::type type;
+ typedef typename impl::continue_type continue_type;

- static type call(Begin const& beg, End const& end, State const& state,
- Context const& context, Fun const& fun)
+ static type call(Begin const& beg, End const& end, State const& state
+ , Context const& context, Fun const& fun)
 {
 return impl::call(beg, end, state, context, fun);
 }
@@ -367,9 +353,10 @@
 struct segmented_fold_until_iterate<Begin, End, State, Context, Fun, true>
 {
 typedef State type;
+ typedef mpl::true_ continue_type;

- static type call(Begin const&, End const&, State const& state,
- Context const&, Fun const&)
+ static type call(Begin const&, End const&, State const& state
+ , Context const&, Fun const&)
 {
 return state;
 }
@@ -380,15 +367,16 @@
 {
 typedef
 segmented_fold_until_iterate<
- typename result_of::begin<Segments>::type,
- typename result_of::end<Segments>::type,
- State,
- Context,
- Fun
+ typename result_of::begin<Segments>::type
+ , typename result_of::end<Segments>::type
+ , State
+ , Context
+ , Fun
>
 impl;

 typedef typename impl::type type;
+ typedef typename impl::continue_type continue_type;

 static type call(Segments& segs, State const& state, Context const& context, Fun const& fun)
 {

Copied: branches/release/boost/fusion/support/segmented_fold_until.hpp (from r73854, /trunk/boost/fusion/support/segmented_fold_until.hpp)
==============================================================================
--- /trunk/boost/fusion/support/segmented_fold_until.hpp (original)
+++ branches/release/boost/fusion/support/segmented_fold_until.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,6 +7,8 @@
#if !defined(BOOST_FUSION_SEGMENTED_FOLD_UNTIL_HPP_INCLUDED)
#define BOOST_FUSION_SEGMENTED_FOLD_UNTIL_HPP_INCLUDED

+#include <boost/type_traits/is_const.hpp>
+#include <boost/utility/enable_if.hpp>
#include <boost/fusion/support/detail/segmented_fold_until_impl.hpp>
#include <boost/fusion/view/iterator_range.hpp>
#include <boost/fusion/sequence/intrinsic/begin.hpp>
@@ -16,45 +18,56 @@

namespace boost { namespace fusion
{
- //auto segmented_fold_until(rng, state, fun)
+ //auto segmented_fold_until(seq, state, fun)
 //{
- // return first(segmented_fold_until_impl(rng, state, nil, fun));
+ // return first(segmented_fold_until_impl(seq, state, nil, fun));
 //}

 namespace result_of
 {
- template <typename Range, typename State, typename Fun>
+ template <typename Sequence, typename State, typename Fun>
 struct segmented_fold_until
 {
 typedef
 detail::segmented_fold_until_impl<
- Range,
- result<State, continue_>,
- fusion::nil,
- Fun
+ Sequence
+ , State
+ , fusion::nil
+ , Fun
>
- impl;
+ filter;

 typedef
- typename impl::type::value_type
+ typename filter::type
 type;
 };
 }

- template <typename Range, typename State, typename Fun>
- typename result_of::segmented_fold_until<Range, State, Fun>::type
- segmented_fold_until(Range& rng, State const& state, Fun const& fun)
+ template <typename Sequence, typename State, typename Fun>
+ typename
+ lazy_disable_if<
+ is_const<Sequence>
+ , result_of::segmented_fold_until<Sequence, State, Fun>
+ >::type
+ segmented_fold_until(Sequence& seq, State const& state, Fun const& fun)
 {
- typedef typename result_of::segmented_fold_until<Range, State, Fun>::impl impl;
- return impl::call(rng, state, fusion::nil(), fun).value;
+ typedef
+ typename result_of::segmented_fold_until<Sequence, State, Fun>::filter
+ filter;
+
+ return filter::call(seq, state, fusion::nil(), fun);
 }

- template <typename Range, typename State, typename Fun>
- typename result_of::segmented_fold_until<Range const, State, Fun>::type
- segmented_fold_until(Range const& rng, State const& state, Fun const& fun)
+ template <typename Sequence, typename State, typename Fun>
+ typename result_of::segmented_fold_until<Sequence const, State, Fun>::type
+ segmented_fold_until(Sequence const& seq, State const& state, Fun const& fun)
 {
- typedef typename result_of::segmented_fold_until<Range const, State, Fun>::impl impl;
- return impl::call(rng, state, fusion::nil(), fun).value;
+ typedef
+ typename result_of::segmented_fold_until<Sequence const, State, Fun>::filter
+ filter;
+
+ return filter::call(seq, state, fusion::nil(), fun);
 }
}}
+
#endif

Modified: branches/release/boost/fusion/view/filter_view/detail/next_impl.hpp
==============================================================================
--- branches/release/boost/fusion/view/filter_view/detail/next_impl.hpp (original)
+++ branches/release/boost/fusion/view/filter_view/detail/next_impl.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -65,7 +65,7 @@
                 static type
                 call(Iterator const& i)
                 {
- return type(filter::call(i.first));
+ return type(filter::iter_call(i.first));
                 }
             };
         };

Modified: branches/release/boost/fusion/view/filter_view/filter_view_iterator.hpp
==============================================================================
--- branches/release/boost/fusion/view/filter_view/filter_view_iterator.hpp (original)
+++ branches/release/boost/fusion/view/filter_view/filter_view_iterator.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -55,7 +55,7 @@
         typedef Pred pred_type;

         filter_iterator(First const& in_first)
- : first(filter::call(first_converter::call(in_first))) {}
+ : first(filter::iter_call(first_converter::call(in_first))) {}

         first_type first;

Copied: branches/release/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp (from r73854, /trunk/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp)
==============================================================================
--- /trunk/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp (original)
+++ branches/release/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -53,9 +53,9 @@
 : is_segmented_iterator<typename Sequence::begin_type>
 {
 BOOST_MPL_ASSERT_RELATION(
- is_segmented_iterator<typename Sequence::begin_type>::value,
- ==,
- is_segmented_iterator<typename Sequence::end_type>::value);
+ is_segmented_iterator<typename Sequence::begin_type>::value
+ , ==
+ , is_segmented_iterator<typename Sequence::end_type>::value);
 };
 };
 }

Copied: branches/release/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp (from r73831, /trunk/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp)
==============================================================================
--- /trunk/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp (original)
+++ branches/release/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -16,14 +16,11 @@
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/sequence/intrinsic/segments.hpp>
-#include <boost/fusion/sequence/intrinsic/detail/segmented_size.hpp>
#include <boost/fusion/algorithm/transformation/push_back.hpp>
#include <boost/fusion/algorithm/transformation/push_front.hpp>
-#include <boost/fusion/view/iterator_range.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
-#include <boost/fusion/iterator/segmented_iterator.hpp>
#include <boost/fusion/container/list/detail/reverse_cons.hpp>
-#include <boost/fusion/iterator/segmented_iterator/detail/segment_sequence.hpp>
+#include <boost/fusion/iterator/detail/segment_sequence.hpp>

// Invariants:
// - Each segmented iterator has a stack
@@ -35,8 +32,8 @@

namespace boost { namespace fusion
{
- template<typename Context>
- struct segmented_iterator;
+ template <typename First, typename Last>
+ struct iterator_range;
}}

namespace boost { namespace fusion { namespace detail
@@ -65,7 +62,7 @@
 // }
 //}

- template<typename Stack, std::size_t Size = Stack::size::value>
+ template <typename Stack, std::size_t Size = Stack::size::value>
 struct make_segment_sequence_front
 {
 // assert(end(segments(front(car(stack_begin)))) == end(car(cdr(stack_begin))));
@@ -85,16 +82,16 @@
>::type
>::type
>::type
- >::type,
- typename Stack::cdr_type::car_type::end_type
+ >::type
+ , typename Stack::cdr_type::car_type::end_type
>));

 typedef
 iterator_range<
 typename result_of::next<
 typename Stack::cdr_type::car_type::begin_type
- >::type,
- typename result_of::end<
+ >::type
+ , typename result_of::end<
 typename remove_reference<
 typename add_const<
 typename result_of::segments<
@@ -119,13 +116,13 @@
 typedef
 segment_sequence<
 typename result_of::push_front<
- rest_type const,
- typename recurse::type
+ rest_type const
+ , typename recurse::type
>::type
>
 type;

- static type call(Stack stack)
+ static type call(Stack const& stack)
 {
 //return segment_sequence(
 // push_front(
@@ -133,12 +130,12 @@
 // make_segment_sequence_front(cdr(stack_begin))));
 return type(
 fusion::push_front(
- rest_type(fusion::next(stack.cdr.car.first), fusion::end(fusion::segments(*stack.car.first))),
- recurse::call(stack.cdr)));
+ rest_type(fusion::next(stack.cdr.car.first), fusion::end(fusion::segments(*stack.car.first)))
+ , recurse::call(stack.cdr)));
 }
 };

- template<typename Stack>
+ template <typename Stack>
 struct make_segment_sequence_front<Stack, 2>
 {
 // assert(end(front(car(stack_begin))) == end(car(cdr(stack_begin))));
@@ -152,14 +149,14 @@
>::type
>::type
>::type
- >::type,
- typename Stack::cdr_type::car_type::end_type
+ >::type
+ , typename Stack::cdr_type::car_type::end_type
>));

 typedef
 iterator_range<
- typename Stack::cdr_type::car_type::begin_type,
- typename result_of::end<
+ typename Stack::cdr_type::car_type::begin_type
+ , typename result_of::end<
 typename remove_reference<
 typename add_const<
 typename result_of::deref<
@@ -171,20 +168,21 @@
>
 type;

- static type call(Stack stack)
+ static type call(Stack const& stack)
 {
 // return iterator_range(begin(car(cdr(stack_begin))), end(front(car(stack_begin))));
 return type(stack.cdr.car.first, fusion::end(*stack.car.first));
 }
 };

- template<typename Stack>
+ template <typename Stack>
 struct make_segment_sequence_front<Stack, 1>
 {
- typedef nil type;
- static type call(Stack const &)
+ typedef typename Stack::cdr_type type; // nil
+
+ static type call(Stack const &stack)
 {
- return nil();
+ return stack.cdr;
 }
 };

@@ -209,7 +207,7 @@
 // }
 //}

- template<typename Stack, std::size_t Size = Stack::size::value>
+ template <typename Stack, std::size_t Size = Stack::size::value>
 struct make_segment_sequence_back
 {
 // assert(end(segments(front(car(stack_begin)))) == end(car(cdr(stack_begin))));
@@ -229,8 +227,8 @@
>::type
>::type
>::type
- >::type,
- typename Stack::cdr_type::car_type::end_type
+ >::type
+ , typename Stack::cdr_type::car_type::end_type
>));

 typedef
@@ -249,8 +247,8 @@
>::type
>::type
>::type
- >::type,
- typename Stack::cdr_type::car_type::begin_type
+ >::type
+ , typename Stack::cdr_type::car_type::begin_type
>
 rest_type;

@@ -261,13 +259,13 @@
 typedef
 segment_sequence<
 typename result_of::push_back<
- rest_type const,
- typename recurse::type
+ rest_type const
+ , typename recurse::type
>::type
>
 type;

- static type call(Stack stack)
+ static type call(Stack const& stack)
 {
 // return segment_sequence(
 // push_back(
@@ -275,12 +273,12 @@
 // make_segment_sequence_back(cdr(stack_end))));
 return type(
 fusion::push_back(
- rest_type(fusion::begin(fusion::segments(*stack.car.first)), stack.cdr.car.first),
- recurse::call(stack.cdr)));
+ rest_type(fusion::begin(fusion::segments(*stack.car.first)), stack.cdr.car.first)
+ , recurse::call(stack.cdr)));
 }
 };

- template<typename Stack>
+ template <typename Stack>
 struct make_segment_sequence_back<Stack, 2>
 {
 // assert(end(front(car(stack_end))) == end(car(cdr(stack_end))));
@@ -294,8 +292,8 @@
>::type
>::type
>::type
- >::type,
- typename Stack::cdr_type::car_type::end_type
+ >::type
+ , typename Stack::cdr_type::car_type::end_type
>));

 typedef
@@ -308,25 +306,26 @@
>::type
>::type
>::type
- >::type,
- typename Stack::cdr_type::car_type::begin_type
+ >::type
+ , typename Stack::cdr_type::car_type::begin_type
>
 type;

- static type call(Stack stack)
+ static type call(Stack const& stack)
 {
 // return iterator_range(begin(front(car(stack_end))), begin(car(cdr(stack_end))));
 return type(fusion::begin(*stack.car.first), stack.cdr.car.first);
 }
 };

- template<typename Stack>
+ template <typename Stack>
 struct make_segment_sequence_back<Stack, 1>
 {
- typedef nil type;
- static type call(Stack const &)
+ typedef typename Stack::cdr_type type; // nil
+
+ static type call(Stack const& stack)
 {
- return nil();
+ return stack.cdr;
 }
 };

@@ -364,20 +363,20 @@
 // }
 //}

- template<
- typename StackBegin,
- typename StackEnd,
- int StackBeginSize = StackBegin::size::value,
- int StackEndSize = StackEnd::size::value>
+ template <
+ typename StackBegin
+ , typename StackEnd
+ , int StackBeginSize = StackBegin::size::value
+ , int StackEndSize = StackEnd::size::value>
 struct make_segmented_range_reduce;

- template<
- typename StackBegin,
- typename StackEnd,
- bool SameSegment =
+ template <
+ typename StackBegin
+ , typename StackEnd
+ , bool SameSegment =
 result_of::equal_to<
- typename StackBegin::car_type::begin_type,
- typename StackEnd::car_type::begin_type
+ typename StackBegin::car_type::begin_type
+ , typename StackEnd::car_type::begin_type
>::type::value>
 struct make_segmented_range_reduce2
 {
@@ -385,8 +384,8 @@
 iterator_range<
 typename result_of::next<
 typename StackBegin::car_type::begin_type
- >::type,
- typename StackEnd::car_type::begin_type
+ >::type
+ , typename StackEnd::car_type::begin_type
>
 rest_type;

@@ -394,10 +393,10 @@
 segment_sequence<
 typename result_of::push_back<
 typename result_of::push_front<
- rest_type const,
- typename make_segment_sequence_front<StackBegin>::type
- >::type const,
- typename make_segment_sequence_back<StackEnd>::type
+ rest_type const
+ , typename make_segment_sequence_front<StackBegin>::type
+ >::type const
+ , typename make_segment_sequence_back<StackEnd>::type
>::type
>
 type;
@@ -415,19 +414,19 @@
 return type(
 fusion::push_back(
 fusion::push_front(
- rest_type(fusion::next(stack_begin.car.first), stack_end.car.first),
- make_segment_sequence_front<StackBegin>::call(stack_begin)),
- make_segment_sequence_back<StackEnd>::call(stack_end)));
+ rest_type(fusion::next(stack_begin.car.first), stack_end.car.first)
+ , make_segment_sequence_front<StackBegin>::call(stack_begin))
+ , make_segment_sequence_back<StackEnd>::call(stack_end)));
 }
 };

- template<typename StackBegin, typename StackEnd>
+ template <typename StackBegin, typename StackEnd>
 struct make_segmented_range_reduce2<StackBegin, StackEnd, true>
 {
 typedef
 make_segmented_range_reduce<
- typename StackBegin::cdr_type,
- typename StackEnd::cdr_type
+ typename StackBegin::cdr_type
+ , typename StackEnd::cdr_type
>
 impl;

@@ -441,18 +440,18 @@
 }
 };

- template<typename StackBegin, typename StackEnd, int StackBeginSize, int StackEndSize>
+ template <typename StackBegin, typename StackEnd, int StackBeginSize, int StackEndSize>
 struct make_segmented_range_reduce
 : make_segmented_range_reduce2<StackBegin, StackEnd>
 {};

- template<typename StackBegin, typename StackEnd>
+ template <typename StackBegin, typename StackEnd>
 struct make_segmented_range_reduce<StackBegin, StackEnd, 1, 1>
 {
 typedef
 iterator_range<
- typename StackBegin::car_type::begin_type,
- typename StackEnd::car_type::begin_type
+ typename StackBegin::car_type::begin_type
+ , typename StackEnd::car_type::begin_type
>
 range_type;

@@ -478,7 +477,7 @@
 // return make_segmented_range_reduce(reverse(begin.context), reverse(end.context));
 //}

- template<typename Begin, typename End>
+ template <typename Begin, typename End>
 struct make_segmented_range
 {
 typedef reverse_cons<typename Begin::context_type> reverse_begin_cons;
@@ -486,98 +485,21 @@

 typedef
 make_segmented_range_reduce<
- typename reverse_begin_cons::type,
- typename reverse_end_cons::type
+ typename reverse_begin_cons::type
+ , typename reverse_end_cons::type
>
 impl;

 typedef typename impl::type type;

- static type call(Begin const & begin, End const & end)
+ static type call(Begin const& begin, End const& end)
 {
 return impl::call(
- reverse_begin_cons::call(begin.context),
- reverse_end_cons::call(end.context));
+ reverse_begin_cons::call(begin.context)
+ , reverse_end_cons::call(end.context));
 }
 };

}}}

-namespace boost { namespace fusion { namespace extension
-{
- template<typename Tag>
- struct is_segmented_impl;
-
- // An iterator_range of segmented_iterators is segmented
- template<>
- struct is_segmented_impl<iterator_range_tag>
- {
- private:
- template<typename Iterator>
- struct is_segmented_iterator
- : mpl::false_
- {};
-
- template<typename Iterator>
- struct is_segmented_iterator<Iterator &>
- : is_segmented_iterator<Iterator>
- {};
-
- template<typename Iterator>
- struct is_segmented_iterator<Iterator const>
- : is_segmented_iterator<Iterator>
- {};
-
- template<typename Context>
- struct is_segmented_iterator<segmented_iterator<Context> >
- : mpl::true_
- {};
-
- public:
- template<typename Sequence>
- struct apply
- : is_segmented_iterator<typename Sequence::begin_type>
- {
- BOOST_MPL_ASSERT_RELATION(
- is_segmented_iterator<typename Sequence::begin_type>::value,
- ==,
- is_segmented_iterator<typename Sequence::end_type>::value);
- };
- };
-
- template<typename Tag>
- struct segments_impl;
-
- template<>
- struct segments_impl<iterator_range_tag>
- {
- template<typename Sequence>
- struct apply
- {
- typedef
- detail::make_segmented_range<
- typename Sequence::begin_type,
- typename Sequence::end_type
- >
- impl;
-
- BOOST_MPL_ASSERT((traits::is_segmented<typename impl::type>));
-
- typedef
- typename result_of::segments<typename impl::type>::type
- type;
-
- static type call(Sequence & seq)
- {
- return fusion::segments(impl::call(seq.first, seq.last));
- }
- };
- };
-
- // TODO: default implementation of begin, end, and size
- // should check if the sequence is segmented and to
- // the right thing.
-
-}}}
-
#endif

Copied: branches/release/boost/fusion/view/iterator_range/detail/segments_impl.hpp (from r73854, /trunk/boost/fusion/view/iterator_range/detail/segments_impl.hpp)
==============================================================================
--- /trunk/boost/fusion/view/iterator_range/detail/segments_impl.hpp (original)
+++ branches/release/boost/fusion/view/iterator_range/detail/segments_impl.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -29,8 +29,8 @@
 {
 typedef
 detail::make_segmented_range<
- typename Sequence::begin_type,
- typename Sequence::end_type
+ typename Sequence::begin_type
+ , typename Sequence::end_type
>
 impl;

Modified: branches/release/boost/fusion/view/iterator_range/iterator_range.hpp
==============================================================================
--- branches/release/boost/fusion/view/iterator_range/iterator_range.hpp (original)
+++ branches/release/boost/fusion/view/iterator_range/iterator_range.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -15,7 +15,10 @@
#include <boost/fusion/view/iterator_range/detail/begin_impl.hpp>
#include <boost/fusion/view/iterator_range/detail/end_impl.hpp>
#include <boost/fusion/view/iterator_range/detail/at_impl.hpp>
+#include <boost/fusion/view/iterator_range/detail/size_impl.hpp>
#include <boost/fusion/view/iterator_range/detail/value_at_impl.hpp>
+#include <boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp>
+#include <boost/fusion/view/iterator_range/detail/segments_impl.hpp>
#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
#include <boost/config.hpp>

@@ -36,7 +39,6 @@
 typedef typename convert_iterator<Last>::type end_type;
 typedef iterator_range_tag fusion_tag;
 typedef fusion_sequence_tag tag; // this gets picked up by MPL
- typedef typename result_of::distance<begin_type, end_type>::type size;
 typedef mpl::true_ is_view;

 typedef typename traits::category_of<begin_type>::type category;

Modified: branches/release/boost/fusion/view/joint_view/joint_view.hpp
==============================================================================
--- branches/release/boost/fusion/view/joint_view/joint_view.hpp (original)
+++ branches/release/boost/fusion/view/joint_view/joint_view.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -1,12 +1,13 @@
/*=============================================================================
 Copyright (c) 2001-2006 Joel de Guzman

- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ 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(FUSION_JOINT_VIEW_07162005_0140)
#define FUSION_JOINT_VIEW_07162005_0140

+#include <boost/fusion/view/joint_view/joint_view_fwd.hpp>
#include <boost/fusion/support/detail/access.hpp>
#include <boost/fusion/support/is_view.hpp>
#include <boost/fusion/sequence/intrinsic/begin.hpp>
@@ -50,7 +51,9 @@
 typedef typename result_of::end<Sequence1>::type last_type;
 typedef typename result_of::begin<Sequence2>::type concat_type;
 typedef typename result_of::end<Sequence2>::type concat_last_type;
- typedef typename mpl::plus<result_of::size<Sequence1>, result_of::size<Sequence2> >::type size;
+ typedef typename mpl::int_<
+ result_of::size<Sequence1>::value + result_of::size<Sequence2>::value>
+ size;

 joint_view(Sequence1& in_seq1, Sequence2& in_seq2)
 : seq1(in_seq1)

Modified: branches/release/boost/proto/fusion.hpp
==============================================================================
--- branches/release/boost/proto/fusion.hpp (original)
+++ branches/release/boost/proto/fusion.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -22,11 +22,8 @@
#include <boost/fusion/include/intrinsic.hpp>
#include <boost/fusion/include/single_view.hpp>
#include <boost/fusion/include/transform_view.hpp>
-#include <boost/fusion/support/ext_/is_segmented.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/size_s.hpp>
+#include <boost/fusion/include/is_segmented.hpp>
#include <boost/fusion/sequence/comparison/enable_comparison.hpp>
-#include <boost/fusion/view/ext_/segmented_iterator.hpp>
#include <boost/proto/proto_fwd.hpp>
#include <boost/proto/traits.hpp>
#include <boost/proto/eval.hpp>
@@ -610,33 +607,6 @@
 };
 };

- template<>
- struct begin_impl<proto::tag::proto_flat_view>
- {
- template<typename Sequence>
- struct apply
- : fusion::segmented_begin<Sequence>
- {};
- };
-
- template<>
- struct end_impl<proto::tag::proto_flat_view>
- {
- template<typename Sequence>
- struct apply
- : fusion::segmented_end<Sequence>
- {};
- };
-
- template<>
- struct size_impl<proto::tag::proto_flat_view>
- {
- template<typename Sequence>
- struct apply
- : fusion::segmented_size<Sequence>
- {};
- };
-
 }

 namespace traits

Modified: branches/release/libs/fusion/test/Jamfile
==============================================================================
--- branches/release/libs/fusion/test/Jamfile (original)
+++ branches/release/libs/fusion/test/Jamfile 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -41,6 +41,10 @@
     [ run algorithm/reverse_fold.cpp : : : : ]
     [ run algorithm/reverse_iter_fold.cpp : : : : ]
     [ run algorithm/reverse.cpp : : : : ]
+ [ run algorithm/segmented_for_each.cpp : : : : ]
+ [ run algorithm/segmented_find.cpp : : : : ]
+ [ run algorithm/segmented_find_if.cpp : : : : ]
+ [ run algorithm/segmented_fold.cpp : : : : ]
     [ run algorithm/transform.cpp : : : : ]
     [ run algorithm/join.cpp : : : : ]
     [ run algorithm/zip.cpp : : : : ]
@@ -83,6 +87,7 @@
     [ run sequence/map_tie.cpp : : : : ]
     [ run sequence/nview.cpp : : : : ]
     [ run sequence/reverse_view.cpp : : : : ]
+ [ run sequence/segmented_iterator_range.cpp : : : : ]
     [ run sequence/set.cpp : : : : ]
     [ run sequence/single_view.cpp : : : : ]
     [ run sequence/std_pair.cpp : : : : ]
@@ -149,17 +154,3 @@

     ;
}
-
-{
- # Text for extension features, must be explicitly specified on the command line to be run
- # TODO these are not in a test-suite because currently test-suites cannot be marked "explicit"
-
- run algorithm/ext_/for_each_s.cpp ;
- explicit for_each_s ;
-
- run algorithm/ext_/find_if_s.cpp ;
- explicit find_if_s ;
-
- run sequence/ext_/iterator_range_s.cpp ;
- explicit iterator_range_s ;
-}

Modified: branches/release/libs/fusion/test/algorithm/erase_key.cpp
==============================================================================
--- branches/release/libs/fusion/test/algorithm/erase_key.cpp (original)
+++ branches/release/libs/fusion/test/algorithm/erase_key.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -30,7 +30,7 @@
 using namespace boost::fusion;
 std::cout << set << std::endl;

- BOOST_STATIC_ASSERT(result_of::size<Set>::value == 3);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<Set>::value == 3);
 BOOST_TEST((*find<int>(set) == 1));
 BOOST_TEST((*find<double>(set) == 1.5));
 BOOST_TEST((*find<std::string>(set) == "hello"));
@@ -47,7 +47,7 @@
 using namespace boost::fusion;
 std::cout << map << std::endl;

- BOOST_STATIC_ASSERT(result_of::size<Map>::value == 3);
+ BOOST_STATIC_ASSERT(boost::fusion::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")));

Modified: branches/release/libs/fusion/test/algorithm/fold.hpp
==============================================================================
--- branches/release/libs/fusion/test/algorithm/fold.hpp (original)
+++ branches/release/libs/fusion/test/algorithm/fold.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -59,7 +59,7 @@

 template<typename Self, typename State, typename T>
 struct result<Self(State,T)>
- : fusion::result_of::make_pair<
+ : boost::fusion::result_of::make_pair<
 mpl::int_<
 boost::remove_reference<
 State
@@ -108,7 +108,7 @@

#ifdef BOOST_FUSION_TEST_ITER_FOLD
 typedef typename
- fusion::result_of::value_of<
+ boost::fusion::result_of::value_of<
 typename boost::remove_reference<T>::type
>::type
 t;
@@ -144,7 +144,7 @@

 {
 mpl::range_c<int, 1, n+1> init_range;
- typename fusion::result_of::as_vector<
+ typename boost::fusion::result_of::as_vector<
 typename mpl::transform<
 range
 , mpl::always<int>
@@ -169,20 +169,20 @@
 {
 typedef typename
#ifdef BOOST_FUSION_TEST_REVERSE_FOLD
- fusion::result_of::as_vector<
+ boost::fusion::result_of::as_vector<
 typename mpl::copy<
 mpl::range_c<int, 1, n+1>
 , mpl::front_inserter<fusion::vector<> >
>::type
>::type
#else
- fusion::result_of::as_vector<mpl::range_c<int, 1, n+1> >::type
+ boost::fusion::result_of::as_vector<mpl::range_c<int, 1, n+1> >::type
#endif
 vec;

 typedef
 boost::is_same<
- typename fusion::result_of::BOOST_FUSION_TEST_FOLD_NAME<
+ typename boost::fusion::result_of::BOOST_FUSION_TEST_FOLD_NAME<
 vec
 , mpl::vector<mpl::int_<1>, mpl::int_<0> >
 , meta_sum

Copied: branches/release/libs/fusion/test/algorithm/segmented_find.cpp (from r73834, /trunk/libs/fusion/test/algorithm/segmented_find.cpp)
==============================================================================
--- /trunk/libs/fusion/test/algorithm/segmented_find.cpp (original)
+++ branches/release/libs/fusion/test/algorithm/segmented_find.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,7 +7,7 @@
==============================================================================*/
#include <boost/detail/lightweight_test.hpp>
#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/algorithm/query/ext_/find_s.hpp>
+#include <boost/fusion/algorithm/query/find.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include "../sequence/tree.hpp"

@@ -19,21 +19,21 @@
{
 using namespace boost;

- typedef typename fusion::result_of::find_s<Tree const, short>::type short_iter;
- typedef typename fusion::result_of::find_s<Tree const, float>::type float_iter;
- typedef typename fusion::result_of::find_s<Tree const, not_there>::type not_there_iter;
+ typedef typename boost::fusion::result_of::find<Tree const, short>::type short_iter;
+ typedef typename boost::fusion::result_of::find<Tree const, float>::type float_iter;
+ typedef typename boost::fusion::result_of::find<Tree const, not_there>::type not_there_iter;

 // find_if_s of a segmented data structure returns generic
 // segmented iterators
- short_iter si = fusion::find_s<short>(tree);
- float_iter fi = fusion::find_s<float>(tree);
+ short_iter si = fusion::find<short>(tree);
+ float_iter fi = fusion::find<float>(tree);

 // they behave like ordinary Fusion iterators ...
 BOOST_TEST((*si == short('d')));
 BOOST_TEST((*fi == float(1)));

 // Searching for something that's not there should return the end iterator.
- not_there_iter nti = fusion::find_s<not_there>(tree);
+ not_there_iter nti = fusion::find<not_there>(tree);
 BOOST_TEST((nti == fusion::end(tree)));
}

Copied: branches/release/libs/fusion/test/algorithm/segmented_find_if.cpp (from r73834, /trunk/libs/fusion/test/algorithm/segmented_find_if.cpp)
==============================================================================
--- /trunk/libs/fusion/test/algorithm/segmented_find_if.cpp (original)
+++ branches/release/libs/fusion/test/algorithm/segmented_find_if.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,7 +7,7 @@
==============================================================================*/
#include <boost/detail/lightweight_test.hpp>
#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
+#include <boost/fusion/algorithm/query/find_if.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/mpl/placeholders.hpp>
#include <boost/type_traits/is_same.hpp>
@@ -22,21 +22,21 @@
 using namespace boost;
 using mpl::_;

- typedef typename fusion::result_of::find_if_s<Tree const, is_same<_,short> >::type short_iter;
- typedef typename fusion::result_of::find_if_s<Tree const, is_same<_,float> >::type float_iter;
- typedef typename fusion::result_of::find_if_s<Tree const, is_same<_,not_there> >::type not_there_iter;
+ typedef typename boost::fusion::result_of::find_if<Tree const, is_same<_,short> >::type short_iter;
+ typedef typename boost::fusion::result_of::find_if<Tree const, is_same<_,float> >::type float_iter;
+ typedef typename boost::fusion::result_of::find_if<Tree const, is_same<_,not_there> >::type not_there_iter;

- // find_if_s of a segmented data structure returns generic
+ // find_if of a segmented data structure returns generic
 // segmented iterators
- short_iter si = fusion::find_if_s<is_same<_,short> >(tree);
- float_iter fi = fusion::find_if_s<is_same<_,float> >(tree);
+ short_iter si = fusion::find_if<is_same<_,short> >(tree);
+ float_iter fi = fusion::find_if<is_same<_,float> >(tree);

 // they behave like ordinary Fusion iterators ...
 BOOST_TEST((*si == short('d')));
 BOOST_TEST((*fi == float(1)));

 // Searching for something that's not there should return the end iterator.
- not_there_iter nti = fusion::find_if_s<is_same<_,not_there> >(tree);
+ not_there_iter nti = fusion::find_if<is_same<_,not_there> >(tree);
 BOOST_TEST((nti == fusion::end(tree)));
}

Copied: branches/release/libs/fusion/test/algorithm/segmented_fold.cpp (from r73834, /trunk/libs/fusion/test/algorithm/segmented_fold.cpp)
==============================================================================
--- /trunk/libs/fusion/test/algorithm/segmented_fold.cpp (original)
+++ branches/release/libs/fusion/test/algorithm/segmented_fold.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -5,11 +5,12 @@
 Distributed under the Boost Software License, Version 1.0. (See accompanying
 file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
+#include <string>
#include <sstream>
#include <iostream>
#include <boost/detail/lightweight_test.hpp>
#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/algorithm/iteration/ext_/fold_s.hpp>
+#include <boost/fusion/algorithm/iteration/fold.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include "../sequence/tree.hpp"

@@ -31,7 +32,7 @@
 using namespace boost;

 std::stringstream str;
- fusion::fold_s(tree, &str, write_string());
+ fusion::fold(tree, &str, write_string());
 std::string res = str.str();

 BOOST_TEST_EQ(res, "a b c 1 2 3 100 e f 0 B 1 h i 4 5 6 j k l ");

Copied: branches/release/libs/fusion/test/algorithm/segmented_for_each.cpp (from r73834, /trunk/libs/fusion/test/algorithm/segmented_for_each.cpp)
==============================================================================
--- /trunk/libs/fusion/test/algorithm/segmented_for_each.cpp (original)
+++ branches/release/libs/fusion/test/algorithm/segmented_for_each.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,7 +7,7 @@
==============================================================================*/
#include <boost/detail/lightweight_test.hpp>
#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
+#include <boost/fusion/algorithm/iteration/for_each.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include "../sequence/tree.hpp"

@@ -26,7 +26,7 @@
 using namespace boost::fusion;

 {
- for_each_s(
+ for_each(
 make_tree(
 make_vector(double(0),'B')
 , make_tree(

Modified: branches/release/libs/fusion/test/algorithm/transform.cpp
==============================================================================
--- branches/release/libs/fusion/test/algorithm/transform.cpp (original)
+++ branches/release/libs/fusion/test/algorithm/transform.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -109,46 +109,46 @@
 {
 typedef range_c<int, 5, 9> sequence_type;
 sequence_type sequence;
- std::cout << transform(sequence, square()) << std::endl;
- BOOST_TEST((transform(sequence, square()) == make_vector(25, 36, 49, 64)));
+ std::cout << boost::fusion::transform(sequence, square()) << std::endl;
+ BOOST_TEST((boost::fusion::transform(sequence, square()) == make_vector(25, 36, 49, 64)));
 }

 {
 typedef range_c<int, 5, 9> mpl_list1;
- std::cout << transform(mpl_list1(), square()) << std::endl;
- BOOST_TEST((transform(mpl_list1(), square()) == make_vector(25, 36, 49, 64)));
+ std::cout << boost::fusion::transform(mpl_list1(), square()) << std::endl;
+ BOOST_TEST((boost::fusion::transform(mpl_list1(), square()) == make_vector(25, 36, 49, 64)));
 }

 {
 vector<int, int, int> tup(1, 2, 3);
- std::cout << transform(tup, square()) << std::endl;
- BOOST_TEST((transform(tup, square()) == make_vector(1, 4, 9)));
+ std::cout << boost::fusion::transform(tup, square()) << std::endl;
+ BOOST_TEST((boost::fusion::transform(tup, square()) == make_vector(1, 4, 9)));
 }

 {
 vector<int, int, int> tup1(1, 2, 3);
 vector<int, int, int> tup2(4, 5, 6);
- std::cout << transform(tup1, tup2, add()) << std::endl;
- BOOST_TEST((transform(tup1, tup2, add()) == make_vector(5, 7, 9)));
+ std::cout << boost::fusion::transform(tup1, tup2, add()) << std::endl;
+ BOOST_TEST((boost::fusion::transform(tup1, tup2, add()) == make_vector(5, 7, 9)));
 }

 {
 // Unary transform that requires lvalues, just check compilation
 vector<int, int, int> tup1(1, 2, 3);
- BOOST_TEST(at_c<0>(transform(tup1, unary_lvalue_transform())) == &at_c<0>(tup1));
- BOOST_TEST(*begin(transform(tup1, unary_lvalue_transform())) == &at_c<0>(tup1));
+ BOOST_TEST(at_c<0>(boost::fusion::transform(tup1, unary_lvalue_transform())) == &at_c<0>(tup1));
+ BOOST_TEST(*begin(boost::fusion::transform(tup1, unary_lvalue_transform())) == &at_c<0>(tup1));
 }

 {
 vector<int, int, int> tup1(1, 2, 3);
 vector<int, int, int> tup2(4, 5, 6);
- BOOST_TEST(at_c<0>(transform(tup1, tup2, binary_lvalue_transform())) == &at_c<0>(tup1));
- BOOST_TEST(*begin(transform(tup1, tup2, binary_lvalue_transform())) == &at_c<0>(tup1));
+ BOOST_TEST(at_c<0>(boost::fusion::transform(tup1, tup2, binary_lvalue_transform())) == &at_c<0>(tup1));
+ BOOST_TEST(*begin(boost::fusion::transform(tup1, tup2, binary_lvalue_transform())) == &at_c<0>(tup1));
 }

 {
 vector<int, int, int> tup1(1, 2, 3);
- BOOST_TEST(transform(tup1, twice) == make_vector(2,4,6));
+ BOOST_TEST(boost::fusion::transform(tup1, twice) == make_vector(2,4,6));
 }

Modified: branches/release/libs/fusion/test/compile_time/vector_intrinsic.cpp
==============================================================================
--- branches/release/libs/fusion/test/compile_time/vector_intrinsic.cpp (original)
+++ branches/release/libs/fusion/test/compile_time/vector_intrinsic.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -38,17 +38,17 @@
 fusion::at_c<8>(v);
 fusion::at_c<9>(v);

- typedef typename fusion::result_of::value_at_c<v_type, 0>::type va0;
- typedef typename fusion::result_of::value_at_c<v_type, 1>::type va1;
- typedef typename fusion::result_of::value_at_c<v_type, 2>::type va2;
- typedef typename fusion::result_of::value_at_c<v_type, 3>::type va3;
- typedef typename fusion::result_of::value_at_c<v_type, 4>::type va4;
+ typedef typename boost::fusion::result_of::value_at_c<v_type, 0>::type va0;
+ typedef typename boost::fusion::result_of::value_at_c<v_type, 1>::type va1;
+ typedef typename boost::fusion::result_of::value_at_c<v_type, 2>::type va2;
+ typedef typename boost::fusion::result_of::value_at_c<v_type, 3>::type va3;
+ typedef typename boost::fusion::result_of::value_at_c<v_type, 4>::type va4;

- typedef typename fusion::result_of::value_at_c<v_type, 5>::type va5;
- typedef typename fusion::result_of::value_at_c<v_type, 6>::type va6;
- typedef typename fusion::result_of::value_at_c<v_type, 7>::type va7;
- typedef typename fusion::result_of::value_at_c<v_type, 8>::type va8;
- typedef typename fusion::result_of::value_at_c<v_type, 9>::type va9;
+ typedef typename boost::fusion::result_of::value_at_c<v_type, 5>::type va5;
+ typedef typename boost::fusion::result_of::value_at_c<v_type, 6>::type va6;
+ typedef typename boost::fusion::result_of::value_at_c<v_type, 7>::type va7;
+ typedef typename boost::fusion::result_of::value_at_c<v_type, 8>::type va8;
+ typedef typename boost::fusion::result_of::value_at_c<v_type, 9>::type va9;

 fusion::begin(v);
 fusion::end(v);

Modified: branches/release/libs/fusion/test/functional/invoke.cpp
==============================================================================
--- branches/release/libs/fusion/test/functional/invoke.cpp (original)
+++ branches/release/libs/fusion/test/functional/invoke.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -331,7 +331,7 @@
template <class Sequence>
void test_sequence(Sequence & seq)
{
- test_sequence_n(seq, mpl::int_<fusion::result_of::size<Sequence>::value>());
+ test_sequence_n(seq, mpl::int_<boost::fusion::result_of::size<Sequence>::value>());
}

@@ -340,18 +340,18 @@
 using boost::is_same;

 BOOST_TEST(( is_same<
- fusion::result_of::invoke<int (*)(), fusion::vector0<> >::type, int
+ boost::fusion::result_of::invoke<int (*)(), fusion::vector0<> >::type, int
>::value ));
// disabled until boost::result_of supports it
// BOOST_TEST(( is_same<
-// fusion::result_of::invoke<int (*)(...), fusion::vector1<int> >::type, int
+// boost::fusion::result_of::invoke<int (*)(...), fusion::vector1<int> >::type, int
// >::value ));
 BOOST_TEST(( is_same<
- fusion::result_of::invoke<int (members::*)(), fusion::vector1<members*> >::type, int
+ boost::fusion::result_of::invoke<int (members::*)(), fusion::vector1<members*> >::type, int
>::value ));
// disabled until boost::result_of supports it
// BOOST_TEST(( is_same<
-// fusion::result_of::invoke<int (members::*)(...), fusion::vector2<members*,int> >::type, int
+// boost::fusion::result_of::invoke<int (members::*)(...), fusion::vector2<members*,int> >::type, int
// >::value ));
}

Modified: branches/release/libs/fusion/test/functional/invoke_function_object.cpp
==============================================================================
--- branches/release/libs/fusion/test/functional/invoke_function_object.cpp (original)
+++ branches/release/libs/fusion/test/functional/invoke_function_object.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -182,16 +182,16 @@
template <class Sequence>
void test_sequence(Sequence & seq)
{
- test_sequence_n(seq, mpl::int_<fusion::result_of::size<Sequence>::value>());
+ test_sequence_n(seq, mpl::int_<boost::fusion::result_of::size<Sequence>::value>());
}

void result_type_tests()
{
using boost::is_same;

- BOOST_TEST(( is_same< fusion::result_of::invoke_function_object< nullary_fobj, fusion::vector<> >::type, int >::value ));
- BOOST_TEST(( is_same< fusion::result_of::invoke_function_object< fobj, fusion::vector<element1_type> >::type, int >::value ));
- BOOST_TEST(( is_same< fusion::result_of::invoke_function_object< fobj, fusion::vector<element1_type,element2_type> >::type, int >::value ));
+ BOOST_TEST(( is_same< boost::fusion::result_of::invoke_function_object< nullary_fobj, fusion::vector<> >::type, int >::value ));
+ BOOST_TEST(( is_same< boost::fusion::result_of::invoke_function_object< fobj, fusion::vector<element1_type> >::type, int >::value ));
+ BOOST_TEST(( is_same< boost::fusion::result_of::invoke_function_object< fobj, fusion::vector<element1_type,element2_type> >::type, int >::value ));
}

Modified: branches/release/libs/fusion/test/functional/invoke_procedure.cpp
==============================================================================
--- branches/release/libs/fusion/test/functional/invoke_procedure.cpp (original)
+++ branches/release/libs/fusion/test/functional/invoke_procedure.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -244,7 +244,7 @@
template <class Sequence>
void test_sequence(Sequence & seq)
{
- test_sequence_n(seq, mpl::int_<fusion::result_of::size<Sequence>::value>());
+ test_sequence_n(seq, mpl::int_<boost::fusion::result_of::size<Sequence>::value>());
}

int main()

Modified: branches/release/libs/fusion/test/functional/make_fused.cpp
==============================================================================
--- branches/release/libs/fusion/test/functional/make_fused.cpp (original)
+++ branches/release/libs/fusion/test/functional/make_fused.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -63,7 +63,7 @@
 test_func<> f;
 test_func<noncopyable> f_nc;

- fusion::result_of::make_fused< test_func<> >::type fused_func
+ boost::fusion::result_of::make_fused< test_func<> >::type fused_func
 = fusion::make_fused(f);

 BOOST_TEST(fused_func(lv_vec) == 1);

Modified: branches/release/libs/fusion/test/functional/make_fused_function_object.cpp
==============================================================================
--- branches/release/libs/fusion/test/functional/make_fused_function_object.cpp (original)
+++ branches/release/libs/fusion/test/functional/make_fused_function_object.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -73,7 +73,7 @@
 test_func<> f;
 test_func<noncopyable> f_nc;

- fusion::result_of::make_fused_function_object< test_func<> >::type fused_func
+ boost::fusion::result_of::make_fused_function_object< test_func<> >::type fused_func
 = fusion::make_fused_function_object(f);

 BOOST_TEST(fused_func(lv_vec) == 1);

Modified: branches/release/libs/fusion/test/functional/make_fused_procedure.cpp
==============================================================================
--- branches/release/libs/fusion/test/functional/make_fused_procedure.cpp (original)
+++ branches/release/libs/fusion/test/functional/make_fused_procedure.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -69,7 +69,7 @@
 test_func<> f;
 test_func<noncopyable> f_nc;

- fusion::result_of::make_fused_procedure< test_func<> >::type fused_func
+ boost::fusion::result_of::make_fused_procedure< test_func<> >::type fused_func
 = fusion::make_fused_procedure(f);

 CHECK_EFFECT(fused_func(lv_vec), 1);

Modified: branches/release/libs/fusion/test/functional/make_unfused.cpp
==============================================================================
--- branches/release/libs/fusion/test/functional/make_unfused.cpp (original)
+++ branches/release/libs/fusion/test/functional/make_unfused.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -42,7 +42,7 @@

 template <class Self, class Seq>
 struct result< Self(Seq &) >
- : mpl::if_< mpl::and_< fusion::result_of::empty<Seq>, RemoveNullary >,
+ : mpl::if_< mpl::and_< boost::fusion::result_of::empty<Seq>, RemoveNullary >,
 boost::blank, mpl::identity<long> >::type
 { };

@@ -86,14 +86,14 @@
 test_func<> f;
 test_func<noncopyable> f_nc;

- fusion::result_of::make_unfused< test_func<> >::type unfused_func =
+ boost::fusion::result_of::make_unfused< test_func<> >::type unfused_func =
 fusion::make_unfused(f);

- fusion::result_of::make_unfused< boost::reference_wrapper<
+ boost::fusion::result_of::make_unfused< boost::reference_wrapper<
 test_func<noncopyable> > >::type unfused_func_ref =
 fusion::make_unfused(ref(f_nc));

- fusion::result_of::make_unfused< boost::reference_wrapper<
+ boost::fusion::result_of::make_unfused< boost::reference_wrapper<
 test_func<noncopyable> const> >::type unfused_func_c_ref =
 fusion::make_unfused(cref(f_nc));

Modified: branches/release/libs/fusion/test/sequence/adapt_adt.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_adt.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_adt.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -92,7 +92,6 @@
{
 using namespace boost::fusion;
 using namespace boost;
- using namespace std;

 std::cout << tuple_open('[');
 std::cout << tuple_close(']');
@@ -111,8 +110,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<ns::point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<ns::point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -149,7 +148,7 @@
 {
 BOOST_MPL_ASSERT((mpl::is_sequence<ns::point>));
 BOOST_MPL_ASSERT((boost::is_same<
- fusion::result_of::value_at_c<ns::point,0>::type
+ boost::fusion::result_of::value_at_c<ns::point,0>::type
 , mpl::front<ns::point>::type>));
 }

@@ -167,8 +166,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<ns::point_with_private_members>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<ns::point_with_private_members>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point_with_private_members>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point_with_private_members>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -178,22 +177,22 @@
 {
 BOOST_MPL_ASSERT((
 boost::is_same<
- result_of::front<ns::point>::type,
+ boost::fusion::result_of::front<ns::point>::type,
 boost::fusion::extension::adt_attribute_proxy<ns::point,0,false>
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- result_of::front<ns::point>::type::type,
+ boost::fusion::result_of::front<ns::point>::type::type,
 int
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- result_of::front<ns::point const>::type,
+ boost::fusion::result_of::front<ns::point const>::type,
 boost::fusion::extension::adt_attribute_proxy<ns::point,0,true>
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- result_of::front<ns::point const>::type::type,
+ boost::fusion::result_of::front<ns::point const>::type::type,
 int
>));
 }

Modified: branches/release/libs/fusion/test/sequence/adapt_adt_named.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_adt_named.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_adt_named.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -84,8 +84,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<adapted::point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<adapted::point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<adapted::point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<adapted::point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -128,7 +128,7 @@
 {
 BOOST_MPL_ASSERT((mpl::is_sequence<adapted::point>));
 BOOST_MPL_ASSERT((boost::is_same<
- fusion::result_of::value_at_c<adapted::point,0>::type
+ boost::fusion::result_of::value_at_c<adapted::point,0>::type
 , mpl::front<adapted::point>::type>));
 }

Modified: branches/release/libs/fusion/test/sequence/adapt_assoc_adt.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_assoc_adt.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_assoc_adt.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -74,8 +74,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<ns::point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<ns::point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -118,12 +118,12 @@

 {
 // assoc stuff
- BOOST_MPL_ASSERT((result_of::has_key<ns::point, ns::x_member>));
- BOOST_MPL_ASSERT((result_of::has_key<ns::point, ns::y_member>));
- BOOST_MPL_ASSERT((boost::mpl::not_<result_of::has_key<ns::point, ns::z_member> >));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::x_member>));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::y_member>));
+ BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<ns::point, ns::z_member> >));

- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<ns::point, ns::x_member>::type, int>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<ns::point, ns::y_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::x_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::y_member>::type, int>));

 ns::point p(5, 3);

Modified: branches/release/libs/fusion/test/sequence/adapt_assoc_adt_named.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_assoc_adt_named.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_assoc_adt_named.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -76,8 +76,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<adapted::point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<adapted::point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<adapted::point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<adapted::point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -123,12 +123,12 @@

 {
 // assoc stuff
- BOOST_MPL_ASSERT((result_of::has_key<adapted::point, ns::x_member>));
- BOOST_MPL_ASSERT((result_of::has_key<adapted::point, ns::y_member>));
- BOOST_MPL_ASSERT((boost::mpl::not_<result_of::has_key<adapted::point, ns::z_member> >));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<adapted::point, ns::x_member>));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<adapted::point, ns::y_member>));
+ BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<adapted::point, ns::z_member> >));

- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<adapted::point, ns::x_member>::type, int>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<adapted::point, ns::y_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<adapted::point, ns::x_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<adapted::point, ns::y_member>::type, int>));

 ns::point basep(5, 3);
 adapted::point p(basep);

Modified: branches/release/libs/fusion/test/sequence/adapt_assoc_struct.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_assoc_struct.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_assoc_struct.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -80,8 +80,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<ns::point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<ns::point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -117,12 +117,12 @@

 {
 // assoc stuff
- BOOST_MPL_ASSERT((fusion::result_of::has_key<ns::point, ns::x_member>));
- BOOST_MPL_ASSERT((fusion::result_of::has_key<ns::point, ns::y_member>));
- BOOST_MPL_ASSERT((mpl::not_<fusion::result_of::has_key<ns::point, ns::z_member> >));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::x_member>));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::y_member>));
+ BOOST_MPL_ASSERT((mpl::not_<boost::fusion::result_of::has_key<ns::point, ns::z_member> >));

- BOOST_MPL_ASSERT((boost::is_same<fusion::result_of::value_at_key<ns::point, ns::x_member>::type, int>));
- BOOST_MPL_ASSERT((boost::is_same<fusion::result_of::value_at_key<ns::point, ns::y_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::x_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::y_member>::type, int>));

 ns::point p = {5, 3};

@@ -133,7 +133,7 @@
 {
 BOOST_MPL_ASSERT((mpl::is_sequence<ns::point>));
 BOOST_MPL_ASSERT((boost::is_same<
- fusion::result_of::value_at_c<ns::point,0>::type
+ boost::fusion::result_of::value_at_c<ns::point,0>::type
 , mpl::front<ns::point>::type>));
 }

Modified: branches/release/libs/fusion/test/sequence/adapt_assoc_struct_named.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_assoc_struct_named.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_assoc_struct_named.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -61,8 +61,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<adapted::point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<adapted::point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<adapted::point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<adapted::point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -102,12 +102,12 @@

 {
 // assoc stuff
- BOOST_MPL_ASSERT((result_of::has_key<adapted::point, ns::x_member>));
- BOOST_MPL_ASSERT((result_of::has_key<adapted::point, ns::y_member>));
- BOOST_MPL_ASSERT((boost::mpl::not_<result_of::has_key<adapted::point, ns::z_member> >));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<adapted::point, ns::x_member>));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<adapted::point, ns::y_member>));
+ BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<adapted::point, ns::z_member> >));

- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<adapted::point, ns::x_member>::type, int>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<adapted::point, ns::y_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<adapted::point, ns::x_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<adapted::point, ns::y_member>::type, int>));

 ns::point basep = {5, 3};
 adapted::point p(basep);

Modified: branches/release/libs/fusion/test/sequence/adapt_assoc_tpl_adt.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_assoc_tpl_adt.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_assoc_tpl_adt.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -78,8 +78,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -122,12 +122,12 @@

 {
 // assoc stuff
- BOOST_MPL_ASSERT((result_of::has_key<point, ns::x_member>));
- BOOST_MPL_ASSERT((result_of::has_key<point, ns::y_member>));
- BOOST_MPL_ASSERT((boost::mpl::not_<result_of::has_key<point, ns::z_member> >));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<point, ns::x_member>));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<point, ns::y_member>));
+ BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<point, ns::z_member> >));

- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<point, ns::x_member>::type, int>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<point, ns::y_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<point, ns::x_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<point, ns::y_member>::type, int>));

 point p(5, 3);

Modified: branches/release/libs/fusion/test/sequence/adapt_assoc_tpl_struct.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_assoc_tpl_struct.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_assoc_tpl_struct.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -78,8 +78,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -115,12 +115,12 @@

 {
 // assoc stuff
- BOOST_MPL_ASSERT((result_of::has_key<point, ns::x_member>));
- BOOST_MPL_ASSERT((result_of::has_key<point, ns::y_member>));
- BOOST_MPL_ASSERT((boost::mpl::not_<result_of::has_key<point, ns::z_member> >));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<point, ns::x_member>));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<point, ns::y_member>));
+ BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<point, ns::z_member> >));

- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<point, ns::x_member>::type, int>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<point, ns::y_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<point, ns::x_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<point, ns::y_member>::type, int>));

 point p = {5, 3};

Modified: branches/release/libs/fusion/test/sequence/adapt_struct.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_struct.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_struct.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -97,8 +97,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<ns::point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<ns::point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -136,16 +136,16 @@
 using namespace boost::fusion;
 using boost::is_same;

- typedef result_of::begin<s>::type b;
- typedef result_of::end<s>::type e;
+ typedef boost::fusion::result_of::begin<s>::type b;
+ typedef boost::fusion::result_of::end<s>::type e;
 // this fails
- BOOST_MPL_ASSERT((is_same<result_of::next::type, e>));
+ BOOST_MPL_ASSERT((is_same<boost::fusion::result_of::next::type, e>));
 }

 {
 BOOST_MPL_ASSERT((mpl::is_sequence<ns::point>));
 BOOST_MPL_ASSERT((boost::is_same<
- fusion::result_of::value_at_c<ns::point,0>::type
+ boost::fusion::result_of::value_at_c<ns::point,0>::type
 , mpl::front<ns::point>::type>));
 }

Modified: branches/release/libs/fusion/test/sequence/adapt_struct_named.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_struct_named.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_struct_named.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -76,8 +76,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<adapted::point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<adapted::point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<adapted::point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<adapted::point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -119,17 +119,17 @@
 using namespace boost::fusion;
 using boost::is_same;

- typedef result_of::begin<ns1::s1>::type b;
- typedef result_of::end<ns1::s1>::type e;
+ typedef boost::fusion::result_of::begin<ns1::s1>::type b;
+ typedef boost::fusion::result_of::end<ns1::s1>::type e;
 // this fails
- BOOST_MPL_ASSERT((is_same<result_of::next::type, e>));
+ BOOST_MPL_ASSERT((is_same<boost::fusion::result_of::next::type, e>));
 }

 {
 BOOST_MPL_ASSERT((mpl::is_sequence<adapted::point>));
 BOOST_MPL_ASSERT((boost::is_same<
- fusion::result_of::value_at_c<adapted::point,0>::type
+ boost::fusion::result_of::value_at_c<adapted::point,0>::type
 , mpl::front<adapted::point>::type>));
 }

Modified: branches/release/libs/fusion/test/sequence/adapt_tpl_adt.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_tpl_adt.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_tpl_adt.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -86,8 +86,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);

Modified: branches/release/libs/fusion/test/sequence/adapt_tpl_struct.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_tpl_struct.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_tpl_struct.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -73,8 +73,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -111,10 +111,10 @@
 { // begin/end
 using namespace boost::fusion;

- typedef result_of::begin<s<int> >::type b;
- typedef result_of::end<s<int> >::type e;
+ typedef boost::fusion::result_of::begin<s<int> >::type b;
+ typedef boost::fusion::result_of::end<s<int> >::type e;
 // this fails
- BOOST_MPL_ASSERT((boost::is_same<result_of::next::type, e>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::next::type, e>));
 }

 return boost::report_errors();

Modified: branches/release/libs/fusion/test/sequence/adt_attribute_proxy.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adt_attribute_proxy.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adt_attribute_proxy.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -82,65 +82,65 @@

 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::value_at_key<et, keys::name>::type,
+ boost::fusion::result_of::value_at_key<et, keys::name>::type,
 std::string
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::value_at_key<et, keys::name>::type,
- fusion::result_of::value_at_c<et, 0>::type
+ boost::fusion::result_of::value_at_key<et, keys::name>::type,
+ boost::fusion::result_of::value_at_c<et, 0>::type
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::value_at_key<et, keys::age>::type,
+ boost::fusion::result_of::value_at_key<et, keys::age>::type,
 int
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::value_at_key<et, keys::age>::type,
- fusion::result_of::value_at_c<et, 1>::type
+ boost::fusion::result_of::value_at_key<et, keys::age>::type,
+ boost::fusion::result_of::value_at_c<et, 1>::type
>));

 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::at_key<et, keys::name>::type,
+ boost::fusion::result_of::at_key<et, keys::name>::type,
 fusion::extension::adt_attribute_proxy<et, 0, false>
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::at_key<et, keys::age>::type,
+ boost::fusion::result_of::at_key<et, keys::age>::type,
 fusion::extension::adt_attribute_proxy<et, 1, false>
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::at_key<et, keys::name>::type,
- fusion::result_of::front<et>::type
+ boost::fusion::result_of::at_key<et, keys::name>::type,
+ boost::fusion::result_of::front<et>::type
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::at_key<et, keys::age>::type,
- fusion::result_of::back<et>::type
+ boost::fusion::result_of::at_key<et, keys::age>::type,
+ boost::fusion::result_of::back<et>::type
>));

 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::at_key<etc, keys::name>::type,
+ boost::fusion::result_of::at_key<etc, keys::name>::type,
 fusion::extension::adt_attribute_proxy<et, 0, true>
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::at_key<etc, keys::age>::type,
+ boost::fusion::result_of::at_key<etc, keys::age>::type,
 fusion::extension::adt_attribute_proxy<et, 1, true>
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::at_key<etc, keys::name>::type,
- fusion::result_of::front<etc>::type
+ boost::fusion::result_of::at_key<etc, keys::name>::type,
+ boost::fusion::result_of::front<etc>::type
>));
 BOOST_MPL_ASSERT((
 boost::is_same<
- fusion::result_of::at_key<etc, keys::age>::type,
- fusion::result_of::back<etc>::type
+ boost::fusion::result_of::at_key<etc, keys::age>::type,
+ boost::fusion::result_of::back<etc>::type
>));

 BOOST_MPL_ASSERT((

Modified: branches/release/libs/fusion/test/sequence/as_map.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/as_map.cpp (original)
+++ branches/release/libs/fusion/test/sequence/as_map.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -36,7 +36,7 @@
 {
 typedef pair<int, char> p1;
 typedef pair<double, std::string> p2;
- result_of::as_map<list<p1, p2> >::type map(make_pair<int>('X'), make_pair<double>("Men"));
+ boost::fusion::result_of::as_map<list<p1, p2> >::type map(make_pair<int>('X'), make_pair<double>("Men"));
 std::cout << at_key<int>(map) << std::endl;
 std::cout << at_key<double>(map) << std::endl;
 BOOST_TEST(at_key<int>(map) == 'X');

Modified: branches/release/libs/fusion/test/sequence/as_set.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/as_set.cpp (original)
+++ branches/release/libs/fusion/test/sequence/as_set.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -40,7 +40,7 @@
 }

 {
- result_of::as_set<list<int, double, std::string> >::type set(1, 1.23, "harru");
+ boost::fusion::result_of::as_set<list<int, double, std::string> >::type set(1, 1.23, "harru");
 std::cout << at_key<int>(set) << std::endl;
 BOOST_TEST(at_key<int>(set) == 1);
 }

Modified: branches/release/libs/fusion/test/sequence/boost_tuple.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/boost_tuple.cpp (original)
+++ branches/release/libs/fusion/test/sequence/boost_tuple.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -57,8 +57,8 @@
 at_c<1>(t) = "mama mia";
 BOOST_TEST(t == make_vector(6, "mama mia"));

- BOOST_STATIC_ASSERT(result_of::size<tuple_type>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<tuple_type>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<tuple_type>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<tuple_type>::value);

 BOOST_TEST(front(t) == 6);
 }

Modified: branches/release/libs/fusion/test/sequence/define_assoc_struct.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/define_assoc_struct.cpp (original)
+++ branches/release/libs/fusion/test/sequence/define_assoc_struct.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -51,8 +51,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<ns::point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<ns::point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -88,12 +88,12 @@

 {
 // assoc stuff
- BOOST_MPL_ASSERT((result_of::has_key<ns::point, ns::x_member>));
- BOOST_MPL_ASSERT((result_of::has_key<ns::point, ns::y_member>));
- BOOST_MPL_ASSERT((boost::mpl::not_<result_of::has_key<ns::point, ns::z_member> >));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::x_member>));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::y_member>));
+ BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<ns::point, ns::z_member> >));

- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<ns::point, ns::x_member>::type, int>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<ns::point, ns::y_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::x_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::y_member>::type, int>));

 ns::point p(5, 3);

Modified: branches/release/libs/fusion/test/sequence/define_assoc_tpl_struct.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/define_assoc_tpl_struct.cpp (original)
+++ branches/release/libs/fusion/test/sequence/define_assoc_tpl_struct.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -55,8 +55,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -92,12 +92,12 @@

 {
 // assoc stuff
- BOOST_MPL_ASSERT((result_of::has_key<point, ns::x_member>));
- BOOST_MPL_ASSERT((result_of::has_key<point, ns::y_member>));
- BOOST_MPL_ASSERT((boost::mpl::not_<result_of::has_key<point, ns::z_member> >));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<point, ns::x_member>));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<point, ns::y_member>));
+ BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<point, ns::z_member> >));

- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<point, ns::x_member>::type, int>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<point, ns::y_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<point, ns::x_member>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<point, ns::y_member>::type, int>));

 point p(5, 3);

Modified: branches/release/libs/fusion/test/sequence/define_struct.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/define_struct.cpp (original)
+++ branches/release/libs/fusion/test/sequence/define_struct.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -48,8 +48,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<ns::point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<ns::point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -86,10 +86,10 @@
 { // begin/end
 using namespace boost::fusion;

- typedef result_of::begin<s>::type b;
- typedef result_of::end<s>::type e;
+ typedef boost::fusion::result_of::begin<s>::type b;
+ typedef boost::fusion::result_of::end<s>::type e;
 // this fails
- BOOST_MPL_ASSERT((boost::is_same<result_of::next::type, e>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::next::type, e>));
 }

 {

Modified: branches/release/libs/fusion/test/sequence/define_tpl_struct.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/define_tpl_struct.cpp (original)
+++ branches/release/libs/fusion/test/sequence/define_tpl_struct.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -51,8 +51,8 @@
 at_c<1>(p) = 9;
 BOOST_TEST(p == make_vector(6, 9));

- BOOST_STATIC_ASSERT(result_of::size<point>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<point>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<point>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == 9);
@@ -89,10 +89,10 @@
 { // begin/end
 using namespace boost::fusion;

- typedef result_of::begin<s<int> >::type b;
- typedef result_of::end<s<int> >::type e;
+ typedef boost::fusion::result_of::begin<s<int> >::type b;
+ typedef boost::fusion::result_of::end<s<int> >::type e;
 // this fails
- BOOST_MPL_ASSERT((boost::is_same<result_of::next::type, e>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::next::type, e>));
 }

Modified: branches/release/libs/fusion/test/sequence/filter_view.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/filter_view.cpp (original)
+++ branches/release/libs/fusion/test/sequence/filter_view.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -77,7 +77,7 @@
 filter_view_type view(v);
 std::cout << view << std::endl;
 BOOST_TEST((view == make_vector('@', 987654, true, 6.6)));
- BOOST_STATIC_ASSERT(result_of::size<filter_view_type>::value == 4);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<filter_view_type>::value == 4);
 }

 //cschmidt: This is illegal C++. ADL instantiates less<_, int_<3> > - which
@@ -94,7 +94,7 @@
 filter_view_type view(v);
 std::cout << view << std::endl;
 BOOST_TEST((view == make_vector(1, 2, 0, -1)));
- BOOST_STATIC_ASSERT(result_of::size<filter_view_type>::value == 4);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<filter_view_type>::value == 4);
#endif
 }*/

@@ -104,7 +104,7 @@
 typedef vector<int> vec;
 typedef filter_view<vec, reject_all> filter_view_type;

- BOOST_MPL_ASSERT((result_of::equal_to<result_of::begin<filter_view_type>::type, result_of::end<filter_view_type>::type>));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::equal_to<boost::fusion::result_of::begin<filter_view_type>::type, boost::fusion::result_of::end<filter_view_type>::type>));
 }

 {
@@ -114,11 +114,11 @@
 typedef filter_view<map_type const, is_same<_, pair<double, std::string> > > filter_view_type;
 filter_view_type f(m);

- BOOST_MPL_ASSERT((result_of::has_key<filter_view_type, double>::type));
- BOOST_MPL_ASSERT_NOT((result_of::has_key<filter_view_type, void>::type));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<filter_view_type, double>::type));
+ BOOST_MPL_ASSERT_NOT((boost::fusion::result_of::has_key<filter_view_type, void>::type));

- BOOST_MPL_ASSERT((is_same<result_of::key_of<result_of::begin<filter_view_type>::type>::type, double>));
- BOOST_MPL_ASSERT((is_same<result_of::value_of_data<result_of::begin<filter_view_type>::type>::type, std::string>));
+ BOOST_MPL_ASSERT((is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::begin<filter_view_type>::type>::type, double>));
+ BOOST_MPL_ASSERT((is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::begin<filter_view_type>::type>::type, std::string>));

 std::cout << deref_data(begin(f)) << std::endl;
 BOOST_TEST((deref_data(begin(f)) == "Bond"));

Modified: branches/release/libs/fusion/test/sequence/iterator.hpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/iterator.hpp (original)
+++ branches/release/libs/fusion/test/sequence/iterator.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -30,7 +30,7 @@
 char const* s = "Hello";
 typedef FUSION_SEQUENCE<int, char, double, char const*> seq_type;
 seq_type v(1, 'x', 3.3, s);
- result_of::begin<seq_type>::type i(v);
+ boost::fusion::result_of::begin<seq_type>::type i(v);

 BOOST_TEST(*i == 1);
 BOOST_TEST(*next(i) == 'x');
@@ -62,7 +62,7 @@
 char const* s = "Hello";
 typedef FUSION_SEQUENCE<int, char, double, char const*> const seq_type;
 seq_type t(1, 'x', 3.3, s);
- result_of::begin<seq_type>::type i(t);
+ boost::fusion::result_of::begin<seq_type>::type i(t);

 BOOST_TEST(*i == 1);
 BOOST_TEST(*next(i) == 'x');
@@ -80,22 +80,22 @@

 typedef FUSION_SEQUENCE<int, char, double, char const*> seq_type;
 typedef FUSION_SEQUENCE<int, char, double, char const*> const cseq_type;
- typedef result_of::begin<seq_type>::type vi1;
- typedef result_of::begin<cseq_type>::type vi2;
- BOOST_STATIC_ASSERT((result_of::equal_to<vi1 const, vi1>::value));
- BOOST_STATIC_ASSERT((result_of::equal_to<vi1, vi1 const>::value));
- BOOST_STATIC_ASSERT((result_of::equal_to<vi1, vi2>::value));
- BOOST_STATIC_ASSERT((result_of::equal_to<vi1 const, vi2>::value));
- BOOST_STATIC_ASSERT((result_of::equal_to<vi1, vi2 const>::value));
- BOOST_STATIC_ASSERT((result_of::equal_to<vi1 const, vi2 const>::value));
+ typedef boost::fusion::result_of::begin<seq_type>::type vi1;
+ typedef boost::fusion::result_of::begin<cseq_type>::type vi2;
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::equal_to<vi1 const, vi1>::value));
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::equal_to<vi1, vi1 const>::value));
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::equal_to<vi1, vi2>::value));
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::equal_to<vi1 const, vi2>::value));
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::equal_to<vi1, vi2 const>::value));
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::equal_to<vi1 const, vi2 const>::value));
 }

 {
 typedef FUSION_SEQUENCE<int, int> seq_type;
- typedef result_of::begin<seq_type>::type begin_type;
- typedef result_of::end<seq_type>::type end_type;
- typedef result_of::next<begin_type>::type i1;
- typedef result_of::next<i1>::type i2;
+ typedef boost::fusion::result_of::begin<seq_type>::type begin_type;
+ typedef boost::fusion::result_of::end<seq_type>::type end_type;
+ typedef boost::fusion::result_of::next<begin_type>::type i1;
+ typedef boost::fusion::result_of::next<i1>::type i2;

 BOOST_STATIC_ASSERT((is_same<end_type, i2>::value));
 }
@@ -105,7 +105,7 @@
 char const* s = "Hello";
 typedef FUSION_SEQUENCE<int, char, double, char const*> seq_type;
 seq_type t(1, 'x', 3.3, s);
- result_of::begin<seq_type>::type i(t);
+ boost::fusion::result_of::begin<seq_type>::type i(t);

 BOOST_TEST(*i == 1);
 BOOST_TEST(*next(i) == 'x');
@@ -138,34 +138,34 @@
 typedef FUSION_SEQUENCE<int, char, double, char const*> seq_type;
 seq_type t(1, 'x', 3.3, "Hello");

- BOOST_STATIC_ASSERT((result_of::distance<
- result_of::begin<seq_type>::type
- , result_of::end<seq_type>::type >::value == 4));
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::distance<
+ boost::fusion::result_of::begin<seq_type>::type
+ , boost::fusion::result_of::end<seq_type>::type >::value == 4));

 BOOST_TEST(distance(begin(t), end(t)).value == 4);
 }

- { // Testing tuple iterator result_of::value_of, result_of::deref, result_of::value_at
+ { // Testing tuple iterator boost::fusion::result_of::value_of, boost::fusion::result_of::deref, boost::fusion::result_of::value_at

 typedef FUSION_SEQUENCE<int, char&> seq_type;
- typedef result_of::begin<seq_type>::type i0;
- typedef result_of::next<i0>::type i1;
- typedef result_of::next<result_of::begin<const seq_type>::type>::type i2;
+ typedef boost::fusion::result_of::begin<seq_type>::type i0;
+ typedef boost::fusion::result_of::next<i0>::type i1;
+ typedef boost::fusion::result_of::next<boost::fusion::result_of::begin<const seq_type>::type>::type i2;

 BOOST_STATIC_ASSERT((
- is_same<result_of::value_at_c<seq_type, 0>::type, int>::value));
+ is_same<boost::fusion::result_of::value_at_c<seq_type, 0>::type, int>::value));

 BOOST_STATIC_ASSERT((
- is_same<result_of::value_at_c<seq_type, 1>::type, char&>::value));
+ is_same<boost::fusion::result_of::value_at_c<seq_type, 1>::type, char&>::value));

 BOOST_STATIC_ASSERT((
 is_same<traits::category_of<i0>::type, FUSION_TRAVERSAL_TAG>::value));

- BOOST_STATIC_ASSERT((is_same<result_of::deref<i0>::type, int&>::value));
- BOOST_STATIC_ASSERT((is_same<result_of::deref<i1>::type, char&>::value));
+ BOOST_STATIC_ASSERT((is_same<boost::fusion::result_of::deref<i0>::type, int&>::value));
+ BOOST_STATIC_ASSERT((is_same<boost::fusion::result_of::deref<i1>::type, char&>::value));

- BOOST_STATIC_ASSERT((is_same<result_of::value_of<i0>::type, int>::value));
- BOOST_STATIC_ASSERT((is_same<result_of::value_of<i1>::type, char&>::value));
+ BOOST_STATIC_ASSERT((is_same<boost::fusion::result_of::value_of<i0>::type, int>::value));
+ BOOST_STATIC_ASSERT((is_same<boost::fusion::result_of::value_of<i1>::type, char&>::value));
 }

 { // Testing advance

Modified: branches/release/libs/fusion/test/sequence/iterator_range.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/iterator_range.cpp (original)
+++ branches/release/libs/fusion/test/sequence/iterator_range.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -50,7 +50,7 @@
 slice_t slice(i1, i3);
 std::cout << slice << std::endl;
 BOOST_TEST((slice == make_vector('x', 3.3)));
- BOOST_STATIC_ASSERT(result_of::size<slice_t>::value == 2);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<slice_t>::value == 2);
 }

 {
@@ -64,7 +64,7 @@
 slice_t slice(i1, i3);
 std::cout << slice << std::endl;
 BOOST_TEST(slice == make_vector());
- BOOST_STATIC_ASSERT(result_of::size<slice_t>::value == 0);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<slice_t>::value == 0);
 }
 }

@@ -82,7 +82,7 @@
 slice_t slice(f, l);
 std::cout << slice << std::endl;
 BOOST_TEST((slice == make_vector(3, 4)));
- BOOST_STATIC_ASSERT(result_of::size<slice_t>::value == 2);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<slice_t>::value == 2);
 }

 {
@@ -90,19 +90,19 @@
 map_type m(make_pair<void>("foo"), make_pair<double>('x'), make_pair<void*>(2));

 typedef iterator_range<
- result_of::begin<map_type>::type
- , result_of::advance_c<result_of::begin<map_type>::type,2>::type
+ boost::fusion::result_of::begin<map_type>::type
+ , boost::fusion::result_of::advance_c<boost::fusion::result_of::begin<map_type>::type,2>::type
> range_type;
 range_type r(begin(m), advance_c<2>(begin(m)));

- BOOST_MPL_ASSERT((result_of::has_key<range_type, void>::type));
- BOOST_MPL_ASSERT((result_of::has_key<range_type, double>::type));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<range_type, void>::type));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<range_type, double>::type));

- BOOST_MPL_ASSERT((boost::is_same<result_of::key_of<result_of::begin<range_type>::type>::type, void>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::key_of<result_of::next<result_of::begin<range_type>::type>::type>::type, double>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::begin<range_type>::type>::type, void>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::next<boost::fusion::result_of::begin<range_type>::type>::type>::type, double>));

- BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<result_of::begin<range_type>::type>::type, std::string>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<range_type>::type>::type>::type, char>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::begin<range_type>::type>::type, std::string>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::next<boost::fusion::result_of::begin<range_type>::type>::type>::type, char>));

 std::cout << deref_data(begin(r)) << std::endl;
 std::cout << deref_data(fusion::next(begin(r))) << std::endl;

Modified: branches/release/libs/fusion/test/sequence/joint_view.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/joint_view.cpp (original)
+++ branches/release/libs/fusion/test/sequence/joint_view.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -159,20 +159,20 @@
 typedef joint_view<map_type, set_type> joint_view_type;
 joint_view_type j(m,s);

- BOOST_MPL_ASSERT((result_of::has_key<joint_view_type, void>::type));
- BOOST_MPL_ASSERT((result_of::has_key<joint_view_type, std::string>::type));
- BOOST_MPL_ASSERT((result_of::has_key<joint_view_type, float>::type));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<joint_view_type, void>::type));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<joint_view_type, std::string>::type));
+ BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<joint_view_type, float>::type));

- BOOST_MPL_ASSERT((boost::is_same<result_of::key_of<result_of::begin<joint_view_type>::type>::type, void>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::key_of<result_of::next<result_of::begin<joint_view_type>::type>::type>::type, std::string>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::begin<joint_view_type>::type>::type, void>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::next<boost::fusion::result_of::begin<joint_view_type>::type>::type>::type, std::string>));
 BOOST_MPL_ASSERT((boost::is_same<
- result_of::key_of<result_of::next<result_of::next<result_of::begin<joint_view_type>::type>::type>::type>::type
+ boost::fusion::result_of::key_of<boost::fusion::result_of::next<boost::fusion::result_of::next<boost::fusion::result_of::begin<joint_view_type>::type>::type>::type>::type
 , float>));

- BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<result_of::begin<joint_view_type>::type>::type, int>));
- BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<joint_view_type>::type>::type>::type, std::string>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::begin<joint_view_type>::type>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::next<boost::fusion::result_of::begin<joint_view_type>::type>::type>::type, std::string>));
 BOOST_MPL_ASSERT((boost::is_same<
- result_of::value_of_data<result_of::next<result_of::next<result_of::begin<joint_view_type>::type>::type>::type>::type
+ boost::fusion::result_of::value_of_data<boost::fusion::result_of::next<boost::fusion::result_of::next<boost::fusion::result_of::begin<joint_view_type>::type>::type>::type>::type
 , float>));

 std::cout << deref_data(begin(j)) << std::endl;

Modified: branches/release/libs/fusion/test/sequence/map.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/map.cpp (original)
+++ branches/release/libs/fusion/test/sequence/map.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -56,15 +56,15 @@
 BOOST_TEST(at_key<double>(m) == "Men");

 BOOST_STATIC_ASSERT((
- boost::is_same<result_of::value_at_key<map_type, int>::type, char>::value));
+ boost::is_same<boost::fusion::result_of::value_at_key<map_type, int>::type, char>::value));
 BOOST_STATIC_ASSERT((
- boost::is_same<result_of::value_at_key<map_type, double>::type, std::string>::value));
+ boost::is_same<boost::fusion::result_of::value_at_key<map_type, double>::type, std::string>::value));

 std::cout << m << std::endl;

- BOOST_STATIC_ASSERT((result_of::has_key<map_type, int>::value));
- BOOST_STATIC_ASSERT((result_of::has_key<map_type, double>::value));
- BOOST_STATIC_ASSERT((!result_of::has_key<map_type, std::string>::value));
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::has_key<map_type, int>::value));
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::has_key<map_type, double>::value));
+ BOOST_STATIC_ASSERT((!boost::fusion::result_of::has_key<map_type, std::string>::value));

 std::cout << deref_data(begin(m)) << std::endl;
 std::cout << deref_data(fusion::next(begin(m))) << std::endl;
@@ -72,10 +72,10 @@
 BOOST_TEST(deref_data(begin(m)) == 'X');
 BOOST_TEST(deref_data(fusion::next(begin(m))) == "Men");

- BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::begin<map_type>::type>::type, int>::value));
- BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::next<result_of::begin<map_type>::type>::type>::type, double>::value));
- BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::begin<map_type>::type>::type, char>::value));
- BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<map_type>::type>::type>::type, std::string>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::begin<map_type>::type>::type, int>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::next<boost::fusion::result_of::begin<map_type>::type>::type>::type, double>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::begin<map_type>::type>::type, char>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::next<boost::fusion::result_of::begin<map_type>::type>::type>::type, std::string>::value));
 }

 {

Modified: branches/release/libs/fusion/test/sequence/misc.hpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/misc.hpp (original)
+++ branches/release/libs/fusion/test/sequence/misc.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -21,7 +21,7 @@
#endif

#if !defined(FUSION_SIZE)
-#define FUSION_SIZE result_of::size
+#define FUSION_SIZE boost::fusion::result_of::size
#endif

template <typename S1, typename S2>
@@ -144,8 +144,8 @@

 BOOST_STATIC_ASSERT(FUSION_SIZE<t1>::value == 3);
 BOOST_STATIC_ASSERT(FUSION_SIZE<t2>::value == 0);
- BOOST_STATIC_ASSERT(!result_of::empty<t1>::value);
- BOOST_STATIC_ASSERT(result_of::empty<t2>::value);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<t1>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::empty<t2>::value);
 }

 { // testing front & back

Modified: branches/release/libs/fusion/test/sequence/reverse_view.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/reverse_view.cpp (original)
+++ branches/release/libs/fusion/test/sequence/reverse_view.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -54,9 +54,9 @@
 std::cout << rev << std::endl;
 BOOST_TEST((rev == make_vector(s, 123456789, 'x', 123)));

- typedef result_of::begin<view_type>::type first_type;
+ typedef boost::fusion::result_of::begin<view_type>::type first_type;
 first_type first_it(begin(rev));
- typedef result_of::next<first_type>::type second_type;
+ typedef boost::fusion::result_of::next<first_type>::type second_type;
 second_type second_it(next(first_it));
 BOOST_TEST((*second_it == 123456789));
 BOOST_TEST((*prior(second_it) == s));
@@ -69,16 +69,16 @@
 BOOST_TEST((at_c<3>(rev)==123));

 BOOST_MPL_ASSERT((
- boost::is_same<result_of::value_at_c<view_type,0>::type,char const*>
+ boost::is_same<boost::fusion::result_of::value_at_c<view_type,0>::type,char const*>
 ));
 BOOST_MPL_ASSERT((
- boost::is_same<result_of::value_at_c<view_type,1>::type,long>
+ boost::is_same<boost::fusion::result_of::value_at_c<view_type,1>::type,long>
 ));
 BOOST_MPL_ASSERT((
- boost::is_same<result_of::value_at_c<view_type,2>::type,char>
+ boost::is_same<boost::fusion::result_of::value_at_c<view_type,2>::type,char>
 ));
 BOOST_MPL_ASSERT((
- boost::is_same<result_of::value_at_c<view_type,3>::type,int>
+ boost::is_same<boost::fusion::result_of::value_at_c<view_type,3>::type,int>
 ));
 }

Copied: branches/release/libs/fusion/test/sequence/segmented_iterator_range.cpp (from r73834, /trunk/libs/fusion/test/sequence/segmented_iterator_range.cpp)
==============================================================================
--- /trunk/libs/fusion/test/sequence/segmented_iterator_range.cpp (original)
+++ branches/release/libs/fusion/test/sequence/segmented_iterator_range.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -7,12 +7,11 @@
==============================================================================*/
#include <sstream>
#include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
-#include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
+#include <boost/fusion/algorithm/iteration/for_each.hpp>
+#include <boost/fusion/algorithm/query/find_if.hpp>
#include <boost/fusion/container/vector/vector.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
-#include <boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp>
#include <boost/fusion/sequence/comparison/equal_to.hpp>
#include <boost/fusion/sequence/io/out.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
@@ -44,23 +43,23 @@
 using namespace fusion;
 using mpl::_;

- typedef typename fusion::result_of::find_if_s<Tree const, is_same<_,short> >::type short_iter;
- typedef typename fusion::result_of::find_if_s<Tree const, is_same<_,float> >::type float_iter;
+ typedef typename boost::fusion::result_of::find_if<Tree const, is_same<_,short> >::type short_iter;
+ typedef typename boost::fusion::result_of::find_if<Tree const, is_same<_,float> >::type float_iter;

 typedef iterator_range<short_iter, float_iter> slice_t;
 BOOST_STATIC_ASSERT(traits::is_segmented<slice_t>::value);

- // find_if_s of a segmented data structure returns generic
+ // find_if of a segmented data structure returns generic
 // segmented iterators
- short_iter si = find_if_s<is_same<_,short> >(tree);
- float_iter fi = find_if_s<is_same<_,float> >(tree);
+ short_iter si = find_if<is_same<_,short> >(tree);
+ float_iter fi = find_if<is_same<_,float> >(tree);

 // If you put them in an iterator range, the range
 // is automatically a segmented data structure.
 slice_t slice(si, fi);

 std::stringstream sout;
- fusion::for_each_s(slice, ostream_fun(sout));
+ fusion::for_each(slice, ostream_fun(sout));
 BOOST_TEST((sout.str() == "100 e f 0 B "));
}

@@ -89,7 +88,7 @@
 slice_t slice(i1, i3);
 std::cout << slice << std::endl;
 BOOST_TEST((slice == make_vector('x', 3.3)));
- BOOST_STATIC_ASSERT(result_of::size<slice_t>::value == 2);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<slice_t>::value == 2);
 }

 {
@@ -103,7 +102,7 @@
 slice_t slice(i1, i3);
 std::cout << slice << std::endl;
 BOOST_TEST(slice == make_vector());
- BOOST_STATIC_ASSERT(result_of::size<slice_t>::value == 0);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<slice_t>::value == 0);
 }
 }

@@ -121,7 +120,7 @@
 slice_t slice(f, l);
 std::cout << slice << std::endl;
 BOOST_TEST((slice == make_vector(3, 4)));
- BOOST_STATIC_ASSERT(result_of::size<slice_t>::value == 2);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<slice_t>::value == 2);
 }

 {

Modified: branches/release/libs/fusion/test/sequence/set.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/set.cpp (original)
+++ branches/release/libs/fusion/test/sequence/set.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -51,15 +51,15 @@
 BOOST_TEST(at_key<std::string>(m) == "Hola");

 BOOST_STATIC_ASSERT((
- boost::is_same<result_of::value_at_key<set_type, int>::type, int>::value));
+ boost::is_same<boost::fusion::result_of::value_at_key<set_type, int>::type, int>::value));
 BOOST_STATIC_ASSERT((
- boost::is_same<result_of::value_at_key<set_type, std::string>::type, std::string>::value));
+ boost::is_same<boost::fusion::result_of::value_at_key<set_type, std::string>::type, std::string>::value));

 std::cout << m << std::endl;

- BOOST_STATIC_ASSERT((result_of::has_key<set_type, int>::value));
- BOOST_STATIC_ASSERT((result_of::has_key<set_type, std::string>::value));
- BOOST_STATIC_ASSERT((!result_of::has_key<set_type, double>::value));
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::has_key<set_type, int>::value));
+ BOOST_STATIC_ASSERT((boost::fusion::result_of::has_key<set_type, std::string>::value));
+ BOOST_STATIC_ASSERT((!boost::fusion::result_of::has_key<set_type, double>::value));

 std::cout << deref_data(begin(m)) << std::endl;
 std::cout << deref_data(fusion::next(begin(m))) << std::endl;
@@ -67,10 +67,10 @@
 BOOST_TEST(deref_data(begin(m)) == 123);
 BOOST_TEST(deref_data(fusion::next(begin(m))) == "Hola");

- BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::begin<set_type>::type>::type, int>::value));
- BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
- BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::begin<set_type>::type>::type, int>::value));
- BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::begin<set_type>::type>::type, int>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::next<boost::fusion::result_of::begin<set_type>::type>::type>::type, std::string>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::begin<set_type>::type>::type, int>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::next<boost::fusion::result_of::begin<set_type>::type>::type>::type, std::string>::value));
 }

 {

Modified: branches/release/libs/fusion/test/sequence/single_view.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/single_view.cpp (original)
+++ branches/release/libs/fusion/test/sequence/single_view.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -76,7 +76,7 @@
 BOOST_TEST(end(view1) == advance_c<0>(end(view1)));
 BOOST_TEST(begin(view1) == advance_c<-1>(end(view1)));
 BOOST_TEST(1 == size(view1));
- BOOST_MPL_ASSERT((boost::is_same<int, result_of::value_at<single_view<int>, boost::mpl::int_<0> >::type>));
+ BOOST_MPL_ASSERT((boost::is_same<int, boost::fusion::result_of::value_at<single_view<int>, boost::mpl::int_<0> >::type>));

 single_view<X> view2;
 std::cout << view2 << std::endl;

Modified: branches/release/libs/fusion/test/sequence/std_pair.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/std_pair.cpp (original)
+++ branches/release/libs/fusion/test/sequence/std_pair.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -56,8 +56,8 @@
 at_c<1>(p) = "mama mia";
 BOOST_TEST(p == make_vector(6, "mama mia"));

- BOOST_STATIC_ASSERT(result_of::size<pair_type>::value == 2);
- BOOST_STATIC_ASSERT(!result_of::empty<pair_type>::value);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<pair_type>::value == 2);
+ BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<pair_type>::value);

 BOOST_TEST(front(p) == 6);
 BOOST_TEST(back(p) == "mama mia");

Modified: branches/release/libs/fusion/test/sequence/swap.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/swap.cpp (original)
+++ branches/release/libs/fusion/test/sequence/swap.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -22,7 +22,7 @@
 namespace fusion = boost::fusion;
 {
 typedef fusion::vector<std::vector<int>, char> test_vector;
- BOOST_MPL_ASSERT((boost::is_same<void, fusion::result_of::swap<test_vector, test_vector>::type>));
+ BOOST_MPL_ASSERT((boost::is_same<void, boost::fusion::result_of::swap<test_vector, test_vector>::type>));

 test_vector v1(std::vector<int>(1, 101), 'a'), v2(std::vector<int>(1, 202), 'b');

Copied: branches/release/libs/fusion/test/sequence/tree.hpp (from r73834, /trunk/libs/fusion/test/sequence/tree.hpp)
==============================================================================
--- /trunk/libs/fusion/test/sequence/tree.hpp (original)
+++ branches/release/libs/fusion/test/sequence/tree.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -19,18 +19,14 @@
#include <boost/fusion/container/vector/vector10.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/sequence/intrinsic/segments.hpp>
-#include <boost/fusion/sequence/intrinsic/detail/segmented_size.hpp>
#include <boost/fusion/support/is_segmented.hpp>
-#include <boost/fusion/iterator/segmented_iterator.hpp>
-#include <boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp>
-#include <boost/fusion/sequence/intrinsic/detail/segmented_end.hpp>
+#include <boost/fusion/sequence/intrinsic/segments.hpp>

namespace boost { namespace fusion
{
 struct tree_tag;

- template<typename Data, typename Left = nil, typename Right = nil>
+ template <typename Data, typename Left = nil, typename Right = nil>
 struct tree
 : sequence_base<tree<Data, Left, Right> >
 {
@@ -38,7 +34,7 @@
 typedef Left left_type;
 typedef Right right_type;
 typedef tree_tag fusion_tag;
- typedef bidirectional_traversal_tag category;
+ typedef forward_traversal_tag category;
 typedef mpl::false_ is_view;

 typedef typename mpl::if_<
@@ -59,13 +55,13 @@
 segments_type segments;
 };

- template<typename Data>
+ template <typename Data>
 tree<Data> make_tree(Data const &data)
 {
 return tree<Data>(data);
 }

- template<typename Data, typename Left, typename Right>
+ template <typename Data, typename Left, typename Right>
 tree<Data, Left, Right> make_tree(Data const &data, Left const &left, Right const &right)
 {
 return tree<Data, Left, Right>(data, left, right);
@@ -73,17 +69,17 @@

 namespace extension
 {
- template<>
+ template <>
 struct is_segmented_impl<tree_tag>
 {
- template<typename Sequence>
+ template <typename Sequence>
 struct apply : mpl::true_ {};
 };

- template<>
+ template <>
 struct segments_impl<tree_tag>
 {
- template<typename Sequence>
+ template <typename Sequence>
 struct apply
 {
 typedef typename mpl::if_<
@@ -98,33 +94,6 @@
 }
 };
 };
-
- template<>
- struct begin_impl<tree_tag>
- {
- template<typename Sequence>
- struct apply
- : segmented_begin<Sequence>
- {};
- };
-
- template<>
- struct end_impl<tree_tag>
- {
- template<typename Sequence>
- struct apply
- : segmented_end<Sequence>
- {};
- };
-
- template<>
- struct size_impl<tree_tag>
- {
- template<typename Sequence>
- struct apply
- : segmented_size<Sequence>::type
- {};
- };
 }
}}

Modified: branches/release/libs/fusion/test/sequence/value_at.hpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/value_at.hpp (original)
+++ branches/release/libs/fusion/test/sequence/value_at.hpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -16,7 +16,7 @@
#endif

#if !defined(FUSION_VALUE_AT)
-#define FUSION_VALUE_AT(S, N) result_of::value_at_c<S, N>
+#define FUSION_VALUE_AT(S, N) boost::fusion::result_of::value_at_c<S, N>
#endif

namespace test_detail

Modified: branches/release/libs/fusion/test/sequence/vector_n.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/vector_n.cpp (original)
+++ branches/release/libs/fusion/test/sequence/vector_n.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -42,10 +42,10 @@
 {
 typedef vector1<int> type;
 type vec;
- BOOST_STATIC_ASSERT(result_of::size<type>::value == 1);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<type>::value == 1);

 BOOST_TEST(at_c<0>(vec) == 0);
- BOOST_STATIC_ASSERT((boost::is_same<int, result_of::value_at_c<type, 0>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<int, boost::fusion::result_of::value_at_c<type, 0>::type>::value));

 // prove that it is mutable
 at_c<0>(vec) = 987;
@@ -77,13 +77,13 @@
 {
 typedef vector2<int, char> type;
 type vec;
- BOOST_STATIC_ASSERT(result_of::size<type>::value == 2);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<type>::value == 2);

 BOOST_TEST(at_c<0>(vec) == 0);
 BOOST_TEST(at_c<1>(vec) == char());

- BOOST_STATIC_ASSERT((boost::is_same<int, result_of::value_at_c<type, 0>::type>::value));
- BOOST_STATIC_ASSERT((boost::is_same<char, result_of::value_at_c<type, 1>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<int, boost::fusion::result_of::value_at_c<type, 0>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<char, boost::fusion::result_of::value_at_c<type, 1>::type>::value));
 }

 {
@@ -103,15 +103,15 @@
 {
 typedef vector3<int, char, double> type;
 type vec;
- BOOST_STATIC_ASSERT(result_of::size<type>::value == 3);
+ BOOST_STATIC_ASSERT(boost::fusion::result_of::size<type>::value == 3);

 BOOST_TEST(at_c<0>(vec) == 0);
 BOOST_TEST(at_c<1>(vec) == char());
 BOOST_TEST(at_c<2>(vec) == double());

- BOOST_STATIC_ASSERT((boost::is_same<int, result_of::value_at_c<type, 0>::type>::value));
- BOOST_STATIC_ASSERT((boost::is_same<char, result_of::value_at_c<type, 1>::type>::value));
- BOOST_STATIC_ASSERT((boost::is_same<double, result_of::value_at_c<type, 2>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<int, boost::fusion::result_of::value_at_c<type, 0>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<char, boost::fusion::result_of::value_at_c<type, 1>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<double, boost::fusion::result_of::value_at_c<type, 2>::type>::value));
 }

 {
@@ -147,13 +147,13 @@
 BOOST_TEST(at_c<5>(vec) >= 5.9 && at_c<5>(vec) <= 6.1);
 BOOST_TEST(at_c<6>(vec) >= 6.9 && at_c<6>(vec) <= 7.1);

- BOOST_STATIC_ASSERT((boost::is_same<bool, result_of::value_at_c<type, 0>::type>::value));
- BOOST_STATIC_ASSERT((boost::is_same<char, result_of::value_at_c<type, 1>::type>::value));
- BOOST_STATIC_ASSERT((boost::is_same<short, result_of::value_at_c<type, 2>::type>::value));
- BOOST_STATIC_ASSERT((boost::is_same<int, result_of::value_at_c<type, 3>::type>::value));
- BOOST_STATIC_ASSERT((boost::is_same<long, result_of::value_at_c<type, 4>::type>::value));
- BOOST_STATIC_ASSERT((boost::is_same<float, result_of::value_at_c<type, 5>::type>::value));
- BOOST_STATIC_ASSERT((boost::is_same<double, result_of::value_at_c<type, 6>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<bool, boost::fusion::result_of::value_at_c<type, 0>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<char, boost::fusion::result_of::value_at_c<type, 1>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<short, boost::fusion::result_of::value_at_c<type, 2>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<int, boost::fusion::result_of::value_at_c<type, 3>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<long, boost::fusion::result_of::value_at_c<type, 4>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<float, boost::fusion::result_of::value_at_c<type, 5>::type>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<double, boost::fusion::result_of::value_at_c<type, 6>::type>::value));
 cout << "(bool, char, short, int, long, float, double): " << sizeof(vec) << endl;
 }

Modified: branches/release/libs/fusion/test/sequence/zip_view_ignore.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/zip_view_ignore.cpp (original)
+++ branches/release/libs/fusion/test/sequence/zip_view_ignore.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -34,19 +34,19 @@
 BOOST_TEST(at_c<0>(back(v)) == 2);
 BOOST_TEST(at_c<2>(back(v)) == 'b');

- typedef result_of::begin<view>::type first_iterator;
- typedef result_of::value_of<first_iterator>::type first_element;
+ typedef boost::fusion::result_of::begin<view>::type first_iterator;
+ typedef boost::fusion::result_of::value_of<first_iterator>::type first_element;

- typedef result_of::at_c<first_element, 0>::type e0;
- typedef result_of::at_c<first_element, 2>::type e2;
+ typedef boost::fusion::result_of::at_c<first_element, 0>::type e0;
+ typedef boost::fusion::result_of::at_c<first_element, 2>::type e2;
 BOOST_MPL_ASSERT((boost::is_same<e0, int&>));
 BOOST_MPL_ASSERT((boost::is_same<e2, char&>));

 BOOST_TEST(size(front(v)) == 3);

- typedef result_of::value_at_c<view, 0>::type first_value_at;
- typedef result_of::value_at_c<first_value_at, 0>::type v0;
- typedef result_of::value_at_c<first_value_at, 2>::type v2;
+ typedef boost::fusion::result_of::value_at_c<view, 0>::type first_value_at;
+ typedef boost::fusion::result_of::value_at_c<first_value_at, 0>::type v0;
+ typedef boost::fusion::result_of::value_at_c<first_value_at, 2>::type v2;

 BOOST_MPL_ASSERT((boost::is_same<v0, int>));
 BOOST_MPL_ASSERT((boost::is_same<v2, char>));

Modified: branches/release/libs/proto/test/Jamfile.v2
==============================================================================
--- branches/release/libs/proto/test/Jamfile.v2 (original)
+++ branches/release/libs/proto/test/Jamfile.v2 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
@@ -16,6 +16,7 @@
 <toolset>gcc:<cxxflags>-ftemplate-depth-1024
 <library>/boost/test//boost_unit_test_framework
 <link>static
+# <define>BOOST_PROTO_DONT_USE_PREPROCESSED_FILES
 ;

test-suite "proto"
@@ -29,8 +30,7 @@
 [ run lambda.cpp ]
 [ run make_expr.cpp ]
 [ run matches.cpp ]
- [ run proto_fusion.cpp : : : <toolset>gcc:<cxxflags>-ftemplate-depth-1024 ]
- [ run proto_fusion_s.cpp ]
+ [ run flatten.cpp ]
 [ run toy_spirit.cpp ]
 [ run toy_spirit2.cpp ]
 [ run make.cpp ]

Deleted: branches/release/libs/proto/test/proto_fusion.cpp
==============================================================================
--- branches/release/libs/proto/test/proto_fusion.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
+++ (empty file)
@@ -1,124 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// proto_fusion.cpp
-//
-// Copyright 2008 Eric Niebler. 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/proto/core.hpp>
-#include <boost/proto/fusion.hpp>
-#include <boost/fusion/include/for_each.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/utility/addressof.hpp>
-#include <sstream>
-
-boost::proto::terminal<char>::type a_ = {'a'};
-boost::proto::terminal<char>::type b_ = {'b'};
-boost::proto::terminal<char>::type c_ = {'c'};
-boost::proto::terminal<char>::type d_ = {'d'};
-boost::proto::terminal<char>::type e_ = {'e'};
-boost::proto::terminal<char>::type f_ = {'f'};
-boost::proto::terminal<char>::type g_ = {'g'};
-boost::proto::terminal<char>::type h_ = {'h'};
-boost::proto::terminal<char>::type i_ = {'i'};
-
-std::ostream &operator <<(std::ostream &sout, boost::proto::tag::shift_right)
-{
- return sout << ">>";
-}
-
-std::ostream &operator <<(std::ostream &sout, boost::proto::tag::bitwise_or)
-{
- return sout << "|";
-}
-
-template<typename Args>
-std::ostream &operator <<(std::ostream &sout, boost::proto::expr<boost::proto::tag::terminal, Args, 0> const *op)
-{
- return sout << boost::proto::value(*op);
-}
-
-template<typename Tag, typename Args>
-std::ostream &operator <<(std::ostream &sout, boost::proto::expr<Tag, Args, 1> const *op)
-{
- return sout << Tag() << boost::addressof(boost::proto::child(*op));
-}
-
-template<typename Tag, typename Args>
-std::ostream &operator <<(std::ostream &sout, boost::proto::expr<Tag, Args, 2> const *op)
-{
- return sout << boost::addressof(boost::proto::left(*op)) << Tag() << boost::addressof(boost::proto::right(*op));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// to_string
-//
-struct to_string
-{
- to_string(std::ostream &sout)
- : sout_(sout)
- {}
-
- template<typename Op>
- void operator ()(Op const &op) const
- {
- this->sout_ << '(' << boost::addressof(op) << ')';
- }
-private:
- std::ostream &sout_;
-};
-
-void test1()
-{
- using boost::proto::flatten;
-
- std::stringstream sout;
-
- // Test for 1-way branching "tree"
- sout.str("");
- boost::fusion::for_each(flatten(!!!!(a_ >> b_)), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)", sout.str());
-
- // Tests for 2-way branching trees
- sout.str("");
- boost::fusion::for_each(flatten(a_ >> b_ >> c_), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b)(c)", sout.str());
-
- sout.str("");
- boost::fusion::for_each(flatten(a_ | b_ | c_), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b)(c)", sout.str());
-
- sout.str("");
- boost::fusion::for_each(flatten(a_ >> b_ | c_ >> d_), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)(c>>d)", sout.str());
-
- sout.str("");
- boost::fusion::for_each(flatten(a_ | b_ >> c_ | d_), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b>>c)(d)", sout.str());
-
- sout.str("");
- boost::fusion::for_each(flatten(a_ >> b_ | c_ >> d_ | e_ >> f_ >> g_), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)(c>>d)(e>>f>>g)", sout.str());
-
- sout.str("");
- boost::fusion::for_each(flatten(a_ >> b_ | c_ >> d_ | e_ >> (f_ | g_) >> h_), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)(c>>d)(e>>f|g>>h)", sout.str());
-
- // Test for n-way branching tree
- sout.str("");
- boost::fusion::for_each(flatten(a_(b_(c_ >> d_, e_ | f_), g_ >> h_)(i_)), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b)(c>>d)(e|f)(g>>h)(i)", sout.str());
-}
-
-using namespace boost::unit_test;
-///////////////////////////////////////////////////////////////////////////////
-// init_unit_test_suite
-//
-test_suite* init_unit_test_suite( int argc, char* argv[] )
-{
- test_suite *test = BOOST_TEST_SUITE("test proto and fusion integration");
-
- test->add(BOOST_TEST_CASE(&test1));
-
- return test;
-}

Deleted: branches/release/libs/proto/test/proto_fusion_s.cpp
==============================================================================
--- branches/release/libs/proto/test/proto_fusion_s.cpp 2011-09-08 23:27:28 EDT (Thu, 08 Sep 2011)
+++ (empty file)
@@ -1,211 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// proto_fusion_s.cpp
-//
-// Copyright 2008 Eric Niebler. 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/proto/core.hpp>
-#include <boost/proto/fusion.hpp>
-#include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/utility/addressof.hpp>
-#include <sstream>
-
-std::ostream &operator <<(std::ostream &sout, boost::proto::tag::shift_right)
-{
- return sout << ">>";
-}
-
-std::ostream &operator <<(std::ostream &sout, boost::proto::tag::bitwise_or)
-{
- return sout << "|";
-}
-
-template<typename Args>
-std::ostream &operator <<(std::ostream &sout, boost::proto::expr<boost::proto::tag::terminal, Args, 0> const *op)
-{
- return sout << boost::proto::value(*op);
-}
-
-template<typename Args>
-std::ostream &operator <<(std::ostream &sout, boost::proto::basic_expr<boost::proto::tag::terminal, Args, 0> const *op)
-{
- return sout << boost::proto::value(*op);
-}
-
-template<typename Tag, typename Args>
-std::ostream &operator <<(std::ostream &sout, boost::proto::expr<Tag, Args, 1> const *op)
-{
- return sout << Tag() << boost::addressof(boost::proto::child(*op).proto_base());
-}
-
-template<typename Tag, typename Args>
-std::ostream &operator <<(std::ostream &sout, boost::proto::basic_expr<Tag, Args, 1> const *op)
-{
- return sout << Tag() << boost::addressof(boost::proto::child(*op).proto_base());
-}
-
-template<typename Tag, typename Args>
-std::ostream &operator <<(std::ostream &sout, boost::proto::expr<Tag, Args, 2> const *op)
-{
- return sout << boost::addressof(boost::proto::left(*op).proto_base()) << Tag() << boost::addressof(boost::proto::right(*op).proto_base());
-}
-
-template<typename Tag, typename Args>
-std::ostream &operator <<(std::ostream &sout, boost::proto::basic_expr<Tag, Args, 2> const *op)
-{
- return sout << boost::addressof(boost::proto::left(*op).proto_base()) << Tag() << boost::addressof(boost::proto::right(*op).proto_base());
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// to_string
-//
-struct to_string
-{
- to_string(std::ostream &sout)
- : sout_(sout)
- {}
-
- template<typename Op>
- void operator ()(Op const &op) const
- {
- this->sout_ << '(' << boost::addressof(op.proto_base()) << ')';
- }
-private:
- std::ostream &sout_;
-};
-
-void test1()
-{
- using boost::proto::flatten;
-
- boost::proto::terminal<char>::type a_ = {'a'};
- boost::proto::terminal<char>::type b_ = {'b'};
- boost::proto::terminal<char>::type c_ = {'c'};
- boost::proto::terminal<char>::type d_ = {'d'};
- boost::proto::terminal<char>::type e_ = {'e'};
- boost::proto::terminal<char>::type f_ = {'f'};
- boost::proto::terminal<char>::type g_ = {'g'};
- boost::proto::terminal<char>::type h_ = {'h'};
- boost::proto::terminal<char>::type i_ = {'i'};
-
- std::stringstream sout;
-
- // Test for 1-way branching "tree"
- sout.str("");
- boost::fusion::for_each_s(flatten(!!!!(a_ >> b_)), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)", sout.str());
-
- // Tests for 2-way branching trees
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ >> b_ >> c_), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b)(c)", sout.str());
-
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ | b_ | c_), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b)(c)", sout.str());
-
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ >> b_ | c_ >> d_), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)(c>>d)", sout.str());
-
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ | b_ >> c_ | d_), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b>>c)(d)", sout.str());
-
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ >> b_ | c_ >> d_ | e_ >> f_ >> g_), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)(c>>d)(e>>f>>g)", sout.str());
-
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ >> b_ | c_ >> d_ | e_ >> (f_ | g_) >> h_), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)(c>>d)(e>>f|g>>h)", sout.str());
-
- // Test for n-way branching tree
- sout.str("");
- boost::fusion::for_each_s(flatten(a_(b_(c_ >> d_, e_ | f_), g_ >> h_)(i_)), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b)(c>>d)(e|f)(g>>h)(i)", sout.str());
-}
-
-////////////////////////////////////////////////////////////////////////
-// Test that EXTENDS expression wrappers are also valid fusion sequences
-
-template<typename Expr>
-struct My;
-
-struct MyDomain
- : boost::proto::domain<boost::proto::pod_generator<My> >
-{};
-
-template<typename Expr>
-struct My
-{
- BOOST_PROTO_EXTENDS(Expr, My<Expr>, MyDomain)
-};
-
-void test2()
-{
- using boost::proto::flatten;
-
- My<boost::proto::terminal<char>::type> a_ = {{'a'}};
- My<boost::proto::terminal<char>::type> b_ = {{'b'}};
- My<boost::proto::terminal<char>::type> c_ = {{'c'}};
- My<boost::proto::terminal<char>::type> d_ = {{'d'}};
- My<boost::proto::terminal<char>::type> e_ = {{'e'}};
- My<boost::proto::terminal<char>::type> f_ = {{'f'}};
- My<boost::proto::terminal<char>::type> g_ = {{'g'}};
- My<boost::proto::terminal<char>::type> h_ = {{'h'}};
- My<boost::proto::terminal<char>::type> i_ = {{'i'}};
-
- std::stringstream sout;
-
- // Test for 1-way branching "tree"
- sout.str("");
- boost::fusion::for_each_s(flatten(!!!!(a_ >> b_)), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)", sout.str());
-
- // Tests for 2-way branching trees
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ >> b_ >> c_), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b)(c)", sout.str());
-
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ | b_ | c_), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b)(c)", sout.str());
-
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ >> b_ | c_ >> d_), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)(c>>d)", sout.str());
-
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ | b_ >> c_ | d_), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b>>c)(d)", sout.str());
-
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ >> b_ | c_ >> d_ | e_ >> f_ >> g_), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)(c>>d)(e>>f>>g)", sout.str());
-
- sout.str("");
- boost::fusion::for_each_s(flatten(a_ >> b_ | c_ >> d_ | e_ >> (f_ | g_) >> h_), to_string(sout));
- BOOST_CHECK_EQUAL("(a>>b)(c>>d)(e>>f|g>>h)", sout.str());
-
- // Test for n-way branching tree
- sout.str("");
- boost::fusion::for_each_s(flatten(a_(b_(c_ >> d_, e_ | f_), g_ >> h_)(i_)), to_string(sout));
- BOOST_CHECK_EQUAL("(a)(b)(c>>d)(e|f)(g>>h)(i)", sout.str());
-}
-
-using namespace boost::unit_test;
-///////////////////////////////////////////////////////////////////////////////
-// init_unit_test_suite
-//
-test_suite* init_unit_test_suite( int argc, char* argv[] )
-{
- test_suite *test = BOOST_TEST_SUITE("test proto and segmented fusion integration");
-
- test->add(BOOST_TEST_CASE(&test1));
- test->add(BOOST_TEST_CASE(&test2));
-
- return test;
-}

Next message: dnljms_at_[hidden]: "[Boost-commit] svn:boost r74326 - trunk/boost/unordered/detail"
Previous message: joel_at_[hidden]: "[Boost-commit] svn:boost r74324 - trunk/libs/spirit/example/qi/compiler_tutorial"

Date view	Thread view	Subject view	Author view

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