From cda74605fc40f8d23f775f5fd39bd243a4c2dbfc Mon Sep 17 00:00:00 2001 From: Christopher Schmidt Date: Fri, 1 Jan 2010 22:00:21 +0000 Subject: [PATCH] fusion: merge of associative iterators/views and the new fold interface [SVN r58618] --- changelist.txt | 7 +- doc/algorithm.qbk | 211 +++++++++++----- doc/changelog.qbk | 6 +- doc/extension.qbk | 36 +-- doc/fusion.qbk | 6 +- doc/html/fusion/acknowledgements.html | 4 + doc/html/fusion/adapted.html | 11 + doc/html/fusion/adapted/adapt_assoc.html | 43 ++++ doc/html/fusion/adapted/adapt_struct.html | 43 ++++ doc/html/fusion/adapted/boost__array.html | 33 +++ doc/html/fusion/adapted/boost__tuple.html | 30 +++ doc/html/fusion/adapted/mpl_sequence.html | 35 +++ doc/html/fusion/adapted/std__pair.html | 33 +++ doc/html/fusion/algorithm.html | 25 ++ doc/html/fusion/algorithm/iteration.html | 11 + .../fusion/algorithm/iteration/functions.html | 4 + .../iteration/functions/accumulate.html | 225 ++++++++++++++++- .../algorithm/iteration/functions/fold.html | 222 ++++++++++++++++- .../iteration/functions/for_each.html | 168 ++++++++++++- .../algorithm/iteration/metafunctions.html | 4 + .../iteration/metafunctions/accumulate.html | 162 +++++++++++- .../iteration/metafunctions/fold.html | 162 +++++++++++- .../iteration/metafunctions/for_each.html | 143 ++++++++++- doc/html/fusion/algorithm/query.html | 11 + .../fusion/algorithm/query/functions.html | 4 + .../fusion/algorithm/query/functions/all.html | 168 ++++++++++++- .../fusion/algorithm/query/functions/any.html | 168 ++++++++++++- .../algorithm/query/functions/count.html | 168 ++++++++++++- .../algorithm/query/functions/count_if.html | 168 ++++++++++++- .../algorithm/query/functions/find.html | 168 ++++++++++++- .../algorithm/query/functions/find_if.html | 154 +++++++++++- .../algorithm/query/functions/none.html | 168 ++++++++++++- .../fusion/algorithm/query/metafunctions.html | 4 + .../algorithm/query/metafunctions/all.html | 143 ++++++++++- .../algorithm/query/metafunctions/any.html | 143 ++++++++++- .../algorithm/query/metafunctions/count.html | 143 ++++++++++- .../query/metafunctions/count_if.html | 143 ++++++++++- .../algorithm/query/metafunctions/find.html | 148 ++++++++++- .../query/metafunctions/find_if.html | 148 ++++++++++- .../algorithm/query/metafunctions/none.html | 143 ++++++++++- doc/html/fusion/algorithm/transformation.html | 11 + .../algorithm/transformation/functions.html | 4 + .../transformation/functions/clear.html | 168 ++++++++++++- .../transformation/functions/erase.html | 200 ++++++++++++++- .../transformation/functions/erase_key.html | 192 +++++++++++++- .../transformation/functions/filter.html | 184 +++++++++++++- .../transformation/functions/filter_if.html | 184 +++++++++++++- .../transformation/functions/insert.html | 187 +++++++++++++- .../functions/insert_range.html | 184 +++++++++++++- .../transformation/functions/join.html | 187 +++++++++++++- .../transformation/functions/pop_back.html | 184 +++++++++++++- .../transformation/functions/pop_front.html | 184 +++++++++++++- .../transformation/functions/push_back.html | 184 +++++++++++++- .../transformation/functions/push_front.html | 184 +++++++++++++- .../transformation/functions/remove.html | 184 +++++++++++++- .../transformation/functions/remove_if.html | 184 +++++++++++++- .../transformation/functions/replace.html | 168 ++++++++++++- .../transformation/functions/replace_if.html | 168 ++++++++++++- .../transformation/functions/reverse.html | 189 +++++++++++++- .../transformation/functions/transform.html | 218 +++++++++++++++- .../transformation/functions/zip.html | 168 ++++++++++++- .../transformation/metafunctions.html | 4 + .../transformation/metafunctions/clear.html | 143 ++++++++++- .../transformation/metafunctions/erase.html | 159 +++++++++++- .../metafunctions/erase_key.html | 160 +++++++++++- .../transformation/metafunctions/filter.html | 159 +++++++++++- .../metafunctions/filter_if.html | 159 +++++++++++- .../transformation/metafunctions/insert.html | 159 +++++++++++- .../metafunctions/insert_range.html | 159 +++++++++++- .../transformation/metafunctions/join.html | 154 +++++++++++- .../metafunctions/pop_back.html | 161 +++++++++++- .../metafunctions/pop_front.html | 144 ++++++++++- .../metafunctions/push_back.html | 144 ++++++++++- .../metafunctions/push_front.html | 144 ++++++++++- .../transformation/metafunctions/remove.html | 159 +++++++++++- .../metafunctions/remove_if.html | 159 +++++++++++- .../transformation/metafunctions/replace.html | 143 ++++++++++- .../metafunctions/replace_if.html | 143 ++++++++++- .../transformation/metafunctions/reverse.html | 164 +++++++++++- .../metafunctions/transform.html | 234 +++++++++++++++++- .../transformation/metafunctions/zip.html | 137 +++++++++- doc/html/fusion/change_log.html | 4 + doc/html/fusion/container.html | 11 + doc/html/fusion/container/cons.html | 61 +++++ doc/html/fusion/container/conversion.html | 11 + .../container/conversion/functions.html | 4 + .../conversion/functions/as_list.html | 162 +++++++++++- .../conversion/functions/as_map.html | 162 +++++++++++- .../conversion/functions/as_set.html | 162 +++++++++++- .../conversion/functions/as_vector.html | 162 +++++++++++- .../container/conversion/metafunctions.html | 4 + .../conversion/metafunctions/as_list.html | 162 +++++++++++- .../conversion/metafunctions/as_map.html | 162 +++++++++++- .../conversion/metafunctions/as_set.html | 162 +++++++++++- .../conversion/metafunctions/as_vector.html | 162 +++++++++++- doc/html/fusion/container/generation.html | 11 + .../container/generation/functions.html | 4 + .../generation/functions/list_tie.html | 162 +++++++++++- .../generation/functions/make_cons.html | 187 +++++++++++++- .../generation/functions/make_list.html | 187 +++++++++++++- .../generation/functions/make_map.html | 187 +++++++++++++- .../generation/functions/make_set.html | 187 +++++++++++++- .../generation/functions/make_vector.html | 187 +++++++++++++- .../generation/functions/map_tie.html | 162 +++++++++++- .../container/generation/functions/tiers.html | 69 +++++- .../generation/functions/vector_tie.html | 162 +++++++++++- .../container/generation/metafunctions.html | 4 + .../generation/metafunctions/list_tie.html | 162 +++++++++++- .../generation/metafunctions/make_cons.html | 162 +++++++++++- .../generation/metafunctions/make_list.html | 162 +++++++++++- .../generation/metafunctions/make_map.html | 187 +++++++++++++- .../generation/metafunctions/make_set.html | 162 +++++++++++- .../generation/metafunctions/make_vector.html | 162 +++++++++++- .../generation/metafunctions/map_tie.html | 162 +++++++++++- .../generation/metafunctions/vector_tie.html | 162 +++++++++++- doc/html/fusion/container/list.html | 61 +++++ doc/html/fusion/container/map.html | 59 +++++ doc/html/fusion/container/set.html | 59 +++++ doc/html/fusion/container/vector.html | 58 +++++ doc/html/fusion/extension.html | 4 + doc/html/fusion/extension/ext_full.html | 98 +++++++- .../fusion/extension/iterator_facade.html | 152 +++++++++++- .../fusion/extension/sequence_facade.html | 82 +++++- doc/html/fusion/functional.html | 29 +++ doc/html/fusion/functional/adapters.html | 4 + .../fusion/functional/adapters/fused.html | 72 ++++++ .../adapters/fused_function_object.html | 60 +++++ .../functional/adapters/fused_procedure.html | 60 +++++ .../fusion/functional/adapters/limits.html | 22 ++ .../fusion/functional/adapters/unfused.html | 67 +++++ .../functional/adapters/unfused_typed.html | 67 +++++ doc/html/fusion/functional/concepts.html | 4 + .../fusion/functional/concepts/callable.html | 31 +++ .../functional/concepts/def_callable.html | 41 +++ doc/html/fusion/functional/concepts/poly.html | 40 +++ .../functional/concepts/reg_callable.html | 40 +++ doc/html/fusion/functional/generation.html | 4 + .../functional/generation/functions.html | 4 + .../generation/functions/mk_fused.html | 187 +++++++++++++- .../generation/functions/mk_fused_fobj.html | 187 +++++++++++++- .../generation/functions/mk_fused_proc.html | 187 +++++++++++++- .../generation/functions/mk_unfused.html | 187 +++++++++++++- .../functional/generation/metafunctions.html | 4 + .../generation/metafunctions/mk_fused.html | 112 ++++++++- .../metafunctions/mk_fused_fobj.html | 112 ++++++++- .../metafunctions/mk_fused_proc.html | 112 ++++++++- .../generation/metafunctions/mk_unfused.html | 112 ++++++++- doc/html/fusion/functional/invocation.html | 4 + .../functional/invocation/functions.html | 4 + .../invocation/functions/invoke.html | 187 +++++++++++++- .../invocation/functions/invoke_fobj.html | 187 +++++++++++++- .../invocation/functions/invoke_proc.html | 187 +++++++++++++- .../fusion/functional/invocation/limits.html | 22 ++ .../functional/invocation/metafunctions.html | 4 + .../invocation/metafunctions/invoke.html | 87 ++++++- .../invocation/metafunctions/invoke_fobj.html | 87 ++++++- .../invocation/metafunctions/invoke_proc.html | 87 ++++++- doc/html/fusion/introduction.html | 61 ++++- doc/html/fusion/iterator.html | 17 ++ doc/html/fusion/iterator/concepts.html | 12 +- .../concepts/associative_iterator.html | 228 +++++++++++++++++ .../concepts/bidirectional_iterator.html | 53 ++++ .../iterator/concepts/forward_iterator.html | 47 ++++ .../concepts/random_access_iterator.html | 46 +++- doc/html/fusion/iterator/functions.html | 13 +- .../fusion/iterator/functions/advance.html | 76 +++++- .../fusion/iterator/functions/advance_c.html | 82 +++++- doc/html/fusion/iterator/functions/deref.html | 76 +++++- .../fusion/iterator/functions/deref_data.html | 138 +++++++++++ .../fusion/iterator/functions/distance.html | 76 +++++- doc/html/fusion/iterator/functions/next.html | 76 +++++- doc/html/fusion/iterator/functions/prior.html | 76 +++++- doc/html/fusion/iterator/metafunctions.html | 7 + .../iterator/metafunctions/advance.html | 79 +++++- .../iterator/metafunctions/advance_c.html | 85 ++++++- .../fusion/iterator/metafunctions/deref.html | 76 +++++- .../iterator/metafunctions/deref_data.html | 139 +++++++++++ .../iterator/metafunctions/distance.html | 80 +++++- .../iterator/metafunctions/equal_to.html | 80 +++++- .../fusion/iterator/metafunctions/key_of.html | 139 +++++++++++ .../fusion/iterator/metafunctions/next.html | 77 +++++- .../fusion/iterator/metafunctions/prior.html | 77 +++++- .../iterator/metafunctions/value_of.html | 79 +++++- .../iterator/metafunctions/value_of_data.html | 140 +++++++++++ doc/html/fusion/iterator/operator.html | 13 +- .../iterator/operator/operator_equality.html | 65 ++++- .../operator/operator_inequality.html | 65 ++++- .../operator/operator_unary_star.html | 73 +++++- doc/html/fusion/notes.html | 106 +++++++- doc/html/fusion/organization.html | 65 ++++- doc/html/fusion/preface.html | 67 ++++- doc/html/fusion/quick_start.html | 100 +++++++- doc/html/fusion/references.html | 4 + doc/html/fusion/sequence.html | 19 +- doc/html/fusion/sequence/concepts.html | 18 ++ .../concepts/associative_sequence.html | 50 +++- .../concepts/bidirectional_sequence.html | 50 ++++ .../sequence/concepts/forward_sequence.html | 59 +++++ .../concepts/random_access_sequence.html | 53 ++++ doc/html/fusion/sequence/intrinsic.html | 50 +++- .../fusion/sequence/intrinsic/functions.html | 4 + .../sequence/intrinsic/functions/at.html | 162 +++++++++++- .../sequence/intrinsic/functions/at_c.html | 162 +++++++++++- .../sequence/intrinsic/functions/at_key.html | 162 +++++++++++- .../sequence/intrinsic/functions/back.html | 162 +++++++++++- .../sequence/intrinsic/functions/begin.html | 186 +++++++++++++- .../sequence/intrinsic/functions/empty.html | 162 +++++++++++- .../sequence/intrinsic/functions/end.html | 186 +++++++++++++- .../sequence/intrinsic/functions/front.html | 162 +++++++++++- .../sequence/intrinsic/functions/has_key.html | 162 +++++++++++- .../sequence/intrinsic/functions/size.html | 162 +++++++++++- .../sequence/intrinsic/functions/swap.html | 137 +++++++++- .../sequence/intrinsic/metafunctions.html | 4 + .../sequence/intrinsic/metafunctions/at.html | 161 +++++++++++- .../intrinsic/metafunctions/at_c.html | 161 +++++++++++- .../intrinsic/metafunctions/at_key.html | 161 +++++++++++- .../intrinsic/metafunctions/back.html | 128 +++++++++- .../intrinsic/metafunctions/begin.html | 152 +++++++++++- .../intrinsic/metafunctions/empty.html | 128 +++++++++- .../sequence/intrinsic/metafunctions/end.html | 152 +++++++++++- .../intrinsic/metafunctions/front.html | 128 +++++++++- .../intrinsic/metafunctions/has_key.html | 128 +++++++++- .../intrinsic/metafunctions/size.html | 128 +++++++++- .../intrinsic/metafunctions/swap.html | 103 +++++++- .../intrinsic/metafunctions/value_at.html | 128 +++++++++- .../intrinsic/metafunctions/value_at_c.html | 128 +++++++++- .../intrinsic/metafunctions/value_at_key.html | 128 +++++++++- doc/html/fusion/sequence/operator.html | 4 + .../fusion/sequence/operator/comparison.html | 11 + .../sequence/operator/comparison/equal.html | 162 +++++++++++- .../operator/comparison/greater_than.html | 137 +++++++++- .../comparison/greater_than_equal.html | 137 +++++++++- .../operator/comparison/less_than.html | 137 +++++++++- .../operator/comparison/less_than_equal.html | 137 +++++++++- .../operator/comparison/not_equal.html | 137 +++++++++- doc/html/fusion/sequence/operator/i_o.html | 11 + doc/html/fusion/sequence/operator/i_o/in.html | 162 +++++++++++- .../fusion/sequence/operator/i_o/out.html | 162 +++++++++++- doc/html/fusion/support.html | 4 + doc/html/fusion/support/category_of.html | 73 ++++-- doc/html/fusion/support/deduce.html | 44 ++++ doc/html/fusion/support/deduce_sequence.html | 44 ++++ doc/html/fusion/support/is_sequence.html | 49 ++++ doc/html/fusion/support/is_view.html | 50 ++++ doc/html/fusion/support/pair.html | 53 +++- doc/html/fusion/support/tag_of.html | 54 ++++ doc/html/fusion/tuple.html | 4 + .../fusion/tuple/class_template_tuple.html | 11 + .../class_template_tuple/construction.html | 23 ++ .../class_template_tuple/element_access.html | 19 ++ .../relational_operators.html | 20 ++ .../tuple_creation_functions.html | 19 ++ .../tuple_helper_classes.html | 19 ++ doc/html/fusion/tuple/pairs.html | 22 ++ doc/html/fusion/view.html | 11 + doc/html/fusion/view/filter_view.html | 71 ++++++ doc/html/fusion/view/iterator_range.html | 75 +++++- doc/html/fusion/view/joint_view.html | 74 ++++++ doc/html/fusion/view/nview.html | 61 +++++ doc/html/fusion/view/reverse_view.html | 70 ++++++ doc/html/fusion/view/single_view.html | 48 ++++ doc/html/fusion/view/transform_view.html | 49 ++++ doc/html/fusion/view/zip_view.html | 63 +++++ doc/html/index.html | 56 ++++- doc/iterator.qbk | 198 ++++++++++++++- doc/sequence.qbk | 110 ++++++-- doc/support.qbk | 25 +- doc/view.qbk | 15 +- example/extension/detail/category_of_impl.hpp | 2 +- example/extension/detail/deref_data_impl.hpp | 30 +++ example/extension/detail/key_of_impl.hpp | 42 ++++ .../extension/detail/value_of_data_impl.hpp | 30 +++ example/extension/example_struct_iterator.hpp | 12 +- example/extension/test_example.cpp | 3 + example/performance/accumulate.cpp | 4 +- example/performance/inner_product2.cpp | 4 +- include/boost/fusion/adapted/array/tag_of.hpp | 19 ++ .../fusion/adapted/boost_tuple/tag_of.hpp | 51 ++++ .../adapted/class/adapt_assoc_class.hpp | 94 ------- .../fusion/adapted/class/adapt_class.hpp | 104 -------- .../fusion/adapted/class/class_iterator.hpp | 105 -------- .../fusion/adapted/class/detail/at_impl.hpp | 70 ------ .../adapted/class/detail/at_key_impl.hpp | 54 ---- .../adapted/class/detail/begin_impl.hpp | 40 --- .../adapted/class/detail/category_of_impl.hpp | 35 --- include/boost/fusion/adapted/std_pair.hpp | 91 ++++--- .../boost/fusion/adapted/std_pair/tag_of.hpp | 19 ++ .../adapted/struct/adapt_assoc_struct.hpp | 19 ++ .../fusion/adapted/struct/adapt_struct.hpp | 19 ++ .../boost/fusion/adapted/struct/extension.hpp | 87 ++++--- .../algorithm/iteration/detail/fold.hpp | 98 ++++---- .../algorithm/query/detail/assoc_find.hpp | 35 --- .../fusion/algorithm/query/detail/find_if.hpp | 26 +- include/boost/fusion/algorithm/query/find.hpp | 35 ++- .../boost/fusion/algorithm/query/find_if.hpp | 35 ++- .../algorithm/transformation/erase_key.hpp | 11 +- .../boost/fusion/container/deque/deque.hpp | 1 + .../container/map/detail/at_key_impl.hpp | 49 ---- .../container/map/detail/begin_impl.hpp | 69 +++--- .../container/map/detail/deref_data_impl.hpp | 48 ++++ .../container/map/detail/deref_impl.hpp | 45 ++++ .../fusion/container/map/detail/end_impl.hpp | 66 +++-- .../container/map/detail/key_of_impl.hpp | 32 +++ .../container/map/detail/lookup_key.hpp | 99 -------- .../container/map/detail/map_lookup.hpp | 128 ---------- .../map/detail/value_at_key_impl.hpp | 33 --- .../map/detail/value_of_data_impl.hpp | 32 +++ .../container/map/detail/value_of_impl.hpp | 39 +++ include/boost/fusion/container/map/map.hpp | 12 +- .../boost/fusion/container/map/map_fwd.hpp | 2 + .../container/set/detail/at_key_impl.hpp | 49 ---- .../container/set/detail/begin_impl.hpp | 69 +++--- .../container/set/detail/deref_data_impl.hpp | 24 ++ .../container/set/detail/deref_impl.hpp | 45 ++++ .../fusion/container/set/detail/end_impl.hpp | 66 +++-- .../container/set/detail/key_of_impl.hpp | 24 ++ .../container/set/detail/lookup_key.hpp | 93 ------- .../container/set/detail/set_lookup.hpp | 128 ---------- .../set/detail/value_at_key_impl.hpp | 35 --- .../set/detail/value_of_data_impl.hpp | 24 ++ .../container/set/detail/value_of_impl.hpp | 34 +++ include/boost/fusion/container/set/set.hpp | 12 +- .../boost/fusion/container/set/set_fwd.hpp | 2 + include/boost/fusion/include/deref_data.hpp | 13 + include/boost/fusion/include/key_of.hpp | 13 + .../boost/fusion/include/value_of_data.hpp | 13 + .../boost/fusion/iterator/basic_iterator.hpp | 136 ++++++++++ include/boost/fusion/iterator/deref_data.hpp | 49 ++++ .../boost/fusion/iterator/iterator_facade.hpp | 3 +- include/boost/fusion/iterator/key_of.hpp | 42 ++++ .../boost/fusion/iterator/value_of_data.hpp | 42 ++++ .../fusion/sequence/intrinsic/at_key.hpp | 21 +- .../fusion/sequence/intrinsic/ext_/size_s.hpp | 4 +- .../fusion/sequence/intrinsic/has_key.hpp | 16 +- .../sequence/intrinsic/value_at_key.hpp | 10 +- include/boost/fusion/support/category_of.hpp | 4 +- .../view/detail/strictest_traversal.hpp | 4 +- .../fusion/view/ext_/segmented_iterator.hpp | 56 +++-- .../view/filter_view/detail/begin_impl.hpp | 5 +- .../filter_view/detail/deref_data_impl.hpp | 37 +++ .../view/filter_view/detail/end_impl.hpp | 5 +- .../view/filter_view/detail/key_of_impl.hpp | 28 +++ .../view/filter_view/detail/next_impl.hpp | 21 +- .../filter_view/detail/value_of_data_impl.hpp | 28 +++ .../fusion/view/filter_view/filter_view.hpp | 12 +- .../view/filter_view/filter_view_iterator.hpp | 28 ++- .../view/iterator_range/iterator_range.hpp | 1 - .../view/joint_view/detail/begin_impl.hpp | 5 +- .../joint_view/detail/deref_data_impl.hpp | 37 +++ .../view/joint_view/detail/key_of_impl.hpp | 28 +++ .../view/joint_view/detail/next_impl.hpp | 5 +- .../joint_view/detail/value_of_data_impl.hpp | 28 +++ .../fusion/view/joint_view/joint_view.hpp | 14 +- .../view/joint_view/joint_view_iterator.hpp | 9 +- .../view/reverse_view/detail/at_impl.hpp | 41 +++ .../reverse_view/detail/deref_data_impl.hpp | 37 +++ .../view/reverse_view/detail/key_of_impl.hpp | 28 +++ .../reverse_view/detail/value_at_impl.hpp | 33 +++ .../detail/value_of_data_impl.hpp | 28 +++ .../fusion/view/reverse_view/reverse_view.hpp | 6 + .../reverse_view/reverse_view_iterator.hpp | 3 + test/algorithm/erase_key.cpp | 4 +- test/algorithm/fold.cpp | 36 +-- test/compile_time/fold.cpp | 2 +- test/functional/make_unfused.cpp | 2 +- test/functional/unfused.cpp | 2 +- test/functional/unfused_typed.cpp | 4 +- test/sequence/adapt_assoc_struct.cpp | 11 + test/sequence/adapt_struct.cpp | 12 + test/sequence/array.cpp | 7 + test/sequence/as_set.cpp | 2 +- test/sequence/boost_tuple.cpp | 9 + test/sequence/filter_view.cpp | 39 +-- test/sequence/iterator_range.cpp | 33 +++ test/sequence/joint_view.cpp | 45 +++- test/sequence/map.cpp | 16 ++ test/sequence/reverse_view.cpp | 23 ++ test/sequence/set.cpp | 18 +- test/sequence/std_pair.cpp | 9 + 379 files changed, 28481 insertions(+), 2185 deletions(-) create mode 100644 doc/html/fusion/iterator/concepts/associative_iterator.html create mode 100644 doc/html/fusion/iterator/functions/deref_data.html create mode 100644 doc/html/fusion/iterator/metafunctions/deref_data.html create mode 100644 doc/html/fusion/iterator/metafunctions/key_of.html create mode 100644 doc/html/fusion/iterator/metafunctions/value_of_data.html create mode 100644 example/extension/detail/deref_data_impl.hpp create mode 100644 example/extension/detail/key_of_impl.hpp create mode 100644 example/extension/detail/value_of_data_impl.hpp delete mode 100644 include/boost/fusion/adapted/class/adapt_assoc_class.hpp delete mode 100644 include/boost/fusion/adapted/class/adapt_class.hpp delete mode 100644 include/boost/fusion/adapted/class/class_iterator.hpp delete mode 100644 include/boost/fusion/adapted/class/detail/at_impl.hpp delete mode 100644 include/boost/fusion/adapted/class/detail/at_key_impl.hpp delete mode 100644 include/boost/fusion/adapted/class/detail/begin_impl.hpp delete mode 100644 include/boost/fusion/adapted/class/detail/category_of_impl.hpp delete mode 100644 include/boost/fusion/algorithm/query/detail/assoc_find.hpp delete mode 100644 include/boost/fusion/container/map/detail/at_key_impl.hpp create mode 100644 include/boost/fusion/container/map/detail/deref_data_impl.hpp create mode 100644 include/boost/fusion/container/map/detail/deref_impl.hpp create mode 100644 include/boost/fusion/container/map/detail/key_of_impl.hpp delete mode 100644 include/boost/fusion/container/map/detail/lookup_key.hpp delete mode 100644 include/boost/fusion/container/map/detail/map_lookup.hpp delete mode 100644 include/boost/fusion/container/map/detail/value_at_key_impl.hpp create mode 100644 include/boost/fusion/container/map/detail/value_of_data_impl.hpp create mode 100644 include/boost/fusion/container/map/detail/value_of_impl.hpp delete mode 100644 include/boost/fusion/container/set/detail/at_key_impl.hpp create mode 100644 include/boost/fusion/container/set/detail/deref_data_impl.hpp create mode 100644 include/boost/fusion/container/set/detail/deref_impl.hpp create mode 100644 include/boost/fusion/container/set/detail/key_of_impl.hpp delete mode 100644 include/boost/fusion/container/set/detail/lookup_key.hpp delete mode 100644 include/boost/fusion/container/set/detail/set_lookup.hpp delete mode 100644 include/boost/fusion/container/set/detail/value_at_key_impl.hpp create mode 100644 include/boost/fusion/container/set/detail/value_of_data_impl.hpp create mode 100644 include/boost/fusion/container/set/detail/value_of_impl.hpp create mode 100644 include/boost/fusion/include/deref_data.hpp create mode 100644 include/boost/fusion/include/key_of.hpp create mode 100644 include/boost/fusion/include/value_of_data.hpp create mode 100644 include/boost/fusion/iterator/basic_iterator.hpp create mode 100644 include/boost/fusion/iterator/deref_data.hpp create mode 100644 include/boost/fusion/iterator/key_of.hpp create mode 100644 include/boost/fusion/iterator/value_of_data.hpp mode change 100755 => 100644 include/boost/fusion/sequence/intrinsic/ext_/size_s.hpp create mode 100644 include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp create mode 100644 include/boost/fusion/view/filter_view/detail/key_of_impl.hpp create mode 100644 include/boost/fusion/view/filter_view/detail/value_of_data_impl.hpp create mode 100644 include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp create mode 100644 include/boost/fusion/view/joint_view/detail/key_of_impl.hpp create mode 100644 include/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp create mode 100644 include/boost/fusion/view/reverse_view/detail/at_impl.hpp create mode 100644 include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp create mode 100644 include/boost/fusion/view/reverse_view/detail/key_of_impl.hpp create mode 100644 include/boost/fusion/view/reverse_view/detail/value_at_impl.hpp create mode 100644 include/boost/fusion/view/reverse_view/detail/value_of_data_impl.hpp diff --git a/changelist.txt b/changelist.txt index eb272413..3e7712b2 100644 --- a/changelist.txt +++ b/changelist.txt @@ -3,5 +3,8 @@ Interface Changes - June 12, 2009: vector0 is now vector0<> as per Boost Trac Ticket #1608 to follow MPL more closely. - September 24, 2009: added nview and friends - - +- October 12, 2009: the accumulator is the first argument to the functor of + fold and accumulate. Fixes Boost Trac Ticket #2355. +- October 30, 2009: Added support for associative iterators & views. + Renamed associative_sequence_tag to associative_tag. Fixes Boost Trac + Ticket #3473. diff --git a/doc/algorithm.qbk b/doc/algorithm.qbk index cfaf92b7..3fa194b2 100644 --- a/doc/algorithm.qbk +++ b/doc/algorithm.qbk @@ -62,7 +62,7 @@ a sequence repeatedly applying an operation to its elements. [section fold] [heading Description] -For a sequence `Seq`, initial state, and binary function object or function pointer `f`, fold repeatedly applies binary `f` to each element of `Seq` and the previous state. +For a sequence `seq`, initial state `initial_state`, and binary function object or function pointer `f`, fold returns the result of the repeated application of binary `f` to the result of the previous `f` invocation (`inital_state` if it is the first call) and each element of `seq`. [heading Synopsis] template< @@ -75,9 +75,9 @@ For a sequence `Seq`, initial state, and binary function object or function poin [table Parameters [[Parameter][Requirement][Description]] - [[`seq`][A model of __forward_sequence__,`f(e,s)` must be a valid expression for each element `e` in `seq`, and current state `s`][Operation's argument]] + [[`seq`][A model of __forward_sequence__, `f(s,e)` must be a valid expression for current state `s`, and each element `e` in `seq`][Operation's argument]] [[`initial_state`][Any type][Initial state]] - [[`f`][`__boost_result_of_call__::type` is the return type of `f(e,s)` for each element `e` of type `E` in `seq`, and current state `s` of type `S`][Operation's argument]] + [[`f`][`__boost_result_of_call__::type` is the return type of `f(s,e)` current state `s` of type `S`, and for each element `e` of type `E` in `seq`][Operation's argument]] ] [heading Expression Semantics] @@ -85,7 +85,7 @@ For a sequence `Seq`, initial state, and binary function object or function poin [*Return type]: Any type -[*Semantics]: Equivalent to `f(eN ....f(e2,f(e1,initial_state)))` where `e1 ...eN` are the elements of `seq`. +[*Semantics]: Equivalent to `f(... f(f(initial_state,e1),e2) ...eN)` where `e1 ...eN` are the elements of `seq`. [heading Complexity] Linear, exactly `__result_of_size__::value` applications of `f`. @@ -101,7 +101,7 @@ Linear, exactly `__result_of_size__::value` applications of `f`. typedef std::string result_type; template - std::string operator()(const T& t, const std::string& str) const + std::string operator()(const std::string& str, const T& t) const { return str + boost::lexical_cast(t); } @@ -115,7 +115,7 @@ Linear, exactly `__result_of_size__::value` applications of `f`. [section accumulate] [heading Description] -For a sequence `Seq`, initial state, and binary function object or function pointer `f`, accumulate repeatedly applies binary `f` to each element of `Seq` and the previous state. +For a sequence `seq`, initial state `initial_state`, and binary function object or function pointer `f`, accumulate returns the result of the repeated application of binary `f` to the result of the previous `f` invocation (`inital_state` if it is the first call) and each element of `seq`. [heading Synopsis] template< @@ -128,9 +128,9 @@ For a sequence `Seq`, initial state, and binary function object or function poin [table Parameters [[Parameter][Requirement][Description]] - [[`seq`][A model of __forward_sequence__, `f(eN ....f(e2,f(e1,initial_state)))` must be a valid expression for each element `e1` to `eN` in `seq`][Operation's argument]] + [[`seq`][A model of __forward_sequence__, `f(s,e)` must be a valid expression for current state `s`, and each element `e` in `seq`][Operation's argument]] [[`initial_state`][Any type][Initial state]] - [[`f`][`__boost_result_of_call__::type` is the return type of `f(e,s)` for each element `e` of type `E` in `seq`, and current state `s` of type `S`][Operation's argument]] + [[`f`][`__boost_result_of_call__::type` is the return type of `f(s,e)` current state `s` of type `S`, and for each element `e` of type `E` in `seq`][Operation's argument]] ] [heading Expression Semantics] @@ -138,7 +138,7 @@ For a sequence `Seq`, initial state, and binary function object or function poin [*Return type]: Any type -[*Semantics]: Equivalent to `f(eN ....f(e2,f(e1,initial_state)))` where `e1 ...eN` are the elements of `seq`. +[*Semantics]: Equivalent to `f(... f(f(initial_state,e1),e2) ...eN)` where `e1 ...eN` are the elements of `seq`. [heading Complexity] Linear, exactly `__result_of_size__::value` applications of `f`. @@ -154,7 +154,7 @@ Linear, exactly `__result_of_size__::value` applications of `f`. typedef std::string result_type; template - std::string operator()(const T& t, const std::string& str) const + std::string operator()(const std::string& str, const T& t) const { return str + boost::lexical_cast(t); } @@ -238,7 +238,7 @@ Returns the result type of __fold__. [[Parameter] [Requirement] [Description]] [[`Sequence`] [A model of __forward_sequence__] [The sequence to iterate]] [[`State`] [Any type] [The initial state for the first application of `F`]] - [[`F`] [`__boost_result_of_call__::type` is the return type of `f(e,s)` for each element `e` of type `E` in `seq`, and current state `s` of type `S`] [The operation to be applied on forward traversal]] + [[`F`] [`__boost_result_of_call__::type` is the return type of `f(s,e)` for current state `s` of type `S`, and for each element `e` of type `E` in `seq`] [The operation to be applied on forward traversal]] ] [heading Expression Semantics] @@ -278,7 +278,7 @@ Returns the result type of __accumulate__. [[Parameter] [Requirement] [Description]] [[`Sequence`] [A model of __forward_sequence__] [The sequence to iterate]] [[`State`] [Any type] [The initial state for the first application of `F`]] - [[`F`] [`__boost_result_of_call__::type` is the return type of `f(e,s)` for each element `e` of type `E` in `seq`, and current state `s` of type `S`] [The operation to be applied on forward traversal]] + [[`F`] [`__boost_result_of_call__::type` is the return type of `f(s,e)` for current state `s` of type `S`, and for each element `e` of type `E` in `seq`] [The operation to be applied on forward traversal]] ] [heading Expression Semantics] @@ -583,8 +583,8 @@ or `__end__(seq)` if there is no such element. [heading Complexity] Linear. At most `__result_of_size__::value` comparisons. - -/algorithm/query/find_if.hpp> +#include +#include [heading Example] const __vector__ vec(1.0,2); @@ -795,7 +795,7 @@ Constant. [section find] [heading Description] -Returns the result type of `find`, given the sequence and search types. +Returns the result type of __find__, given the sequence and search types. [heading Synopsis] template< @@ -833,7 +833,7 @@ Linear, at most `__result_of_size__::value` comparisons. [section find_if] [heading Description] -Returns the result type of `find_if` given the sequence and predicate types. +Returns the result type of __find_if__ given the sequence and predicate types. [heading Synopsis] template< @@ -983,7 +983,10 @@ For a given sequence, filter returns a new sequences containing only the element [heading Expression Semantics] __filter__(seq); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence containing all the elements of `seq` of type `T`. Equivalent to `__filter_if__ >(seq)`. @@ -1024,7 +1027,10 @@ only the elements with types for which a given __mpl_lambda_expression__ evaluat [heading Expression Semantics] __filter_if__(seq); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence containing all the elements of `seq` with types for which `Pred` evaluates to `boost::mpl::true_`. The order of the retained elements is the same as in the original sequence. @@ -1225,7 +1231,10 @@ Returns a new sequence, with all the elements of the original sequence, except t [heading Expression Semantics] __remove__(seq); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence, containing all the elements of `seq`, in their original order, except those of type `T`. Equivalent to `__remove_if__ >(seq)`. @@ -1266,7 +1275,10 @@ function object evaluates to `true`. [heading Expression Semantics] __remove_if__(seq); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence, containing all the elements of `seq`, in their original order, except those elements with types for which `Pred` evaluates to `boost::mpl::true_`. @@ -1305,7 +1317,11 @@ Returns a new sequence with the elements of the original in reverse order. [heading Expression Semantics] __reverse__(seq); -[*Return type]: A model of __bidirectional_sequence__. +[*Return type]: + +* A model of __bidirectional_sequence__ if `seq` is a __bidirectional_sequence__ +else, __random_access_sequence__ if `seq` is a __random_access_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence containing all the elements of `seq` in reverse order. @@ -1390,13 +1406,19 @@ between two iterators. [heading Expression Semantics] __erase__(seq, pos); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence, containing all the elements of `seq` except the element at `pos`. __erase__(seq, first, last); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence, with all the elements of `seq`, in their original order, except those in the range [`first`,`last`). @@ -1419,26 +1441,27 @@ Constant. Returns a view which is lazily evaluated. [section erase_key] [heading Description] -For an __associative_sequence__ `seq`, returns a __forward_sequence__ containing all the -elements of the original except those with a given key. +For an [link fusion.sequence.concepts.associative_sequence associative]] __forward_sequence__ `seq`, +returns a [link fusion.sequence.concepts.associative_sequence associative]] __forward_sequence__ containing +all the elements of the original except those with a given key. [heading Synposis] template< typename Key, typename Sequence > - typename result_of::erase_key::type erase_key(Sequence const& seq); + typename __result_of_erase_key__::type erase_key(Sequence const& seq); [table Parameters [[Parameter][Requirement][Description]] - [[`seq`][A model of __associative_sequence__][Operation's argument]] + [[`seq`][A model of __forward_sequence__ and __associative_sequence__][Operation's argument]] [[`Key`][Any type][Key to erase]] ] [heading Expression Semantics] __erase_key__(seq); -[*Return type]: A model of __forward_sequence__. +[*Return type]: A model of __forward_sequence__ and __associative_sequence__. [*Semantics]: Returns a new sequence, containing all the elements of `seq`, except those with key `Key`. @@ -1467,7 +1490,8 @@ position described by a given iterator. typename Pos, typename T > - __unspecified__ insert(Sequence const& seq, Pos const& pos, T const& t); + typename __result_of_insert__::type insert( + Sequence const& seq, Pos const& pos, T const& t); [table Parameters [[Parameter][Requirement][Description]] @@ -1479,7 +1503,10 @@ position described by a given iterator. [heading Expression Semantics] __insert__(seq, p, t); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence, containing all the elements of `seq`, in their original order, and a new element with the type and value of `t` inserted at iterator `pos`. @@ -1522,7 +1549,10 @@ Returns a new sequence with another sequence inserted at a specified iterator. [heading Expression Semantics] __insert__(seq, pos, range); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence, containing all the elements of `seq`, and the elements of `range` inserted at iterator `pos`. All elements retaining their ordering from the orignal sequences. @@ -1561,9 +1591,12 @@ Takes 2 sequences and returns a sequence containing the elements of the first fo [heading Expression Semantics] __join__(lhs, rhs); -[*Return type]: A model of __forward_sequence__. +[*Return type]: -[*Semantics]: Returns a sequence containing all the elements of `lhs` followed by all the elements of `rhs`. The order of th elements is preserved. +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `lhs` and `rhs` implement the __associative_sequence__ model. + +[*Semantics]: Returns a sequence containing all the elements of `lhs` followed by all the elements of `rhs`. The order of the elements is preserved. [heading Complexity] Constant. Returns a view which is lazily evaluated. @@ -1641,7 +1674,10 @@ Returns a new sequence, with the last element of the original removed. [heading Expression Semantics] __pop_back__(seq); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence containing all the elements of `seq`, except the last element. The elements in the new sequence are in the same order as they were in `seq`. @@ -1678,7 +1714,10 @@ Returns a new sequence, with the first element of the original removed. [heading Expression Semantics] __pop_front__(seq); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence containing all the elements of `seq`, except the first element. The elements in the new sequence are in the same order as they were in `seq`. @@ -1717,7 +1756,10 @@ Returns a new sequence with an element added at the end. [heading Expression Semantics] __push_back__(seq, t); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence, containing all the elements of `seq`, and new element `t` appended to the end. The elements are in the same order as they were in `seq`. @@ -1756,7 +1798,10 @@ Returns a new sequence with an element added at the beginning. [heading Expression Semantics] __push_back__(seq, t); -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `seq` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence, containing all the elements of `seq`, and new element `t` appended to the beginning. The elements are in the same order as they were in `seq`. @@ -1801,7 +1846,10 @@ Returns the result type of __filter__ given the sequence type and type to retain [heading Expression Semantics] __result_of_filter__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence containing the elements of `Sequence` that are of type `T`. Equivalent to `__result_of_filter_if__ >::type`. @@ -1839,7 +1887,10 @@ Returns the result type of __filter_if__ given the sequence and unary __mpl_lamb [heading Expression Semantics] __result_of_filter_if__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence containing the elements of `Sequence` for which `Pred` evaluates to `boost::mpl::true_`. @@ -1876,7 +1927,10 @@ with elements created by applying `f(e)` to each element of `e` of `seq`. [heading Expression Semantics] __transform__(seq, f); -[*Return type]: A model of __forward_sequence__ +[*Return type]: + +* A model of __forward_sequence__ +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence, containing the return values of `f(e)` for each element `e` within `seq`. @@ -2024,7 +2078,10 @@ Returns the result type of __remove__, given the sequence and removal types. [heading Expression Semantics] __result_of_remove__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence containing the elements of `Sequence` not of type `T`. Equivalent to `__result_of_replace_if__ >::type`. @@ -2062,7 +2119,10 @@ Returns the result type of __remove_if__, given the input sequence and unary __m [heading Expression Semantics] __result_of_remove_if__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence containing the elements of `Sequence` for which `Pred` evaluates to `boost::mpl::false_`. @@ -2098,7 +2158,11 @@ Returns the result type of __reverse__, given the input sequence type. [heading Expression Semantics] __result_of_reverse__::type -[*Return type]: A model of __bidirectional_sequence__. +[*Return type]: + +* A model of __bidirectional_sequence__ if `Sequence` is a __bidirectional_sequence__ +else, __random_access_sequence__ if `Sequence` is a __random_access_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence with the elements in the reverse order to `Sequence`. @@ -2173,7 +2237,10 @@ Returns the result type of __erase__, given the input sequence and range delimit [heading Expression Semantics] __result_of_erase__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a new sequence with the element at `It1` removed. @@ -2210,14 +2277,14 @@ Returns the result type of __erase_key__, given the sequence and key types. [table Parameters [[Parameter][Requirement][Description]] - [[`Sequence`][A model of __associative_sequence__][Operation's argument]] + [[`Sequence`][A model of __forward_sequence__ and __associative_sequence__][Operation's argument]] [[`Key`][Any type][Key type]] ] [heading Expression Semantics] __result_of_erase_key__::type -[*Return type]: A model of __associative_sequence__. +[*Return type]: A model of __forward_sequence__ and __associative_sequence__. [*Semantics]: Returns a sequence with the elements of `Sequence`, except those with key `Key`. @@ -2257,7 +2324,10 @@ Returns the result type of __insert__, given the sequence, position iterator and [heading Expression Semantics] __result_of_insert__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence with an element of type `T` inserted at position `Position` in `Sequence`. @@ -2297,7 +2367,10 @@ Returns the result type of __insert_range__, given the input sequence, position [heading Expression Semantics] __result_of_insert_range__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence with the elements of `Range` inserted at position `Position` into `Sequence`. @@ -2329,7 +2402,10 @@ Returns the result of joining 2 sequences, given the sequence types. [heading Expression Semantics] __result_of_join__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `LhSequence` amd `RhSequence` implement the __associative_sequence__ model. [*Semantics]: Returns a sequence containing the elements of `LhSequence` followed by the elements of `RhSequence`. The order of the elements in the 2 sequences is preserved. @@ -2399,7 +2475,10 @@ Returns the result type of __pop_back__, given the input sequence type. [heading Expression Semantics] __result_of_pop_back__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence with all the elements of `Sequence` except the last element. @@ -2408,7 +2487,7 @@ Constant. [heading Header] - #include + #include #include [endsect] @@ -2435,14 +2514,20 @@ Returns the result type of __pop_front__, given the input sequence type. [heading Expression Semantics] __result_of_pop_front__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence with all the elements of `Sequence` except the first element. [heading Complexity] Constant. -/algorithm/transformation/pop_front.hpp> +[heading Header] + + #include + #include [endsect] @@ -2470,14 +2555,20 @@ Returns the result type of __push_back__, given the types of the input sequence [heading Expression Semantics] __result_of_push_back__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence with the elements of `Sequence` and an element of type `T` added to the end. [heading Complexity] Constant. -/algorithm/transformation/push_back.hpp> +[heading Header] + + #include + #include [endsect] @@ -2505,14 +2596,20 @@ Returns the result type of __push_front__, given the types of the input sequence [heading Expression Semantics] __result_of_push_front__::type -[*Return type]: A model of __forward_sequence__. +[*Return type]: + +* A model of __forward_sequence__. +* A model of __associative_sequence__ if `Sequence` implements the __associative_sequence__ model. [*Semantics]: Returns a sequence with the elements of `Sequence` and an element of type `T` added to the beginning. [heading Complexity] Constant. -/algorithm/transformation/push_front.hpp> +[heading Header] + + #include + #include [endsect] diff --git a/doc/changelog.qbk b/doc/changelog.qbk index d3e953ce..7d2a0150 100644 --- a/doc/changelog.qbk +++ b/doc/changelog.qbk @@ -12,7 +12,7 @@ This section summarizes significant changes to the Fusion library. * Sep 27, 2006: Added `boost::tuple` support. (Joel de Guzman) * Nov 17, 2006: Added `boost::variant` support. (Joel de Guzman) * Feb 15, 2007: Added functional module. (Tobias Schwinger) -* APRIL 2, 2007: Added struct adapter. (Joel de Guzman) +* April 2, 2007: Added struct adapter. (Joel de Guzman) * May 8, 2007: Added associative struct adapter. (Dan Marsden) * Dec 20, 2007: Removed `boost::variant` support. After thorough investigation, I think now that the move to make variant a @@ -21,5 +21,9 @@ This section summarizes significant changes to the Fusion library. and there's no way to know at compile time what it contains. Iterating over its types is simply wrong. All these imply that the variant is *not* a fusion sequence. (Joel de Guzman) +* Oct 12, 2009: The accumulator is the first argument to the functor of + __fold__ and __accumulate__. (Christopher Schmidt) +* Oct 30, 2009: Added support for associative iterators and views. (Christopher + Schmidt) [endsect] diff --git a/doc/extension.qbk b/doc/extension.qbk index b840259f..b0159072 100644 --- a/doc/extension.qbk +++ b/doc/extension.qbk @@ -145,15 +145,15 @@ our iterator's tag type. The implementation itself is pretty simple, it just uses 2 partial specializations to provide the type of the 2 different members of `example_struct`, based on the index of the iterator. -To understand how `value_of_impl` is used by the library we will look at the implementation of __value_of__: +To understand how `value_of_impl` is used by the library we will look at the implementation of __result_of_value_of__: template - struct __value_of__ + struct value_of : extension::value_of_impl::type>:: template apply {}; -So __value_of__ uses __tag_dispatching__ to select an __mpl_metafunction_class__ +So __result_of_value_of__ uses __tag_dispatching__ to select an __mpl_metafunction_class__ to provide its functionality. You will notice this pattern throughout the implementation of Fusion. @@ -216,7 +216,7 @@ To see how `deref_impl` is used, lets have a look at the implementation of __der } So again __result_of_deref__ uses __tag_dispatching__ in exactly the -same way as the __value_of__ implementation. The runtime functionality used +same way as the __result_of_value_of__ implementation. The runtime functionality used by __deref__ is provided by the `call` static function of the selected __mpl_metafunction_class__. @@ -227,14 +227,14 @@ bit of metaprogramming to return `const` references if the underlying sequence is const. [note Although there is a fair amount of left to do to produce a fully fledged -Fusion sequence, __value_of__ and __deref__ illustrate all the signficant concepts +Fusion sequence, __result_of_value_of__ and __deref__ illustrate all the signficant concepts required. The remainder of the process is very repetitive, simply requiring implementation of a suitable `xxxx_impl` for each feature `xxxx`. ] [heading Implementing the remaining iterator functionality] -Ok, now we have seen the way __value_of__ and __deref__ work, everything else will work +Ok, now we have seen the way __result_of_value_of__ and __deref__ work, everything else will work in pretty much the same way. Lets start with forward iteration, by providing a `next_impl`: @@ -317,14 +317,15 @@ is provided in the example code. For our __random_access_sequence__ we will also need to implement `size_impl`, `value_at_impl` and `at_impl`. -[heading Enabling our type as an associative container] +[heading Enabling our type as an associative sequence] -In order for `example_struct` to serve as an associative container, -we need to enable 3 lookup features, __at_key__, __value_at_key__ and __has_key__. -We also need to provide an implementation of the `is_associative` trait -so that our sequence can be correctly identified as an associative container. +In order for `example_struct` to serve as an associative forward sequence, +we need to adapt the traversal category of our sequence and our iterator +accordingly and enable 3 intrinsic sequence lookup features, __at_key__, +__value_at_key__ and __has_key__. We also need to enable 3 iterator lookup +features, __result_of_key_of__, __result_of_value_of_data__ and __deref_data__. -To implement `at_key_impl` we need to associate the `fields::age` and `fields::age` +To implement `at_key_impl` we need to associate the `fields::name` and `fields::age` types described in the __quick_start__ guide with the appropriate members of `example_struct`. Our implementation is as follows: @@ -369,15 +370,14 @@ Its all very similar to the implementations we've seen previously, such as `deref_impl` and `value_of_impl`. Instead of identifying the members by index or position, we are now selecting them using the types `fields::name` and `fields::age`. The implementations of -`value_at_key_impl` and `has_key_impl` are equally straightforward, -and are provided in the example code, along with an implementation -of `is_associative_impl`. +the other functions are equally straightforward, and are provided in +the example code. [heading Summary] We've now worked through the entire process for adding a new random access sequence and we've also enabled our type to serve as an associative -container. The implementation was slightly longwinded, but followed +sequence. The implementation was slightly longwinded, but followed a simple repeating pattern. The support for `std::pair`, __mpl__ sequences, and `boost::array` all @@ -467,6 +467,10 @@ The user must the implement the key expressions required by their iterator type. [[`iterator::template distance::call(it1, it2)`][The distance between iterator `it1` and `it2`][None]] [[`iterator::template equal_to::type`][The distance between iterators of type `It1` and `It2`][`boost::same_type::type`]] [[`iterator::template equal_to::call(it1, it2)`][The distance between iterators `it1` and `it2`][`boost::same_type::type()`]] +[[`iterator::template key_of::type`][The key type associated with the element from `It`][None]] +[[`iterator::template value_of_data::type`][The type of the data property associated with the element from `It`][None]] +[[`iterator::template deref_data::type`][The type that will be returned by dereferencing the data property of the element from `It`][None]] +[[`iterator::template deref_data::call(it)`][Deferences the data property associated with the element referenced by `it`][None]] ] [heading Header] diff --git a/doc/fusion.qbk b/doc/fusion.qbk index f48ff84a..f6330d42 100644 --- a/doc/fusion.qbk +++ b/doc/fusion.qbk @@ -79,6 +79,7 @@ [def __forward_iterator__ [link fusion.iterator.concepts.forward_iterator Forward Iterator]] [def __bidirectional_iterator__ [link fusion.iterator.concepts.bidirectional_iterator Bidirectional Iterator]] [def __random_access_iterator__ [link fusion.iterator.concepts.random_access_iterator Random Access Iterator]] +[def __associative_iterator__ [link fusion.iterator.concepts.associative_iterator Associative Iterator]] [def __next__ [link fusion.iterator.functions.next `next`]] [def __prior__ [link fusion.iterator.functions.prior `prior`]] @@ -86,6 +87,7 @@ [def __advance_c__ [link fusion.iterator.functions.advance_c `advance_c`]] [def __distance__ [link fusion.iterator.functions.distance `distance`]] [def __deref__ [link fusion.iterator.functions.deref `deref`]] +[def __deref_data__ [link fusion.iterator.functions.deref_data `deref_data`]] [def __result_of_next__ [link fusion.iterator.metafunctions.next `result_of::next`]] [def __result_of_prior__ [link fusion.iterator.metafunctions.prior `result_of::prior`]] @@ -95,7 +97,9 @@ [def __result_of_distance__ [link fusion.iterator.metafunctions.distance `result_of::distance`]] [def __result_of_deref__ [link fusion.iterator.metafunctions.deref `result_of::deref`]] [def __result_of_value_of__ [link fusion.iterator.metafunctions.value_of `result_of::value_of`]] -[def __value_of__ [link fusion.iterator.metafunctions.value_of `value_of`]] +[def __result_of_key_of__ [link fusion.iterator.metafunctions.key_of `result_of::key_of`]] +[def __result_of_value_of_data__ [link fusion.iterator.metafunctions.value_of_data `result_of::value_of_data`]] +[def __result_of_deref_data__ [link fusion.iterator.metafunctions.deref_data `result_of::deref_data`]] [def __sequence__ [link fusion.sequence Sequence]] [def __sequence_concepts__ [link fusion.sequence.concepts Sequence Concepts]] diff --git a/doc/html/fusion/acknowledgements.html b/doc/html/fusion/acknowledgements.html index 77569ed6..05453358 100644 --- a/doc/html/fusion/acknowledgements.html +++ b/doc/html/fusion/acknowledgements.html @@ -3,7 +3,11 @@ Acknowledgements +<<<<<<< .working +======= + +>>>>>>> .merge-right.r57125 diff --git a/doc/html/fusion/adapted.html b/doc/html/fusion/adapted.html index bc480000..080ac71c 100644 --- a/doc/html/fusion/adapted.html +++ b/doc/html/fusion/adapted.html @@ -3,7 +3,11 @@ Adapted +<<<<<<< .working +======= + +>>>>>>> .merge-right.r57125 @@ -49,10 +53,17 @@ Fusion also provides various schemes to make it easy for the user to adapt various data structures, non-intrusively, as full fledged Fusion sequences.

+<<<<<<< .working

Header

+======= +

+ + Header +

+>>>>>>> .merge-right.r57125 
#include <boost/fusion/adapted.hpp>
 #include <boost/fusion/include/adapted.hpp>
diff --git a/doc/html/fusion/adapted/adapt_assoc.html b/doc/html/fusion/adapted/adapt_assoc.html index bc16c7f9..a52d02b3 100644 --- a/doc/html/fusion/adapted/adapt_assoc.html +++ b/doc/html/fusion/adapted/adapt_assoc.html @@ -3,7 +3,11 @@ BOOST_FUSION_ADAPT_ASSOC_STRUCT +<<<<<<< .working +======= + +>>>>>>> .merge-right.r57125 @@ -22,6 +26,7 @@
PrevUpHomeNext
+<<<<<<< .working

@@ -33,6 +38,16 @@ Description

+======= +
+
+
+ + Description +
+>>>>>>> .merge-right.r57125

BOOST_FUSION_ADAPT_ASSOC_STRUCT is a macro that can be used to generate all the necessary boilerplate to make an arbitrary struct into a model of Associative Sequence.

+<<<<<<< .working

Synopsis

+======= +
+ + Synopsis +
+>>>>>>> .merge-right.r57125 
BOOST_FUSION_ADAPT_ASSOC_STRUCT(
     struct_name,
     (member_type0, member_name0, key_type0)
@@ -52,10 +74,17 @@
     ...
     )
+<<<<<<< .working

Semantics

+======= +
+ + Semantics +
+>>>>>>> .merge-right.r57125

The above macro generates the necessary code to adapt struct_name as a model of struct_name should be the fully namespace qualified name of the struct to be converted.

+<<<<<<< .working

Header

+======= +
+ + Header +
+>>>>>>> .merge-right.r57125 
#include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
 #include <boost/fusion/include/adapt_assoc_struct.hpp>
+<<<<<<< .working

Example

+======= +
+ + Example +
+>>>>>>> .merge-right.r57125 
namespace demo
 {
     struct employee
diff --git a/doc/html/fusion/adapted/adapt_struct.html b/doc/html/fusion/adapted/adapt_struct.html
index 1e665cd6..99aeea58 100644
--- a/doc/html/fusion/adapted/adapt_struct.html
+++ b/doc/html/fusion/adapted/adapt_struct.html
@@ -3,7 +3,11 @@
 
  BOOST_FUSION_ADAPT_STRUCT
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 

 PrevUpHomeNext
 

+<<<<<<< .working
 

 

 

@@ -33,16 +38,33 @@
 
         Description
       

+=======
+

+

+

+
+        Description
+      

+>>>>>>> .merge-right.r57125
 

         BOOST_FUSION_ADAPT_STRUCT is a macro that can be used to generate all the
         necessary boilerplate to make an arbitrary struct into a Random
         Access Sequence.
       

+<<<<<<< .working
 

 
         Synopsis
       

+=======
+

+
+        Synopsis
+      

+>>>>>>> .merge-right.r57125
 
BOOST_FUSION_ADAPT_STRUCT(
     struct_name,
     (member_type0, member_name0)
@@ -50,10 +72,17 @@
     ...
     )
 

+<<<<<<< .working
 

 
         Semantics
       

+=======
+

+
+        Semantics
+      

+>>>>>>> .merge-right.r57125
 

         The above macro generates the necessary code to adapt struct_name
         as a model of struct_name
         should be the fully namespace qualified name of the struct to be converted.
       

+<<<<<<< .working
 

 
         Header
       

+=======
+

+
+        Header
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 

+<<<<<<< .working
 

 
         Example
       

+=======
+

+
+        Example
+      

+>>>>>>> .merge-right.r57125
 
namespace demo
 {
     struct employee
diff --git a/doc/html/fusion/adapted/boost__array.html b/doc/html/fusion/adapted/boost__array.html
index 1d64985c..5d8ea885 100644
--- a/doc/html/fusion/adapted/boost__array.html
+++ b/doc/html/fusion/adapted/boost__array.html
@@ -3,7 +3,11 @@
 
 boost::array
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -36,24 +40,46 @@
         Access Sequence">Random
         Access Sequence.
       

+<<<<<<< .working
 

 
         Header
       

+=======
+

+
+        Header
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/adapted/array.hpp>
 #include <boost/fusion/include/array.hpp>
 

+<<<<<<< .working
 

 
         Model of
       

 
  • Random
+=======
+
    
+
+        Model of
+      
    
+
    
+<<<<<<< .working
 
    
 
         Example
       
    
+=======
+
    
+
+        Example
+      
    
+>>>>>>> .merge-right.r57125
 
    boost::array<int,3> arr = {{1,2,3}};
 
 std::cout << *begin(arr) << std::endl;
@@ -62,10 +88,17 @@
 std::cout << *prior(end(arr)) << std::endl;
 std::cout << at_c<2>(arr) << std::endl;
 
    
+<<<<<<< .working
 
    
 
         See also
       
    
+=======
+
    
+
+        See also
+      
    
+>>>>>>> .merge-right.r57125
 
    
         Boost.Array Library
       
    
diff --git a/doc/html/fusion/adapted/boost__tuple.html b/doc/html/fusion/adapted/boost__tuple.html
index 3ddd4b84..4d1ca99e 100644
--- a/doc/html/fusion/adapted/boost__tuple.html
+++ b/doc/html/fusion/adapted/boost__tuple.html
@@ -3,7 +3,11 @@
 
 boost::tuple
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -36,13 +40,21 @@
         Sequence">Forward
         Sequence.
       
    
+<<<<<<< .working
 
    
 
         Header
       
    
+=======
+
    
+
+        Header
+      
    
+>>>>>>> .merge-right.r57125
 
    #include <boost/fusion/adapted/boost_tuple.hpp>
 #include <boost/fusion/include/boost_tuple.hpp>
 
    
+<<<<<<< .working
 
    
 
         Model of
@@ -53,14 +65,32 @@
 
         Example
       
    
+=======
+
    
+
+        Model of
+      
    
+
    
+
    
+
+        Example
+      
    
+>>>>>>> .merge-right.r57125
 
    boost::tuple<int,std::string> example_tuple(101, "hello");
 std::cout << *boost::fusion::begin(example_tuple) << '\n';
 std::cout << *boost::fusion::next(boost::fusion::begin(example_tuple)) << '\n';
 
    
+<<<<<<< .working
 
    
 
         See also
       
    
+=======
+
    
+
+        See also
+      
    
+>>>>>>> .merge-right.r57125
 
    
         Boost.Tuple
         Library
diff --git a/doc/html/fusion/adapted/mpl_sequence.html b/doc/html/fusion/adapted/mpl_sequence.html
index 954dcc27..4b04ac5e 100644
--- a/doc/html/fusion/adapted/mpl_sequence.html
+++ b/doc/html/fusion/adapted/mpl_sequence.html
@@ -3,7 +3,11 @@
 
 mpl sequence
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -34,13 +38,21 @@
         sequences. Including the module header makes all MPL
         sequences fully conforming fusion sequences.
       
    
+<<<<<<< .working
 
    
 
         Header
       
    
+=======
+
    
+
+        Header
+      
    
+>>>>>>> .merge-right.r57125
 
    #include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/include/mpl.hpp>
 
    
+<<<<<<< .working
 
    
 
         Model of
@@ -49,6 +61,15 @@
 
  • 
 Forward Sequence
+=======
+
    
+
+        Model of
+      
    
+
      
+
    • 
+Forward Sequence
+>>>>>>> .merge-right.r57125
           (If the MPL
           sequence is a forward sequence.)
         
      • 
@@ -65,10 +86,17 @@
           sequence is a random access sequence.)
         
 
    
+<<<<<<< .working
 
    
 
         Example
       
    
+=======
+
    
+
+        Example
+      
    
+>>>>>>> .merge-right.r57125
 
    mpl::vector_c<int, 123, 456> vec_c;
 fusion::vector2<int, long> v(vec_c);
 std::cout << at_c<0>(v) << std::endl;
@@ -78,10 +106,17 @@
 std::cout << at_c<0>(v) << std::endl;
 std::cout << at_c<1>(v) << std::endl;
 
    
+<<<<<<< .working
 
    
 
         See also
       
    
+=======
+
    
+
+        See also
+      
    
+>>>>>>> .merge-right.r57125
 
    
         MPL
       
    
diff --git a/doc/html/fusion/adapted/std__pair.html b/doc/html/fusion/adapted/std__pair.html
index 601c4a70..91b6bd34 100644
--- a/doc/html/fusion/adapted/std__pair.html
+++ b/doc/html/fusion/adapted/std__pair.html
@@ -3,7 +3,11 @@
 
 std::pair
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -36,33 +40,62 @@
         Access Sequence">Random
         Access Sequence.
       
    
+<<<<<<< .working
 
    
 
         Header
       
    
+=======
+
    
+
+        Header
+      
    
+>>>>>>> .merge-right.r57125
 
    #include <boost/fusion/adapted/std_pair.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 
    
+<<<<<<< .working
 
    
 
         Model of
       
    
 
    
+<<<<<<< .working
 
    
 
       Lazy Evaluation
     
    
+=======
+
    
+
+      Lazy Evaluation
+    
    
+>>>>>>> .merge-right.r57125
 
    
       Unlike MPL, Fusion
       algorithms are lazy and non sequence-type preserving. What does that mean?
@@ -69,10 +80,17 @@
       lazy evaluation scheme allows us to chain as many algorithms
       as we want without incurring a high runtime penalty.
     
    
+<<<<<<< .working
 
    
 
       Sequence Extension
     
    
+=======
+
    
+
+      Sequence Extension
+    
    
+>>>>>>> .merge-right.r57125
 
    
       The lazy evaluation scheme where Algorithms
       return Views also allows operations such
@@ -92,10 +110,17 @@
       are provided. You may use one of the Conversion
       functions to convert back to the original sequence type.
     
    
+<<<<<<< .working
 
    
 
       Header
     
    
+=======
+
    
+
+      Header
+    
    
+>>>>>>> .merge-right.r57125
 
    #include <boost/fusion/algorithm.hpp>
 #include <boost/fusion/include/algorithm.hpp>
 
    
diff --git a/doc/html/fusion/algorithm/iteration.html b/doc/html/fusion/algorithm/iteration.html
index c99b7083..cd49cd9a 100644
--- a/doc/html/fusion/algorithm/iteration.html
+++ b/doc/html/fusion/algorithm/iteration.html
@@ -3,7 +3,11 @@
 
 Iteration
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -37,10 +41,17 @@
         The iteration algorithms provide the fundamental algorithms for traversing
         a sequence repeatedly applying an operation to its elements.
       
    
+<<<<<<< .working
 
    
 
         Header
       
    
+=======
+
    
+
+        Header
+      
    
+>>>>>>> .merge-right.r57125
 
    #include <boost/fusion/algorithm/iteration.hpp>
 #include <boost/fusion/include/iteration.hpp>
 
    
diff --git a/doc/html/fusion/algorithm/iteration/functions.html b/doc/html/fusion/algorithm/iteration/functions.html
index dcba7466..cce8fe08 100644
--- a/doc/html/fusion/algorithm/iteration/functions.html
+++ b/doc/html/fusion/algorithm/iteration/functions.html
@@ -3,7 +3,11 @@
 
 Functions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/algorithm/iteration/functions/accumulate.html b/doc/html/fusion/algorithm/iteration/functions/accumulate.html
index b3d7e94a..1b2237ef 100644
--- a/doc/html/fusion/algorithm/iteration/functions/accumulate.html
+++ b/doc/html/fusion/algorithm/iteration/functions/accumulate.html
@@ -1,10 +1,18 @@
 
 
-
+
 accumulate
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,19 +38,80 @@
 
    
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
             For a sequence Seq, initial
             state, and binary function object or function pointer f,
             accumulate repeatedly applies binary f
             to each element of Seq
             and the previous state.
+=======
+            For a sequence seq, initial
+            state initial_state,
+            and binary function object or function pointer f,
+            accumulate returns the result of the repeated application of binary
+            f to the result of the
+            previous f invocation
+            (inital_state if it is
+            the first call) and each element of seq.
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -53,8 +122,33 @@
     Sequence& seq, State const& initial_state, F const& f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.34. Parameters

 
+=======
+
Table 1.34. Parameters

+=======
+
Table 1.38. Parameters

+=======
+
Table 1.38. Parameters

+=======
+
Table 1.38. Parameters

+=======
+
Table 1.38. Parameters

+=======
+
Table 1.38. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -73,6 +167,7 @@
 
+<<<<<<< .working
 
@@ -85,6 +180,24 @@
                   to eN in seq

+
+
@@ -100,6 +213,7 @@
                 

+<<<<<<< .working
 
@@ -109,15 +223,39 @@
                   of type E in seq, and current state s of type S

+
+

 
 

 
 

                   seq
                 

                 
 

+=======
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
+                  Sequence, f(s,e) must be a valid expression for
+                  current state s,
+                  and each element e
+                  in seq
+                

+                		
+                

+>>>>>>> .merge-right.r57125
                   Operation's argument
                 

 

 
 

                   f
                 

                 
 

+=======
+

+                

+                  f
+                

+                		
+                

+                  boost::result_of<F(S,E)>::type is the return type of f(s,e)
+                  current state s
+                  of type S, and
+                  for each element e
+                  of type E in seq
+                

+                		
+                

+>>>>>>> .merge-right.r57125
                   Operation's argument
                 

 

 
 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
accumulate(seq, initial_state, f);
@@ -126,33 +264,114 @@
             Return type: Any type
           

 

+<<<<<<< .working
             Semantics: Equivalent to f(eN ....f(e2,f(e1,initial_state)))
             where e1 ...eN are the elements of seq.
+=======
+            Semantics: Equivalent to f(... f(f(initial_state,e1),e2) ...eN) where e1
+            ...eN
+            are the elements of seq.
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear, exactly result_of::size<Sequence>::value applications of f.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/include/accumulate.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
struct make_string
 {
     typedef std::string result_type;
 
     template<typename T>
-    std::string operator()(const T& t, const std::string& str) const
+    std::string operator()(const std::string& str, const T& t) const
     {
         return str + boost::lexical_cast<std::string>(t);
     }
@@ -164,7 +383,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/iteration/functions/fold.html b/doc/html/fusion/algorithm/iteration/functions/fold.html
index 8bc6fb46..a831ff50 100644
--- a/doc/html/fusion/algorithm/iteration/functions/fold.html
+++ b/doc/html/fusion/algorithm/iteration/functions/fold.html
@@ -1,10 +1,18 @@
 
 
-
+
 fold
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,19 +38,77 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
             For a sequence Seq, initial
             state, and binary function object or function pointer f,
             fold repeatedly applies binary f
             to each element of Seq
             and the previous state.
+=======
+            For a sequence seq, initial
+            state initial_state,
+            and binary function object or function pointer f,
+            fold returns the result of the repeated application of binary f to the result of the previous f invocation (inital_state
+            if it is the first call) and each element of seq.
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -53,8 +119,33 @@
     Sequence& seq, State const& initial_state, F const& f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.33. Parameters

 
+=======
+
Table 1.33. Parameters

+=======
+
Table 1.37. Parameters

+=======
+
Table 1.37. Parameters

+=======
+
Table 1.37. Parameters

+=======
+
Table 1.37. Parameters

+=======
+
Table 1.37. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -73,6 +164,7 @@
 
+<<<<<<< .working
 
@@ -85,6 +177,24 @@
                   state s

+
+
@@ -100,6 +210,7 @@
                 

+<<<<<<< .working
 
@@ -109,15 +220,39 @@
                   of type E in seq, and current state s of type S

+
+

 
 

 
 

                   seq
                 

                 
 

+=======
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
+                  Sequence, f(s,e) must be a valid expression for
+                  current state s,
+                  and each element e
+                  in seq
+                

+                		
+                

+>>>>>>> .merge-right.r57125
                   Operation's argument
                 

 

 
 

                   f
                 

                 
 

+=======
+

+                

+                  f
+                

+                		
+                

+                  boost::result_of<F(S,E)>::type is the return type of f(s,e)
+                  current state s
+                  of type S, and
+                  for each element e
+                  of type E in seq
+                

+                		
+                

+>>>>>>> .merge-right.r57125
                   Operation's argument
                 

 

 
 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
fold(seq, initial_state, f);
@@ -126,33 +261,114 @@
             Return type: Any type
           

 

+<<<<<<< .working
             Semantics: Equivalent to f(eN ....f(e2,f(e1,initial_state)))
             where e1 ...eN are the elements of seq.
+=======
+            Semantics: Equivalent to f(... f(f(initial_state,e1),e2) ...eN) where e1
+            ...eN
+            are the elements of seq.
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear, exactly result_of::size<Sequence>::value applications of f.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

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

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
struct make_string
 {
     typedef std::string result_type;
 
     template<typename T>
-    std::string operator()(const T& t, const std::string& str) const
+    std::string operator()(const std::string& str, const T& t) const
     {
         return str + boost::lexical_cast<std::string>(t);
     }
@@ -164,7 +380,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/iteration/functions/for_each.html b/doc/html/fusion/algorithm/iteration/functions/for_each.html
index 01231181..54afe3a0 100644
--- a/doc/html/fusion/algorithm/iteration/functions/for_each.html
+++ b/doc/html/fusion/algorithm/iteration/functions/for_each.html
@@ -1,10 +1,18 @@
 
 
-
+
 for_each
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Applies a unary function object to each element of a sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -48,8 +106,33 @@
     Sequence& seq, F const& f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.35. Parameters

 
+=======
+
Table 1.35. Parameters

+=======
+
Table 1.39. Parameters

+=======
+
Table 1.39. Parameters

+=======
+
Table 1.39. Parameters

+=======
+
Table 1.39. Parameters

+=======
+
Table 1.39. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -98,9 +181,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
for_each(seq, f);
@@ -113,22 +202,97 @@
             in seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear, exactly result_of::size<Sequence>::value applications of f.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/fusion/include/for_each.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
struct increment
 {
@@ -146,7 +310,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/iteration/metafunctions.html b/doc/html/fusion/algorithm/iteration/metafunctions.html
index d4d69116..adf4eff2 100644
--- a/doc/html/fusion/algorithm/iteration/metafunctions.html
+++ b/doc/html/fusion/algorithm/iteration/metafunctions.html
@@ -3,7 +3,11 @@
 
 Metafunctions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html b/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html
index da430a99..2ebc69ea 100644
--- a/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html
+++ b/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html
@@ -1,10 +1,18 @@
 
 
-
+
 accumulate
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of accumulate.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -50,8 +108,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.37. Parameters

 
+=======
+
Table 1.37. Parameters

+=======
+
Table 1.41. Parameters

+=======
+
Table 1.41. Parameters

+=======
+
Table 1.41. Parameters

+=======
+
Table 1.41. Parameters

+=======
+
Table 1.41. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -94,6 +177,7 @@
                 

+<<<<<<< .working
 
@@ -103,15 +187,39 @@
                   of type E in seq, and current state s of type S

+
+

 
 

 
 

                   F
                 

                 
 

+=======
+

+                

+                  F
+                

+                		
+                

+                  boost::result_of<F(S,E)>::type is the return type of f(s,e)
+                  for current state s
+                  of type S, and
+                  for each element e
+                  of type E in seq
+                

+                		
+                

+>>>>>>> .merge-right.r57125
                   The operation to be applied on forward traversal
                 

 

 
 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::accumulate<Sequence, State, F>::type
@@ -127,15 +235,65 @@
             and binary function object or function pointer of type F.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear, exactly result_of::size<Sequence>::value applications of F.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/include/accumulate.hpp>
@@ -143,7 +301,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/iteration/metafunctions/fold.html b/doc/html/fusion/algorithm/iteration/metafunctions/fold.html
index 3688b58d..406d0184 100644
--- a/doc/html/fusion/algorithm/iteration/metafunctions/fold.html
+++ b/doc/html/fusion/algorithm/iteration/metafunctions/fold.html
@@ -1,10 +1,18 @@
 
 
-
+
 fold
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of fold.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -50,8 +108,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.36. Parameters

 
+=======
+
Table 1.36. Parameters

+=======
+
Table 1.40. Parameters

+=======
+
Table 1.40. Parameters

+=======
+
Table 1.40. Parameters

+=======
+
Table 1.40. Parameters

+=======
+
Table 1.40. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -94,6 +177,7 @@
                 

+<<<<<<< .working
 
@@ -103,15 +187,39 @@
                   of type E in seq, and current state s of type S

+
+

 
 

 
 

                   F
                 

                 
 

+=======
+

+                

+                  F
+                

+                		
+                

+                  boost::result_of<F(S,E)>::type is the return type of f(s,e)
+                  for current state s
+                  of type S, and
+                  for each element e
+                  of type E in seq
+                

+                		
+                

+>>>>>>> .merge-right.r57125
                   The operation to be applied on forward traversal
                 

 

 
 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::fold<Sequence, State, F>::type
@@ -127,15 +235,65 @@
             and binary function object or function pointer of type F.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear, exactly result_of::size<Sequence>::value applications of F.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/iteration/fold.hpp>
 #include <boost/fusion/include/fold.hpp>
@@ -143,7 +301,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html b/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html
index 341f181d..0ee3af28 100644
--- a/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html
+++ b/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html
@@ -1,10 +1,18 @@
 
 
-
+
 for_each
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -34,12 +42,62 @@
             return type of for_each is always void.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +109,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.38. Parameters

 
+=======
+
Table 1.38. Parameters

+=======
+
Table 1.42. Parameters

+=======
+
Table 1.42. Parameters

+=======
+
Table 1.42. Parameters

+=======
+
Table 1.42. Parameters

+=======
+
Table 1.42. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,9 +180,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::for_each<Sequence, F>::type
@@ -115,15 +204,65 @@
             return type is always void.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/fusion/include/for_each.hpp>
@@ -131,7 +270,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query.html b/doc/html/fusion/algorithm/query.html
index 2a36a1f4..29d30581 100644
--- a/doc/html/fusion/algorithm/query.html
+++ b/doc/html/fusion/algorithm/query.html
@@ -3,7 +3,11 @@
 
 Query
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -36,10 +40,17 @@
 

         The query algorithms provide support for searching and analyzing sequences.
       

+<<<<<<< .working
 

 
         Header
       

+=======
+

+
+        Header
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/algorithm/query.hpp>
 #include <boost/fusion/include/query.hpp>
 

diff --git a/doc/html/fusion/algorithm/query/functions.html b/doc/html/fusion/algorithm/query/functions.html
index 67be2efb..687ca088 100644
--- a/doc/html/fusion/algorithm/query/functions.html
+++ b/doc/html/fusion/algorithm/query/functions.html
@@ -3,7 +3,11 @@
 
 Functions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/algorithm/query/functions/all.html b/doc/html/fusion/algorithm/query/functions/all.html
index 99b995ba..372a2aca 100644
--- a/doc/html/fusion/algorithm/query/functions/all.html
+++ b/doc/html/fusion/algorithm/query/functions/all.html
@@ -1,10 +1,18 @@
 
 
-
+
 all
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             For a sequence seq and
@@ -41,8 +74,33 @@
             element of seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -52,8 +110,33 @@
     Sequence const& seq, F f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.40. Parameters

 
+=======
+
Table 1.40. Parameters

+=======
+
Table 1.44. Parameters

+=======
+
Table 1.44. Parameters

+=======
+
Table 1.44. Parameters

+=======
+
Table 1.44. Parameters

+=======
+
Table 1.44. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -100,9 +183,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
all(seq, f);
@@ -117,22 +206,97 @@
             element e in seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear. At most result_of::size<Sequence>::value comparisons.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/all.hpp>
 #include <boost/fusion/include/all.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
struct odd
 {
@@ -149,7 +313,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/functions/any.html b/doc/html/fusion/algorithm/query/functions/any.html
index 011b019e..3ca3a419 100644
--- a/doc/html/fusion/algorithm/query/functions/any.html
+++ b/doc/html/fusion/algorithm/query/functions/any.html
@@ -1,10 +1,18 @@
 
 
-
+
 any
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             For a sequence seq and
@@ -41,8 +74,33 @@
             least one element of seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -52,8 +110,33 @@
     Sequence const& seq, F f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.39. Parameters

 
+=======
+
Table 1.39. Parameters

+=======
+
Table 1.43. Parameters

+=======
+
Table 1.43. Parameters

+=======
+
Table 1.43. Parameters

+=======
+
Table 1.43. Parameters

+=======
+
Table 1.43. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -100,9 +183,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             semantics
           

 
any(seq, f);
@@ -117,22 +206,97 @@
             element e in seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear. At most result_of::size<Sequence>::value comparisons.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/any.hpp>
 #include <boost/fusion/include/any.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
struct odd
 {
@@ -149,7 +313,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/functions/count.html b/doc/html/fusion/algorithm/query/functions/count.html
index 8675a7d3..cc8291ec 100644
--- a/doc/html/fusion/algorithm/query/functions/count.html
+++ b/doc/html/fusion/algorithm/query/functions/count.html
@@ -1,10 +1,18 @@
 
 
-
+
 count
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the number of elements of a given type within a sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -48,8 +106,33 @@
     Sequence const& seq, T const& t);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.44. Parameters

 
+=======
+
Table 1.44. Parameters

+=======
+
Table 1.48. Parameters

+=======
+
Table 1.48. Parameters

+=======
+
Table 1.48. Parameters

+=======
+
Table 1.48. Parameters

+=======
+
Table 1.48. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,9 +180,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
count(seq, t);
@@ -113,22 +202,97 @@
             t in seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear. At most result_of::size<Sequence>::value comparisons.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/count.hpp>
 #include <boost/fusion/include/count.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<double,int,int> vec(1.0,2,3);
 assert(count(vec,2) == 1);
@@ -136,7 +300,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/functions/count_if.html b/doc/html/fusion/algorithm/query/functions/count_if.html
index 0ea219a0..43a53620 100644
--- a/doc/html/fusion/algorithm/query/functions/count_if.html
+++ b/doc/html/fusion/algorithm/query/functions/count_if.html
@@ -1,10 +1,18 @@
 
 
-
+
 count_if
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the number of elements within a sequence with a type for which
             a given unary function object evaluates to true.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -49,8 +107,33 @@
     Sequence const& seq, F f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.45. Parameters

 
+=======
+
Table 1.45. Parameters

+=======
+
Table 1.49. Parameters

+=======
+
Table 1.49. Parameters

+=======
+
Table 1.49. Parameters

+=======
+
Table 1.49. Parameters

+=======
+
Table 1.49. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,9 +180,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
count_if(seq, f)
@@ -112,22 +201,97 @@
             in seq where f evaluates to true.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear. At most result_of::size<Sequence>::value comparisons.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/count_if.hpp>
 #include <boost/fusion/include/count_if.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<int,int,int> vec(1,2,3);
 assert(count_if(vec,odd()) == 2);
@@ -135,7 +299,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/functions/find.html b/doc/html/fusion/algorithm/query/functions/find.html
index f3f695fe..a06e949e 100644
--- a/doc/html/fusion/algorithm/query/functions/find.html
+++ b/doc/html/fusion/algorithm/query/functions/find.html
@@ -1,10 +1,18 @@
 
 
-
+
 find
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Finds the first element of a given type within a sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename T,
@@ -53,8 +111,33 @@
 unspecified find(Sequence& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.42. Parameters

 
+=======
+
Table 1.42. Parameters

+=======
+
Table 1.46. Parameters

+=======
+
Table 1.46. Parameters

+=======
+
Table 1.46. Parameters

+=======
+
Table 1.46. Parameters

+=======
+
Table 1.46. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -99,9 +182,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
find<T>(seq)
@@ -117,22 +206,97 @@
             to find_if<boost::is_same<_, T> >(seq)
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear. At most result_of::size<Sequence>::value comparisons.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/find.hpp>
 #include <boost/fusion/include/find.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<char,int> vec('a','0');
 assert(*find<int>(vec) == '0');
@@ -141,7 +305,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/functions/find_if.html b/doc/html/fusion/algorithm/query/functions/find_if.html
index d5eed466..43562c9d 100644
--- a/doc/html/fusion/algorithm/query/functions/find_if.html
+++ b/doc/html/fusion/algorithm/query/functions/find_if.html
@@ -1,10 +1,18 @@
 
 
-
+
 find_if
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -35,12 +43,62 @@
             Lambda Expression evaluates to boost::mpl::true_.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename F,
@@ -55,8 +113,33 @@
 unspecified find_if(Sequence& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.43. Parameters

 
+=======
+
Table 1.43. Parameters

+=======
+
Table 1.47. Parameters

+=======
+
Table 1.47. Parameters

+=======
+
Table 1.47. Parameters

+=======
+
Table 1.47. Parameters

+=======
+
Table 1.47. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -102,9 +185,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
find_if<F>(seq)
@@ -121,18 +210,73 @@
             if there is no such element.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear. At most result_of::size<Sequence>::value comparisons.
           

-

-            /algorithm/query/find_if.hpp>
-          

+
    
+
  1. 
+              include <boost/fusion/algorithm/query/find_if.hpp>
+            
    2. 
+
  2. 
+              include <boost/fusion/include/find_if.hpp>
+            
    3. 
+

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<double,int> vec(1.0,2);
 assert(*find_if<is_integral<mpl::_> >(vec) == 2);
@@ -141,7 +285,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/functions/none.html b/doc/html/fusion/algorithm/query/functions/none.html
index fb2f13e2..2b0b33ea 100644
--- a/doc/html/fusion/algorithm/query/functions/none.html
+++ b/doc/html/fusion/algorithm/query/functions/none.html
@@ -1,10 +1,18 @@
 
 
-
+
 none
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             For a sequence seq and
@@ -41,8 +74,33 @@
             element of seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -52,8 +110,33 @@
     Sequence const& seq, F f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.41. Parameters

 
+=======
+
Table 1.41. Parameters

+=======
+
Table 1.45. Parameters

+=======
+
Table 1.45. Parameters

+=======
+
Table 1.45. Parameters

+=======
+
Table 1.45. Parameters

+=======
+
Table 1.45. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -100,9 +183,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
none(seq, f);
@@ -117,22 +206,97 @@
             element e in seq. Result equivalent to !any(seq, f).
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear. At most result_of::size<Sequence>::value comparisons.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/none.hpp>
 #include <boost/fusion/include/none.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
struct odd
 {
@@ -149,7 +313,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/metafunctions.html b/doc/html/fusion/algorithm/query/metafunctions.html
index 03aa9147..7fba2a24 100644
--- a/doc/html/fusion/algorithm/query/metafunctions.html
+++ b/doc/html/fusion/algorithm/query/metafunctions.html
@@ -3,7 +3,11 @@
 
 Metafunctions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/algorithm/query/metafunctions/all.html b/doc/html/fusion/algorithm/query/metafunctions/all.html
index 5c4d3889..35173954 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/all.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/all.html
@@ -1,10 +1,18 @@
 
 
-
+
 all
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             A metafunction returning the result type of all.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -50,8 +108,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.47. Parameters

 
+=======
+
Table 1.47. Parameters

+=======
+
Table 1.51. Parameters

+=======
+
Table 1.51. Parameters

+=======
+
Table 1.51. Parameters

+=======
+
Table 1.51. Parameters

+=======
+
Table 1.51. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -98,9 +181,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::all<Sequence, F>::type
@@ -118,15 +207,65 @@
             The return type is always bool.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/all.hpp>
 #include <boost/fusion/include/all.hpp>
@@ -134,7 +273,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/metafunctions/any.html b/doc/html/fusion/algorithm/query/metafunctions/any.html
index 772e1969..98f2f049 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/any.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/any.html
@@ -1,10 +1,18 @@
 
 
-
+
 any
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             A metafunction returning the result type of any.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -50,8 +108,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.46. Parameters

 
+=======
+
Table 1.46. Parameters

+=======
+
Table 1.50. Parameters

+=======
+
Table 1.50. Parameters

+=======
+
Table 1.50. Parameters

+=======
+
Table 1.50. Parameters

+=======
+
Table 1.50. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -98,9 +181,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::any<Sequence, F>::type
@@ -118,15 +207,65 @@
             The return type is always bool.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/any.hpp>
 #include <boost/fusion/include/any.hpp>
@@ -134,7 +273,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/metafunctions/count.html b/doc/html/fusion/algorithm/query/metafunctions/count.html
index 0e20ddc0..e23981b7 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/count.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/count.html
@@ -1,10 +1,18 @@
 
 
-
+
 count
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             A metafunction that returns the result type of count
             given the sequence and search types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +109,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.51. Parameters

 
+=======
+
Table 1.51. Parameters

+=======
+
Table 1.55. Parameters

+=======
+
Table 1.55. Parameters

+=======
+
Table 1.55. Parameters

+=======
+
Table 1.55. Parameters

+=======
+
Table 1.55. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,9 +180,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::count<T>::type
@@ -113,15 +202,65 @@
             int.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/count.hpp>
 #include <boost/fusion/include/count.hpp>
@@ -129,7 +268,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/metafunctions/count_if.html b/doc/html/fusion/algorithm/query/metafunctions/count_if.html
index 8587194e..3b91b3de 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/count_if.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/count_if.html
@@ -1,10 +1,18 @@
 
 
-
+
 count_if
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             A metafunction that returns the result type of count_if
             given the sequence and predicate types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +109,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.52. Parameters

 
+=======
+
Table 1.52. Parameters

+=======
+
Table 1.56. Parameters

+=======
+
Table 1.56. Parameters

+=======
+
Table 1.56. Parameters

+=======
+
Table 1.56. Parameters

+=======
+
Table 1.56. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,9 +180,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::count_if<Sequence, Pred>::type
@@ -113,15 +202,65 @@
             always int.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/count_if.hpp>
 #include <boost/fusion/include/count_if.hpp>
@@ -129,7 +268,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/metafunctions/find.html b/doc/html/fusion/algorithm/query/metafunctions/find.html
index 305bb4ba..c4f18b27 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/find.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/find.html
@@ -1,10 +1,18 @@
 
 
-
+
 find
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,71 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
             Returns the result type of find,
             given the sequence and search types.
+=======
+            Returns the result type of find, given the sequence and
+            search types.
+>>>>>>> .merge-right.r57242
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +114,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.49. Parameters

 
+=======
+
Table 1.49. Parameters

+=======
+
Table 1.53. Parameters

+=======
+
Table 1.53. Parameters

+=======
+
Table 1.53. Parameters

+=======
+
Table 1.53. Parameters

+=======
+
Table 1.53. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,9 +185,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::find<Sequence, T>::type
@@ -115,15 +209,65 @@
             if there is no such element.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear, at most result_of::size<Sequence>::value comparisons.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/find.hpp>
 #include <boost/fusion/include/find.hpp>
@@ -131,7 +275,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/metafunctions/find_if.html b/doc/html/fusion/algorithm/query/metafunctions/find_if.html
index ee10c29c..61e3f40e 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/find_if.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/find_if.html
@@ -1,10 +1,18 @@
 
 
-
+
 find_if
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,71 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
             Returns the result type of find_if
             given the sequence and predicate types.
+=======
+            Returns the result type of find_if given the sequence and
+            predicate types.
+>>>>>>> .merge-right.r57242
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +114,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.50. Parameters

 
+=======
+
Table 1.50. Parameters

+=======
+
Table 1.54. Parameters

+=======
+
Table 1.54. Parameters

+=======
+
Table 1.54. Parameters

+=======
+
Table 1.54. Parameters

+=======
+
Table 1.54. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -98,9 +186,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::find_if<Sequence, Pred>::type
@@ -116,15 +210,65 @@
             to true. Returns result_of::end<Sequence>::type if there is no such element.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Linear. At most result_of::size<Sequence>::value comparisons.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/find_if.hpp>
 #include <boost/fusion/include/find_if.hpp>
@@ -132,7 +276,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/metafunctions/none.html b/doc/html/fusion/algorithm/query/metafunctions/none.html
index cbcc6bad..b3387567 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/none.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/none.html
@@ -1,10 +1,18 @@
 
 
-
+
 none
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             A metafunction returning the result type of none.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -50,8 +108,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.48. Parameters

 
+=======
+
Table 1.48. Parameters

+=======
+
Table 1.52. Parameters

+=======
+
Table 1.52. Parameters

+=======
+
Table 1.52. Parameters

+=======
+
Table 1.52. Parameters

+=======
+
Table 1.52. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -98,9 +181,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::none<Sequence, F>::type
@@ -118,15 +207,65 @@
             The return type is always bool.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/none.hpp>
 #include <boost/fusion/include/none.hpp>
@@ -134,7 +273,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation.html b/doc/html/fusion/algorithm/transformation.html
index 17f9572e..f4073ebd 100644
--- a/doc/html/fusion/algorithm/transformation.html
+++ b/doc/html/fusion/algorithm/transformation.html
@@ -3,7 +3,11 @@
 
 Transformation
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -49,10 +53,17 @@
           the period during which you wish to use the results.
         

 

+<<<<<<< .working
 

 
         Header
       

+=======
+

+
+        Header
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/algorithm/transformation.hpp>
 #include <boost/fusion/include/transformation.hpp>
 

diff --git a/doc/html/fusion/algorithm/transformation/functions.html b/doc/html/fusion/algorithm/transformation/functions.html
index 99877326..5ecc11dd 100644
--- a/doc/html/fusion/algorithm/transformation/functions.html
+++ b/doc/html/fusion/algorithm/transformation/functions.html
@@ -3,7 +3,11 @@
 
 Functions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/clear.html b/doc/html/fusion/algorithm/transformation/functions/clear.html
index f9338990..c7f6eca7 100644
--- a/doc/html/fusion/algorithm/transformation/functions/clear.html
+++ b/doc/html/fusion/algorithm/transformation/functions/clear.html
@@ -1,10 +1,18 @@
 
 
-
+
 clear
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 
 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             clear returns an empty sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synposis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synposis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -46,8 +104,33 @@
 typename result_of::clear<Sequence const>::type clear(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.62. Parameters

 
+=======
+
Table 1.62. Parameters

+=======
+
Table 1.66. Parameters

+=======
+
Table 1.66. Parameters

+=======
+
Table 1.66. Parameters

+=======
+
Table 1.66. Parameters

+=======
+
Table 1.66. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -79,9 +162,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
clear(seq);
@@ -96,29 +185,104 @@
             with no elements.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/clear.hpp>
 #include <boost/fusion/include/clear.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
assert(clear(make_vector(1,2,3)) == make_vector());
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/erase.html b/doc/html/fusion/algorithm/transformation/functions/erase.html
index 0160fd20..b94635fa 100644
--- a/doc/html/fusion/algorithm/transformation/functions/erase.html
+++ b/doc/html/fusion/algorithm/transformation/functions/erase.html
@@ -1,10 +1,18 @@
 
 
-
+
 erase
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns a new sequence, containing all the elements of the original except
             those at a specified iterator, or between two iterators.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synposis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synposis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -57,8 +115,33 @@
     Sequence const& seq, First const& it1, Last const& it2);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.63. Parameters

 
+=======
+
Table 1.63. Parameters

+=======
+
Table 1.67. Parameters

+=======
+
Table 1.67. Parameters

+=======
+
Table 1.67. Parameters

+=======
+
Table 1.67. Parameters

+=======
+
Table 1.67. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -119,18 +202,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
erase(seq, pos);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence, containing
             all the elements of seq
@@ -139,32 +244,123 @@
 
erase(seq, first, last);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence, with
             all the elements of seq,
             in their original order, except those in the range [first,last).
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/erase.hpp>
 #include <boost/fusion/include/erase.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<int, double, char> vec(1, 2.0, 'c');
 assert(erase(vec, next(begin(vec))) == make_vector(1, 'c'));
@@ -173,7 +369,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/erase_key.html b/doc/html/fusion/algorithm/transformation/functions/erase_key.html
index ca02e1f1..7789369c 100644
--- a/doc/html/fusion/algorithm/transformation/functions/erase_key.html
+++ b/doc/html/fusion/algorithm/transformation/functions/erase_key.html
@@ -1,10 +1,18 @@
 
 
-
+
 erase_key
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,10 +38,36 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
             For an Associative
             Sequence seq,
@@ -41,20 +75,78 @@
         Sequence">Forward
             Sequence containing all the elements of the original except those
             with a given key.
+=======
+            For an associative]
+            Forward Sequence
+            seq, returns a associative]
+            Forward Sequence
+            containing all the elements of the original except those with a given
+            key.
+>>>>>>> .merge-right.r57242
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synposis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synposis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Key,
     typename Sequence
     >
-typename result_of::erase_key<Sequence const, Key>::type erase_key(Sequence const& seq);
+typename result_of::erase_key<Sequence const, Key>::type erase_key(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.64. Parameters

 
+=======
+
Table 1.64. Parameters

+=======
+
Table 1.68. Parameters

+=======
+
Table 1.68. Parameters

+=======
+
Table 1.68. Parameters

+=======
+
Table 1.68. Parameters

+=======
+
Table 1.68. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -73,12 +165,24 @@
 
+<<<<<<< .working
 
+

 
 

 
 

                   seq
                 

 

                   A model of Associative
+=======
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
+                  Sequence and Associative
+>>>>>>> .merge-right.r57242
                   Sequence
                 

 

@@ -99,9 +203,15 @@
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
erase_key<Key>(seq);
@@ -109,6 +219,7 @@
 

             Return type: A model of Forward
+            Sequence and Associative
             Sequence.
           

 

@@ -117,29 +228,104 @@
             except those with key Key.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/erase_key.hpp>
 #include <boost/fusion/include/erase_key.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
assert(erase_key<int>(make_map<int, long>('a', 'b')) == make_map<long>('b'));
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/filter.html b/doc/html/fusion/algorithm/transformation/functions/filter.html
index 9fbefd71..97dd8c79 100644
--- a/doc/html/fusion/algorithm/transformation/functions/filter.html
+++ b/doc/html/fusion/algorithm/transformation/functions/filter.html
@@ -1,10 +1,18 @@
 
 
-
+
 filter
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             For a given sequence, filter returns a new sequences containing only
             the elements of a specified type.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename T,
@@ -48,8 +106,33 @@
 typename result_of::filter<Sequence const, T>::type filter(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.53. Parameters

 
+=======
+
Table 1.53. Parameters

+=======
+
Table 1.57. Parameters

+=======
+
Table 1.57. Parameters

+=======
+
Table 1.57. Parameters

+=======
+
Table 1.57. Parameters

+=======
+
Table 1.57. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -94,18 +177,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
filter<T>(seq);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence containing
             all the elements of seq
@@ -113,22 +218,97 @@
             to filter_if<boost::same_type<_, T> >(seq).
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/filter.hpp>
 #include <boost/fusion/include/filter.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<int,int,long,long> vec(1,2,3,4);
 assert(filter<int>(vec) == make_vector(1,2));
@@ -136,7 +316,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/filter_if.html b/doc/html/fusion/algorithm/transformation/functions/filter_if.html
index be0cf834..457391ca 100644
--- a/doc/html/fusion/algorithm/transformation/functions/filter_if.html
+++ b/doc/html/fusion/algorithm/transformation/functions/filter_if.html
@@ -1,10 +1,18 @@
 
 
-
+
 filter_if
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             For a given sequence, filter_if returns a new sequences
@@ -39,8 +72,33 @@
             Lambda Expression evaluates to boost::mpl::true_.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Pred,
@@ -49,8 +107,33 @@
 typename result_of::filter_if<Sequence const, Pred>::type filter_if(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.54. Parameters

 
+=======
+
Table 1.54. Parameters

+=======
+
Table 1.58. Parameters

+=======
+
Table 1.58. Parameters

+=======
+
Table 1.58. Parameters

+=======
+
Table 1.58. Parameters

+=======
+
Table 1.58. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -96,18 +179,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
filter_if<Pred>(seq);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence containing
             all the elements of seq
@@ -116,22 +221,97 @@
             is the same as in the original sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/filter_if.hpp>
 #include <boost/fusion/include/filter_if.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<int,int,double,double> vec(1,2,3.0,4.0);
 assert(filter_if<is_integral<mpl::_> >(vec) == make_vector(1,2));
@@ -139,7 +319,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/insert.html b/doc/html/fusion/algorithm/transformation/functions/insert.html
index 2149d2b4..5c40459b 100644
--- a/doc/html/fusion/algorithm/transformation/functions/insert.html
+++ b/doc/html/fusion/algorithm/transformation/functions/insert.html
@@ -1,10 +1,18 @@
 
 
-
+
 insert
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,27 +38,103 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns a new sequence with all the elements of the original, an a new
             element inserted the position described by a given iterator.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synposis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synposis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename Pos,
     typename T
     >
-unspecified insert(Sequence const& seq, Pos const& pos, T const& t);
+typename result_of::insert<Sequence const, Pos, T>::type insert(
+    Sequence const& seq, Pos const& pos, T const& t);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.65. Parameters

 
+=======
+
Table 1.65. Parameters

+=======
+
Table 1.69. Parameters

+=======
+
Table 1.69. Parameters

+=======
+
Table 1.69. Parameters

+=======
+
Table 1.69. Parameters

+=======
+
Table 1.69. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -108,18 +192,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
insert(seq, p, t);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence, containing
             all the elements of seq,
@@ -128,22 +234,97 @@
             pos.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/insert.hpp>
 #include <boost/fusion/include/insert.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<int,int> vec(1,2);
 assert(insert(vec, next(begin(vec)), 3) == make_vector(1,3,2));
@@ -151,7 +332,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/insert_range.html b/doc/html/fusion/algorithm/transformation/functions/insert_range.html
index 53cc548f..a3809bf0 100644
--- a/doc/html/fusion/algorithm/transformation/functions/insert_range.html
+++ b/doc/html/fusion/algorithm/transformation/functions/insert_range.html
@@ -1,10 +1,18 @@
 
 
-
+
 insert_range
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns a new sequence with another sequence inserted at a specified
             iterator.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synposis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synposis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -50,8 +108,33 @@
     Sequence const& seq, Pos const& pos, Range const& range);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.66. Parameters

 
+=======
+
Table 1.66. Parameters

+=======
+
Table 1.70. Parameters

+=======
+
Table 1.70. Parameters

+=======
+
Table 1.70. Parameters

+=======
+
Table 1.70. Parameters

+=======
+
Table 1.70. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -111,18 +194,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
insert(seq, pos, range);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence, containing
             all the elements of seq,
@@ -131,22 +236,97 @@
             All elements retaining their ordering from the orignal sequences.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/insert_range.hpp>
 #include <boost/fusion/include/insert_range.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<int,int> vec(1,2);
 assert(insert_range(vec, next(begin(vec)), make_vector(3,4)) == make_vector(1,3,4,2));
@@ -154,7 +334,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/join.html b/doc/html/fusion/algorithm/transformation/functions/join.html
index 1b910024..ff8dca16 100644
--- a/doc/html/fusion/algorithm/transformation/functions/join.html
+++ b/doc/html/fusion/algorithm/transformation/functions/join.html
@@ -1,10 +1,18 @@
 
 
-
+
 join
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Takes 2 sequences and returns a sequence containing the elements of the
             first followed by the elements of the second.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename LhSequence,
@@ -47,8 +105,33 @@
 typename result_of::join<LhSequence, RhSequence>::type join(LhSequence const& lhs, RhSequence const& rhs);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.67. Parameters

 
+=======
+
Table 1.67. Parameters

+=======
+
Table 1.71. Parameters

+=======
+
Table 1.71. Parameters

+=======
+
Table 1.71. Parameters

+=======
+
Table 1.71. Parameters

+=======
+
Table 1.71. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -95,41 +178,139 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
join(lhs, rhs);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence containing
             all the elements of lhs
             followed by all the elements of rhs.
-            The order of th elements is preserved.
+            The order of the elements is preserved.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/join.hpp>
 #include <boost/fusion/include/join.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
vector<int,char> v1(1, 'a');
 vector<int,char> v2(2, 'b');
@@ -138,7 +319,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/pop_back.html b/doc/html/fusion/algorithm/transformation/functions/pop_back.html
index 5335bf4c..7b9e0958 100644
--- a/doc/html/fusion/algorithm/transformation/functions/pop_back.html
+++ b/doc/html/fusion/algorithm/transformation/functions/pop_back.html
@@ -1,10 +1,18 @@
 
 
-
+
 pop_back
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns a new sequence, with the last element of the original removed.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -46,8 +104,33 @@
 typename result_of::pop_back<Sequence const>::type pop_back(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.69. Parameters

 
+=======
+
Table 1.69. Parameters

+=======
+
Table 1.73. Parameters

+=======
+
Table 1.73. Parameters

+=======
+
Table 1.73. Parameters

+=======
+
Table 1.73. Parameters

+=======
+
Table 1.73. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -79,18 +162,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
pop_back(seq);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence containing
             all the elements of seq,
@@ -98,29 +203,104 @@
             same order as they were in seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/pop_back.hpp>
 #include <boost/fusion/include/pop_back.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
assert(___pop_back__(make_vector(1,2,3)) == make_vector(1,2));
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/pop_front.html b/doc/html/fusion/algorithm/transformation/functions/pop_front.html
index 66766f43..7007e552 100644
--- a/doc/html/fusion/algorithm/transformation/functions/pop_front.html
+++ b/doc/html/fusion/algorithm/transformation/functions/pop_front.html
@@ -1,10 +1,18 @@
 
 
-
+
 pop_front
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns a new sequence, with the first element of the original removed.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -46,8 +104,33 @@
 typename result_of::pop_front<Sequence const>::type pop_front(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.70. Parameters

 
+=======
+
Table 1.70. Parameters

+=======
+
Table 1.74. Parameters

+=======
+
Table 1.74. Parameters

+=======
+
Table 1.74. Parameters

+=======
+
Table 1.74. Parameters

+=======
+
Table 1.74. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -79,18 +162,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
pop_front(seq);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence containing
             all the elements of seq,
@@ -98,29 +203,104 @@
             same order as they were in seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/pop_front.hpp>
 #include <boost/fusion/include/pop_front.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
assert(pop_front(make_vector(1,2,3)) == make_vector(2,3));
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/push_back.html b/doc/html/fusion/algorithm/transformation/functions/push_back.html
index 7a4a9d26..73868212 100644
--- a/doc/html/fusion/algorithm/transformation/functions/push_back.html
+++ b/doc/html/fusion/algorithm/transformation/functions/push_back.html
@@ -1,10 +1,18 @@
 
 
-
+
 push_back
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns a new sequence with an element added at the end.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -48,8 +106,33 @@
     Sequence const& seq, T const& t);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.71. Parameters

 
+=======
+
Table 1.71. Parameters

+=======
+
Table 1.75. Parameters

+=======
+
Table 1.75. Parameters

+=======
+
Table 1.75. Parameters

+=======
+
Table 1.75. Parameters

+=======
+
Table 1.75. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -94,18 +177,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
push_back(seq, t);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence, containing
             all the elements of seq,
@@ -113,29 +218,104 @@
             to the end. The elements are in the same order as they were in seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/include/push_back.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
assert(push_back(make_vector(1,2,3),4) == make_vector(1,2,3,4));
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/push_front.html b/doc/html/fusion/algorithm/transformation/functions/push_front.html
index 637636fd..a33eb54a 100644
--- a/doc/html/fusion/algorithm/transformation/functions/push_front.html
+++ b/doc/html/fusion/algorithm/transformation/functions/push_front.html
@@ -1,10 +1,18 @@
 
 
-
+
 push_front
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns a new sequence with an element added at the beginning.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -48,8 +106,33 @@
     Sequence const& seq, T const& t);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.72. Parameters

 
+=======
+
Table 1.72. Parameters

+=======
+
Table 1.76. Parameters

+=======
+
Table 1.76. Parameters

+=======
+
Table 1.76. Parameters

+=======
+
Table 1.76. Parameters

+=======
+
Table 1.76. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -94,18 +177,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
push_back(seq, t);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence, containing
             all the elements of seq,
@@ -114,29 +219,104 @@
             seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/push_front.hpp>
 #include <boost/fusion/include/push_front.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
assert(push_front(make_vector(1,2,3),0) == make_vector(0,1,2,3));
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/remove.html b/doc/html/fusion/algorithm/transformation/functions/remove.html
index b2512b28..5a6a026a 100644
--- a/doc/html/fusion/algorithm/transformation/functions/remove.html
+++ b/doc/html/fusion/algorithm/transformation/functions/remove.html
@@ -1,10 +1,18 @@
 
 
-
+
 remove
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns a new sequence, with all the elements of the original sequence,
             except those of a given type.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename T,
@@ -48,8 +106,33 @@
 typename result_of::remove<Sequence const, T>::type replace(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.59. Parameters

 
+=======
+
Table 1.59. Parameters

+=======
+
Table 1.63. Parameters

+=======
+
Table 1.63. Parameters

+=======
+
Table 1.63. Parameters

+=======
+
Table 1.63. Parameters

+=======
+
Table 1.63. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -94,18 +177,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
remove<T>(seq);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence, containing
             all the elements of seq,
@@ -113,22 +218,97 @@
             Equivalent to remove_if<boost::is_same<_,T> >(seq).
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/remove.hpp>
 #include <boost/fusion/include/remove.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<int,double> vec(1,2.0);
 assert(remove<double>(vec) == make_vector(1));
@@ -136,7 +316,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/remove_if.html b/doc/html/fusion/algorithm/transformation/functions/remove_if.html
index a4bd622b..f17d7697 100644
--- a/doc/html/fusion/algorithm/transformation/functions/remove_if.html
+++ b/doc/html/fusion/algorithm/transformation/functions/remove_if.html
@@ -1,10 +1,18 @@
 
 
-
+
 remove_if
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns a new sequence, containing all the elements of the original except
             those where a given unary function object evaluates to true.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Pred,
@@ -48,8 +106,33 @@
 typename result_of::remove_if<Sequence const, Pred>::type remove_if(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.60. Parameters

 
+=======
+
Table 1.60. Parameters

+=======
+
Table 1.64. Parameters

+=======
+
Table 1.64. Parameters

+=======
+
Table 1.64. Parameters

+=======
+
Table 1.64. Parameters

+=======
+
Table 1.64. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -95,18 +178,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
remove_if<Pred>(seq);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence, containing
             all the elements of seq,
@@ -115,22 +220,97 @@
             >(seq).
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/remove_if.hpp>
 #include <boost/fusion/include/remove_if.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
const vector<int,double> vec(1,2.0);
 assert(remove_if<is_floating_point<mpl::_> >(vec) == make_vector(1));
@@ -138,7 +318,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/replace.html b/doc/html/fusion/algorithm/transformation/functions/replace.html
index ef8b4384..3dd9ed7c 100644
--- a/doc/html/fusion/algorithm/transformation/functions/replace.html
+++ b/doc/html/fusion/algorithm/transformation/functions/replace.html
@@ -1,10 +1,18 @@
 
 
-
+
 replace
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Replaces each value within a sequence of a given type and value with
             a new value.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -49,8 +107,33 @@
     Sequence const& seq, T const& old_value, T const& new_value);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.57. Parameters

 
+=======
+
Table 1.57. Parameters

+=======
+
Table 1.61. Parameters

+=======
+
Table 1.61. Parameters

+=======
+
Table 1.61. Parameters

+=======
+
Table 1.61. Parameters

+=======
+
Table 1.61. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -110,9 +193,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
replace(seq, old_value, new_value);
@@ -129,29 +218,104 @@
             to elements with the same type and equal to old_value.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/replace.hpp>
 #include <boost/fusion/include/replace.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
assert(replace(make_vector(1,2), 2, 3) == make_vector(1,3));
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/replace_if.html b/doc/html/fusion/algorithm/transformation/functions/replace_if.html
index 4298583f..f8c42f47 100644
--- a/doc/html/fusion/algorithm/transformation/functions/replace_if.html
+++ b/doc/html/fusion/algorithm/transformation/functions/replace_if.html
@@ -1,10 +1,18 @@
 
 
-
+
 replace_if
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Replaces each element of a given sequence for which an unary function
@@ -39,8 +72,33 @@
             replaced with a new value.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -50,8 +108,33 @@
     Sequence const& seq, F f, T const& new_value);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.58. Parameters

 
+=======
+
Table 1.58. Parameters

+=======
+
Table 1.62. Parameters

+=======
+
Table 1.62. Parameters

+=======
+
Table 1.62. Parameters

+=======
+
Table 1.62. Parameters

+=======
+
Table 1.62. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -109,9 +192,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
replace_if(seq, f, new_value);
@@ -129,22 +218,97 @@
             evaluates to true.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/replace_if.hpp>
 #include <boost/fusion/include/replace_if.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
struct odd
 {
@@ -160,7 +324,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/reverse.html b/doc/html/fusion/algorithm/transformation/functions/reverse.html
index a827ef7e..9fb9a821 100644
--- a/doc/html/fusion/algorithm/transformation/functions/reverse.html
+++ b/doc/html/fusion/algorithm/transformation/functions/reverse.html
@@ -1,10 +1,18 @@
 
 
-
+
 reverse
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns a new sequence with the elements of the original in reverse order.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synposis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synposis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -46,8 +104,33 @@
 typename result_of::reverse<Sequence const>::type reverse(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.61. Parameters

 
+=======
+
Table 1.61. Parameters

+=======
+
Table 1.65. Parameters

+=======
+
Table 1.65. Parameters

+=======
+
Table 1.65. Parameters

+=======
+
Table 1.65. Parameters

+=======
+
Table 1.65. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -79,47 +162,149 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
reverse(seq);
 

 

+<<<<<<< .working
             Return type: A model of Bidirectional
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence containing
             all the elements of seq
             in reverse order.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/reverse.hpp>
 #include <boost/fusion/include/reverse.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
assert(reverse(make_vector(1,2,3)) == make_vector(3,2,1));
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/transform.html b/doc/html/fusion/algorithm/transformation/functions/transform.html
index 3bbfd6a3..ebf5836c 100644
--- a/doc/html/fusion/algorithm/transformation/functions/transform.html
+++ b/doc/html/fusion/algorithm/transformation/functions/transform.html
@@ -1,10 +1,18 @@
 
 
-
+
 transform
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             For a sequence seq and
@@ -41,8 +74,33 @@
             of seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Unary
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Unary
+>>>>>>> .merge-right.r57125
             version synopsis
           

 
template<
@@ -53,8 +111,33 @@
     Sequence const& seq, F f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.55. Parameters

 
+=======
+
Table 1.55. Parameters

+=======
+
Table 1.59. Parameters

+=======
+
Table 1.59. Parameters

+=======
+
Table 1.59. Parameters

+=======
+
Table 1.59. Parameters

+=======
+
Table 1.59. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -102,9 +185,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
transform(seq, f);
@@ -120,8 +209,33 @@
             within seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Binary
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Binary
+>>>>>>> .merge-right.r57125
             version synopsis
           

 
template<
@@ -133,8 +247,33 @@
     Sequence1 const& seq1, Sequence2 const& seq2, F f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.56. Parameters

 
+=======
+
Table 1.56. Parameters

+=======
+
Table 1.60. Parameters

+=======
+
Table 1.60. Parameters

+=======
+
Table 1.60. Parameters

+=======
+
Table 1.60. Parameters

+=======
+
Table 1.60. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -207,22 +346,97 @@
             within seq1 and seq2 respectively.
           

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

             Constant. Returns a view which is lazily evaluated.
           

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
#include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/fusion/include/transform.hpp>
 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
struct triple
 {
@@ -239,7 +453,7 @@
 
 

 
 

 
 
 
 
 
 

-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/zip.html b/doc/html/fusion/algorithm/transformation/functions/zip.html
index d150346a..b9439e4f 100644
--- a/doc/html/fusion/algorithm/transformation/functions/zip.html
+++ b/doc/html/fusion/algorithm/transformation/functions/zip.html
@@ -1,10 +1,18 @@
 
 
-
+
 zip
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Zips sequences together to form a single sequence, whos members are tuples
             of the members of the component sequences.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence1,
@@ -51,8 +109,33 @@
 zip(Sequence1 const& seq1, Sequence2 const& seq2, ... SequenceN const& seqN);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.68. Parameters

 
+=======
+
Table 1.68. Parameters

+=======
+
Table 1.72. Parameters

+=======
+
Table 1.72. Parameters

+=======
+
Table 1.72. Parameters

+=======
+
Table 1.72. Parameters

+=======
+
Table 1.72. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -84,9 +167,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
zip(seq1, seq2, ... seqN);
@@ -107,22 +196,97 @@
             'c'))
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/include/zip.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
vector<int,char> v1(1, 'a');
 vector<int,char> v2(2, 'b');
@@ -131,7 +295,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions.html b/doc/html/fusion/algorithm/transformation/metafunctions.html
index f51eb53b..917c29d3 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions.html
@@ -3,7 +3,11 @@
 
 Metafunctions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/clear.html b/doc/html/fusion/algorithm/transformation/metafunctions/clear.html
index 3834fce7..e9a88208 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/clear.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/clear.html
@@ -1,10 +1,18 @@
 
 
-
+
 clear
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of clear, given the input sequence
             type.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -50,8 +108,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.82. Parameters

 
+=======
+
Table 1.82. Parameters

+=======
+
Table 1.86. Parameters

+=======
+
Table 1.86. Parameters

+=======
+
Table 1.86. Parameters

+=======
+
Table 1.86. Parameters

+=======
+
Table 1.86. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -81,9 +164,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::clear<Sequence>::type
@@ -97,15 +186,65 @@
             Semantics: Returns an empty sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/clear.hpp>
 #include <boost/fusion/include/clear.hpp>
@@ -113,7 +252,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/erase.html b/doc/html/fusion/algorithm/transformation/metafunctions/erase.html
index d09ea874..ae521b7d 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/erase.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/erase.html
@@ -1,10 +1,18 @@
 
 
-
+
 erase
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -34,12 +42,62 @@
             and range delimiting iterator types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +109,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.83. Parameters

 
+=======
+
Table 1.83. Parameters

+=======
+
Table 1.87. Parameters

+=======
+
Table 1.87. Parameters

+=======
+
Table 1.87. Parameters

+=======
+
Table 1.87. Parameters

+=======
+
Table 1.87. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -112,18 +195,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::erase<Sequence, It1>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence with
             the element at It1 removed.
@@ -141,15 +246,65 @@
             and It2 removed.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/erase.hpp>
 #include <boost/fusion/include/erase.hpp>
@@ -157,7 +312,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html b/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html
index 8be1990a..3f6ebd40 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html
@@ -1,10 +1,18 @@
 
 
-
+
 erase_key
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of erase_key, given the sequence
             and key types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +109,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.84. Parameters

 
+=======
+
Table 1.84. Parameters

+=======
+
Table 1.88. Parameters

+=======
+
Table 1.88. Parameters

+=======
+
Table 1.88. Parameters

+=======
+
Table 1.88. Parameters

+=======
+
Table 1.88. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -71,12 +154,24 @@
 
+<<<<<<< .working
 
+

 
 

 
 

                   Sequence
                 

 

                   A model of Associative
+=======
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
+                  Sequence and Associative
+>>>>>>> .merge-right.r57242
                   Sequence
                 

 

@@ -97,16 +192,27 @@
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::erase_key<Sequence, Key>::type
 

 

+<<<<<<< .working
             Return type: A model of Associative
+=======
+            Return type: A model of Forward
+            Sequence and Associative
+>>>>>>> .merge-right.r57242
             Sequence.
           

 

@@ -115,15 +221,65 @@
             except those with key Key.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/erase_key.hpp>
 #include <boost/fusion/include/erase_key.hpp>
@@ -131,7 +287,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/filter.html b/doc/html/fusion/algorithm/transformation/metafunctions/filter.html
index a752f5c2..933962df 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/filter.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/filter.html
@@ -1,10 +1,18 @@
 
 
-
+
 filter
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of filter given the sequence type
             and type to retain.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +109,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.73. Parameter

 
+=======
+
Table 1.73. Parameter

+=======
+
Table 1.77. Parameter

+=======
+
Table 1.77. Parameter

+=======
+
Table 1.77. Parameter

+=======
+
Table 1.77. Parameter

+=======
+
Table 1.77. Parameter

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,18 +180,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::filter<Sequence, T>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence containing
             the elements of Sequence
@@ -117,15 +222,65 @@
             boost::is_same<mpl::_, T> >::type.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/filter.hpp>
 #include <boost/fusion/include/filter.hpp>
@@ -133,7 +288,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html b/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html
index 14e36e11..1625ab4a 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html
@@ -1,10 +1,18 @@
 
 
-
+
 filter_if
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of filter_if given the sequence
@@ -39,8 +72,33 @@
             Lambda Expression predicate type.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -52,8 +110,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.74. Parameter

 
+=======
+
Table 1.74. Parameter

+=======
+
Table 1.78. Parameter

+=======
+
Table 1.78. Parameter

+=======
+
Table 1.78. Parameter

+=======
+
Table 1.78. Parameter

+=======
+
Table 1.78. Parameter

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -99,18 +182,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::filter_if<Sequence, Pred>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence containing
             the elements of Sequence
@@ -118,15 +223,65 @@
             to boost::mpl::true_.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/filter_if.hpp>
 #include <boost/fusion/include/filter_if.hpp>
@@ -134,7 +289,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/insert.html b/doc/html/fusion/algorithm/transformation/metafunctions/insert.html
index 1eeffc70..936e491f 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/insert.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/insert.html
@@ -1,10 +1,18 @@
 
 
-
+
 insert
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of insert, given the sequence,
             position iterator and insertion types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -52,8 +110,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.85. Parameters

 
+=======
+
Table 1.85. Parameters

+=======
+
Table 1.89. Parameters

+=======
+
Table 1.89. Parameters

+=======
+
Table 1.89. Parameters

+=======
+
Table 1.89. Parameters

+=======
+
Table 1.89. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -111,18 +194,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::insert<Sequence, Position, T>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence with an
             element of type T inserted
@@ -130,15 +235,65 @@
             in Sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/insert.hpp>
 #include <boost/fusion/include/insert.hpp>
@@ -146,7 +301,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html b/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html
index 097c63eb..d237f371 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html
@@ -1,10 +1,18 @@
 
 
-
+
 insert_range
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of insert_range, given the input
             sequence, position iterator and insertion range types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -52,8 +110,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.86. Parameters

 
+=======
+
Table 1.86. Parameters

+=======
+
Table 1.90. Parameters

+=======
+
Table 1.90. Parameters

+=======
+
Table 1.90. Parameters

+=======
+
Table 1.90. Parameters

+=======
+
Table 1.90. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -113,18 +196,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::insert_range<Sequence, Position, Range>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence with the
             elements of Range inserted
@@ -132,15 +237,65 @@
             into Sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/insert_range.hpp>
 #include <boost/fusion/include/insert_range.hpp>
@@ -148,7 +303,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/join.html b/doc/html/fusion/algorithm/transformation/metafunctions/join.html
index 39d35ca8..04ece394 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/join.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/join.html
@@ -1,10 +1,18 @@
 
 
-
+
 join
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result of joining 2 sequences, given the sequence types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename LhSequence,
@@ -50,17 +108,59 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::join<LhSequence, RhSequence>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence containing
             the elements of LhSequence
@@ -68,15 +168,65 @@
             The order of the elements in the 2 sequences is preserved.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/join.hpp>
 #include <boost/fusion/include/join.hpp>
@@ -84,7 +234,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html b/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html
index 6ad86087..55059d1b 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html
@@ -1,10 +1,18 @@
 
 
-
+
 pop_back
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of pop_back, given the input sequence
             type.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -50,8 +108,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.87. Parameters

 
+=======
+
Table 1.87. Parameters

+=======
+
Table 1.91. Parameters

+=======
+
Table 1.91. Parameters

+=======
+
Table 1.91. Parameters

+=======
+
Table 1.91. Parameters

+=======
+
Table 1.91. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -83,41 +166,113 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::pop_back<Sequence>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence with all
             the elements of Sequence
             except the last element.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

-
#include <boost/fusion/algorithm/tranformation/pop_back.hpp>
+
#include <boost/fusion/algorithm/transformation/pop_back.hpp>
 #include <boost/fusion/include/pop_back.hpp>
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html b/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html
index 54d17335..b3b2f61a 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html
@@ -1,10 +1,18 @@
 
 
-
+
 pop_front
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of pop_front, given the input sequence
             type.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -50,8 +108,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.88. Parameters

 
+=======
+
Table 1.88. Parameters

+=======
+
Table 1.92. Parameters

+=======
+
Table 1.92. Parameters

+=======
+
Table 1.92. Parameters

+=======
+
Table 1.92. Parameters

+=======
+
Table 1.92. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -83,37 +166,88 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::pop_front<Sequence>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence with all
             the elements of Sequence
             except the first element.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

-

-            /algorithm/transformation/pop_front.hpp>
-          

+

+
+            Header
+          

+
#include <boost/fusion/algorithm/transformation/pop_front.hpp>
+#include <boost/fusion/include/pop_front.hpp>
+

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html b/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html
index e6038f04..16cc7532 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html
@@ -1,10 +1,18 @@
 
 
-
+
 push_back
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of push_back, given the types of
             the input sequence and element to push.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +109,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.89. Parameters

 
+=======
+
Table 1.89. Parameters

+=======
+
Table 1.93. Parameters

+=======
+
Table 1.93. Parameters

+=======
+
Table 1.93. Parameters

+=======
+
Table 1.93. Parameters

+=======
+
Table 1.93. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,18 +180,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::push_back<Sequence, T>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence with the
             elements of Sequence
@@ -116,19 +221,48 @@
             added to the end.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

-

-            /algorithm/transformation/push_back.hpp>
-          

+

+
+            Header
+          

+
#include <boost/fusion/algorithm/transformation/push_back.hpp>
+#include <boost/fusion/include/push_back.hpp>
+

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html b/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html
index bfa4c9a4..5a10ef69 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html
@@ -1,10 +1,18 @@
 
 
-
+
 push_front
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of push_front, given the types
             of the input sequence and element to push.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +109,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.90. Parameters

 
+=======
+
Table 1.90. Parameters

+=======
+
Table 1.94. Parameters

+=======
+
Table 1.94. Parameters

+=======
+
Table 1.94. Parameters

+=======
+
Table 1.94. Parameters

+=======
+
Table 1.94. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,18 +180,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::push_front<Sequence, T>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence with the
             elements of Sequence
@@ -116,19 +221,48 @@
             added to the beginning.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

-

-            /algorithm/transformation/push_front.hpp>
-          

+

+
+            Header
+          

+
#include <boost/fusion/algorithm/transformation/push_front.hpp>
+#include <boost/fusion/include/push_front.hpp>
+

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/remove.html b/doc/html/fusion/algorithm/transformation/metafunctions/remove.html
index ed429d68..e6530ea7 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/remove.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/remove.html
@@ -1,10 +1,18 @@
 
 
-
+
 remove
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of remove, given the sequence and
             removal types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +109,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.79. Parameters

 
+=======
+
Table 1.79. Parameters

+=======
+
Table 1.83. Parameters

+=======
+
Table 1.83. Parameters

+=======
+
Table 1.83. Parameters

+=======
+
Table 1.83. Parameters

+=======
+
Table 1.83. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,18 +180,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::remove<Sequence, T>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence containing
             the elements of Sequence
@@ -117,15 +222,65 @@
             boost::is_same<mpl::_, T> >::type.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/remove.hpp>
 #include <boost/fusion/include/remove.hpp>
@@ -133,7 +288,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html b/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html
index 81161922..e96d0bce 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html
@@ -1,10 +1,18 @@
 
 
-
+
 remove_if
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of remove_if, given the input sequence
@@ -39,8 +72,33 @@
             Lambda Expression predicate types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -52,8 +110,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.80. Parameters

 
+=======
+
Table 1.80. Parameters

+=======
+
Table 1.84. Parameters

+=======
+
Table 1.84. Parameters

+=======
+
Table 1.84. Parameters

+=======
+
Table 1.84. Parameters

+=======
+
Table 1.84. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -99,18 +182,40 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::remove_if<Sequence, Pred>::type
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence containing
             the elements of Sequence
@@ -118,15 +223,65 @@
             to boost::mpl::false_.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/remove_if.hpp>
 #include <boost/fusion/include/remove_if.hpp>
@@ -134,7 +289,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/replace.html b/doc/html/fusion/algorithm/transformation/metafunctions/replace.html
index 8318882a..cef78d29 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/replace.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/replace.html
@@ -1,10 +1,18 @@
 
 
-
+
 replace
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of replace, given the types of
             the input sequence and element to replace.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -51,8 +109,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.77. Parameters

 
+=======
+
Table 1.77. Parameters

+=======
+
Table 1.81. Parameters

+=======
+
Table 1.81. Parameters

+=======
+
Table 1.81. Parameters

+=======
+
Table 1.81. Parameters

+=======
+
Table 1.81. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,9 +180,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::replace<Sequence,T>::type
@@ -114,15 +203,65 @@
             replace.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/replace.hpp>
 #include <boost/fusion/include/replace.hpp>
@@ -130,7 +269,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html b/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html
index 082689a8..7278ad67 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html
@@ -1,10 +1,18 @@
 
 
-
+
 replace_if
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of replace_if, given the types
@@ -40,8 +73,33 @@
             Function Object predicate and replacement object.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -53,8 +111,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.78. Parameters

 
+=======
+
Table 1.78. Parameters

+=======
+
Table 1.82. Parameters

+=======
+
Table 1.82. Parameters

+=======
+
Table 1.82. Parameters

+=======
+
Table 1.82. Parameters

+=======
+
Table 1.82. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -112,9 +195,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::replace_if<Sequence,F,T>::type
@@ -129,15 +218,65 @@
             replace_if.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/replace_if.hpp>
 #include <boost/fusion/include/replace_if.hpp>
@@ -145,7 +284,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html b/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html
index dd237ca1..3e783b13 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html
@@ -1,10 +1,18 @@
 
 
-
+
 reverse
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of reverse, given the input sequence
             type.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -50,8 +108,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.81. Parameters

 
+=======
+
Table 1.81. Parameters

+=======
+
Table 1.85. Parameters

+=======
+
Table 1.85. Parameters

+=======
+
Table 1.85. Parameters

+=======
+
Table 1.85. Parameters

+=======
+
Table 1.85. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -83,32 +166,109 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::reverse<Sequence>::type
 

 

+<<<<<<< .working
             Return type: A model of Bidirectional
             Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a sequence with the
             elements in the reverse order to Sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/reverse.hpp>
 #include <boost/fusion/include/reverse.hpp>
@@ -116,7 +276,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/transform.html b/doc/html/fusion/algorithm/transformation/metafunctions/transform.html
index 5dd6e4ce..046b8b5c 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/transform.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/transform.html
@@ -1,10 +1,18 @@
 
 
-
+
 transform
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             For a sequence seq and
@@ -41,8 +74,33 @@
             of seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Unary
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Unary
+>>>>>>> .merge-right.r57125
             version synopsis
           

 
template<
@@ -53,8 +111,33 @@
     Sequence const& seq, F f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.75. Parameters

 
+=======
+
Table 1.75. Parameters

+=======
+
Table 1.79. Parameters

+=======
+
Table 1.79. Parameters

+=======
+
Table 1.79. Parameters

+=======
+
Table 1.79. Parameters

+=======
+
Table 1.79. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -102,26 +185,73 @@
 

 
 

 

 

+<<<<<<< .working
 

 
             Expression
+=======
+

+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
transform(seq, f);
 

 

+<<<<<<< .working
             Return type: A model of Forward
             Sequence
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           

+

 

             Semantics: Returns a new sequence, containing
             the return values of f(e) for each element e
             within seq.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Binary
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Binary
+>>>>>>> .merge-right.r57125
             version synopsis
           

 
template<
@@ -133,8 +263,33 @@
     Sequence1 const& seq1, Sequence2 const& seq2, F f);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.76. Parameters

 
+=======
+
Table 1.76. Parameters

+=======
+
Table 1.80. Parameters

+=======
+
Table 1.80. Parameters

+=======
+
Table 1.80. Parameters

+=======
+
Table 1.80. Parameters

+=======
+
Table 1.80. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -207,22 +362,97 @@
             within seq1 and seq2 respectively.
           

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

             Constant. Returns a view which is lazily evaluated.
           

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
#include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/fusion/include/transform.hpp>
 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
struct triple
 {
@@ -239,7 +469,7 @@
 
 

 
 

 
 
 
 
 
 

-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/zip.html b/doc/html/fusion/algorithm/transformation/metafunctions/zip.html
index 8ecd5532..15e113a8 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/zip.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/zip.html
@@ -1,10 +1,18 @@
 
 
-
+
 zip
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Zips sequences together to form a single sequence, whos members are tuples
             of the members of the component sequences.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence1,
@@ -53,8 +111,33 @@
 };
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::zip<Sequence1, Sequence2, ... SequenceN>::type
@@ -75,15 +158,65 @@
             'c'))
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Complexity
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Complexity
+>>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/include/zip.hpp>
@@ -91,7 +224,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/change_log.html b/doc/html/fusion/change_log.html
index 38a42e09..0bbafa8e 100644
--- a/doc/html/fusion/change_log.html
+++ b/doc/html/fusion/change_log.html
@@ -3,7 +3,11 @@
 
 Change log
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/container.html b/doc/html/fusion/container.html
index d8c2ac88..cf391ce5 100644
--- a/doc/html/fusion/container.html
+++ b/doc/html/fusion/container.html
@@ -3,7 +3,11 @@
 
 Container
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 Views.
       These containers are more or less counterparts of those in STL.
     

+<<<<<<< .working
 

 
       Header
     

+=======
+

+
+      Header
+    

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/container.hpp>
 #include <boost/fusion/include/container.hpp>
 

diff --git a/doc/html/fusion/container/cons.html b/doc/html/fusion/container/cons.html
index 1aa4dca7..cb736f0f 100644
--- a/doc/html/fusion/container/cons.html
+++ b/doc/html/fusion/container/cons.html
@@ -3,7 +3,11 @@
 
 cons
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 

 PrevUpHomeNext
 

+<<<<<<< .working
 

 

 

@@ -33,6 +38,16 @@
 
         Description
       

+=======
+

+

+cons
+

+

+
+        Description
+      

+>>>>>>> .merge-right.r57125
 

         cons is a simple Forward
@@ -45,24 +60,45 @@
         each element is peculiarly constant (see Recursive
         Inlined Functions).
       

+<<<<<<< .working
 

 
         Header
       

+=======
+

+
+        Header
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/container/list/cons.hpp>
 #include <boost/fusion/include/cons.hpp>
 

+<<<<<<< .working
 

 
         Synopsis
       

+=======
+

+
+        Synopsis
+      

+>>>>>>> .merge-right.r57125
 
template <typename Car, typename Cdr = nil>
 struct cons;
 

+<<<<<<< .working
 

 
         Template parameters
       

+=======
+

+
+        Template parameters
+      

+>>>>>>> .merge-right.r57125
 
@@ -104,6 +140,7 @@
 

 
 

 
 

+<<<<<<< .working
 

 
         Model of
@@ -111,6 +148,14 @@
 

 

+=======
+

+
+        Model of
+      

+

+

+>>>>>>> .merge-right.r57125
 
Notation

 

 
nil

@@ -146,10 +191,17 @@
           

 

 

+<<<<<<< .working
 

 
         Expression Semantics
       

+=======
+

+
+        Expression Semantics
+      

+>>>>>>> .merge-right.r57125
 

         Semantics of an expression is defined only where it differs from, or is not
         defined in Random
         Access Sequence requirement). The runtime complexity of at is constant (see Recursive
         Inlined Functions).
+<<<<<<< .working
       

 

 
         Example
       

+=======
+      

+

+

+
+        Example
+      

+>>>>>>> .merge-right.r57125
 
cons<int, cons<float> > l(12, cons<float>(5.5f));
 std::cout << at_c<0>(l) << std::endl;
 std::cout << at_c<1>(l) << std::endl;
diff --git a/doc/html/fusion/container/conversion.html b/doc/html/fusion/container/conversion.html
index 7222d05a..08bd23aa 100644
--- a/doc/html/fusion/container/conversion.html
+++ b/doc/html/fusion/container/conversion.html
@@ -3,7 +3,11 @@
 
 Conversion
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -37,10 +41,17 @@
         All fusion sequences can be converted to one of the Container
         types using one of these conversion functions.
       

+<<<<<<< .working
 

 
         Header
       

+=======
+

+
+        Header
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/include/convert.hpp>
 

 

diff --git a/doc/html/fusion/container/conversion/functions.html b/doc/html/fusion/container/conversion/functions.html
index b1a32164..5afe4a54 100644
--- a/doc/html/fusion/container/conversion/functions.html
+++ b/doc/html/fusion/container/conversion/functions.html
@@ -3,7 +3,11 @@
 
 Functions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/container/conversion/functions/as_list.html b/doc/html/fusion/container/conversion/functions/as_list.html
index 3fdc906c..ed08df99 100644
--- a/doc/html/fusion/container/conversion/functions/as_list.html
+++ b/doc/html/fusion/container/conversion/functions/as_list.html
@@ -1,10 +1,18 @@
 
 
-
+
 as_list
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Convert a fusion sequence to a list.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 typename result_of::as_list<Sequence>::type
@@ -49,8 +107,33 @@
 as_list(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -82,8 +165,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
as_list(seq);
@@ -96,22 +204,72 @@
             seq, to a list.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/list/convert.hpp>
 #include <boost/fusion/include/as_list.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
as_list(make_vector('x', 123, "hello"))
 

 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion/functions/as_map.html b/doc/html/fusion/container/conversion/functions/as_map.html
index 15fedca3..0dc1f7d1 100644
--- a/doc/html/fusion/container/conversion/functions/as_map.html
+++ b/doc/html/fusion/container/conversion/functions/as_map.html
@@ -1,10 +1,18 @@
 
 
-
+
 as_map
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Convert a fusion sequence to a map.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 typename result_of::as_map<Sequence>::type
@@ -49,8 +107,33 @@
 as_map(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -82,8 +165,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
as_map(seq);
@@ -101,15 +209,65 @@
             There may be no duplicate fusion::pair key types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/map/convert.hpp>
 #include <boost/fusion/include/as_map.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
as_map(make_vector(
     make_pair<int>('X')
@@ -118,7 +276,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion/functions/as_set.html b/doc/html/fusion/container/conversion/functions/as_set.html
index f4d7a457..f61353dd 100644
--- a/doc/html/fusion/container/conversion/functions/as_set.html
+++ b/doc/html/fusion/container/conversion/functions/as_set.html
@@ -1,10 +1,18 @@
 
 
-
+
 as_set
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Convert a fusion sequence to a set.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 typename result_of::as_set<Sequence>::type
@@ -49,8 +107,33 @@
 as_set(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -82,8 +165,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
as_set(seq);
@@ -100,22 +208,72 @@
             key types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/set/convert.hpp>
 #include <boost/fusion/include/as_set.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
as_set(make_vector('x', 123, "hello"))
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion/functions/as_vector.html b/doc/html/fusion/container/conversion/functions/as_vector.html
index a19aacdd..5e8b4337 100644
--- a/doc/html/fusion/container/conversion/functions/as_vector.html
+++ b/doc/html/fusion/container/conversion/functions/as_vector.html
@@ -1,10 +1,18 @@
 
 
-
+
 as_vector
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Convert a fusion sequence to a vector.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 typename result_of::as_vector<Sequence>::type
@@ -49,8 +107,33 @@
 as_vector(Sequence const& seq);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -82,8 +165,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
as_vector(seq);
@@ -96,22 +204,72 @@
             seq, to a vector.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/include/as_vector.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
as_vector(make_list('x', 123, "hello"))
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion/metafunctions.html b/doc/html/fusion/container/conversion/metafunctions.html
index 6eaabfae..b84fca8b 100644
--- a/doc/html/fusion/container/conversion/metafunctions.html
+++ b/doc/html/fusion/container/conversion/metafunctions.html
@@ -3,7 +3,11 @@
 
 Metafunctions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/container/conversion/metafunctions/as_list.html b/doc/html/fusion/container/conversion/metafunctions/as_list.html
index 2db0e8cb..49e1d2e5 100644
--- a/doc/html/fusion/container/conversion/metafunctions/as_list.html
+++ b/doc/html/fusion/container/conversion/metafunctions/as_list.html
@@ -1,10 +1,18 @@
 
 
-
+
 as_list
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,22 +38,97 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of as_list.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 struct as_list;
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -77,8 +160,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::as_list<Sequence>::type;
@@ -92,22 +200,72 @@
             Sequence, to a list.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/list/convert.hpp>
 #include <boost/fusion/include/as_list.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::as_list<vector<char, int> >::type
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion/metafunctions/as_map.html b/doc/html/fusion/container/conversion/metafunctions/as_map.html
index b168c366..c970c492 100644
--- a/doc/html/fusion/container/conversion/metafunctions/as_map.html
+++ b/doc/html/fusion/container/conversion/metafunctions/as_map.html
@@ -1,10 +1,18 @@
 
 
-
+
 as_map
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,22 +38,97 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of as_map.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 struct as_map;
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -77,8 +160,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::as_map<Sequence>::type;
@@ -97,15 +205,65 @@
             There may be no duplicate fusion::pair key types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/map/convert.hpp>
 #include <boost/fusion/include/as_map.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::as_map<vector<
     fusion::pair<int, char>
@@ -114,7 +272,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion/metafunctions/as_set.html b/doc/html/fusion/container/conversion/metafunctions/as_set.html
index d379dd06..feb69a36 100644
--- a/doc/html/fusion/container/conversion/metafunctions/as_set.html
+++ b/doc/html/fusion/container/conversion/metafunctions/as_set.html
@@ -1,10 +1,18 @@
 
 
-
+
 as_set
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,22 +38,97 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of as_set.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 struct as_set;
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -77,8 +160,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::as_set<Sequence>::type;
@@ -96,22 +204,72 @@
             key types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/set/convert.hpp>
 #include <boost/fusion/include/as_set.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::as_set<vector<char, int> >::type
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion/metafunctions/as_vector.html b/doc/html/fusion/container/conversion/metafunctions/as_vector.html
index 44bba097..a8f74e32 100644
--- a/doc/html/fusion/container/conversion/metafunctions/as_vector.html
+++ b/doc/html/fusion/container/conversion/metafunctions/as_vector.html
@@ -1,10 +1,18 @@
 
 
-
+
 as_vector
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,22 +38,97 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of as_vector.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 struct as_vector;
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -77,8 +160,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::as_vector<Sequence>::type;
@@ -92,22 +200,72 @@
             Sequence, to a vector.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/include/as_vector.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::as_vector<list<char, int> >::type
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation.html b/doc/html/fusion/container/generation.html
index 6fc3eb44..f25ad9a0 100644
--- a/doc/html/fusion/container/generation.html
+++ b/doc/html/fusion/container/generation.html
@@ -3,7 +3,11 @@
 
 Generation
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -36,10 +40,17 @@
 

         These are the functions that you can use to generate various forms of Container from elemental values.
       

+<<<<<<< .working
 

 
         Header
       

+=======
+

+
+        Header
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/container/generation.hpp>
 #include <boost/fusion/include/generation.hpp>
 

diff --git a/doc/html/fusion/container/generation/functions.html b/doc/html/fusion/container/generation/functions.html
index 4a7cabfa..6ad5185d 100644
--- a/doc/html/fusion/container/generation/functions.html
+++ b/doc/html/fusion/container/generation/functions.html
@@ -3,7 +3,11 @@
 
 Functions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/container/generation/functions/list_tie.html b/doc/html/fusion/container/generation/functions/list_tie.html
index 0aa819b0..cb6fe5f3 100644
--- a/doc/html/fusion/container/generation/functions/list_tie.html
+++ b/doc/html/fusion/container/generation/functions/list_tie.html
@@ -1,10 +1,18 @@
 
 
-
+
 list_tie
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Constructs a tie using a list sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
 list<T0&, T1&,... TN&>
@@ -55,8 +113,33 @@
 
#define FUSION_MAX_LIST_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -90,8 +173,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
list_tie(x0, x1,... xN);
@@ -104,15 +212,65 @@
             Semantics: Create a list of references from x0, x1,... xN.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/list_tie.hpp>
 #include <boost/fusion/include/list_tie.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
int i = 123;
 double d = 123.456;
@@ -121,7 +279,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/functions/make_cons.html b/doc/html/fusion/container/generation/functions/make_cons.html
index ae74290b..64e72ad2 100644
--- a/doc/html/fusion/container/generation/functions/make_cons.html
+++ b/doc/html/fusion/container/generation/functions/make_cons.html
@@ -1,10 +1,18 @@
 
 
-
+
 make_cons
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Create a cons
@@ -39,8 +72,33 @@
             and optional cdr (tail).
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename Car>
 typename result_of::make_cons<Car>::type
@@ -51,8 +109,33 @@
 make_cons(Car const& car, Cdr const& cdr);
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -97,8 +180,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
make_cons(car, cdr);
@@ -112,21 +220,96 @@
             (tail).
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_cons.hpp>
 #include <boost/fusion/include/make_cons.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
make_cons('x', make_cons(123))
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           

 

@@ -135,7 +318,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/functions/make_list.html b/doc/html/fusion/container/generation/functions/make_list.html
index 789da723..47c6877a 100644
--- a/doc/html/fusion/container/generation/functions/make_list.html
+++ b/doc/html/fusion/container/generation/functions/make_list.html
@@ -1,10 +1,18 @@
 
 
-
+
 make_list
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Create a list
             from one or more values.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
 typename result_of::make_list<T0, T1,... TN>::type
@@ -56,8 +114,33 @@
 
#define FUSION_MAX_LIST_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -91,8 +174,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
make_list(x0, x1,... xN);
@@ -104,21 +212,96 @@
             Semantics: Create a list from x0, x1,... xN.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_list.hpp>
 #include <boost/fusion/include/make_list.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
make_list(123, "hello", 12.5)
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           

 

@@ -127,7 +310,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/functions/make_map.html b/doc/html/fusion/container/generation/functions/make_map.html
index 22398ac3..1ba0fb21 100644
--- a/doc/html/fusion/container/generation/functions/make_map.html
+++ b/doc/html/fusion/container/generation/functions/make_map.html
@@ -1,10 +1,18 @@
 
 
-
+
 make_map
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Create a map
             from one or more key/data pairs.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <
     typename K0, typename K1,... typename KN
@@ -58,8 +116,33 @@
 
#define FUSION_MAX_MAP_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -108,8 +191,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
make_map<K0, K1,... KN>(x0, x1,... xN);
@@ -128,21 +236,96 @@
             key types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_map.hpp>
 #include <boost/fusion/include/make_map.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
make_map<int, double>('X', "Men")
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           

 

@@ -152,7 +335,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/functions/make_set.html b/doc/html/fusion/container/generation/functions/make_set.html
index 8dbb429a..ed55751d 100644
--- a/doc/html/fusion/container/generation/functions/make_set.html
+++ b/doc/html/fusion/container/generation/functions/make_set.html
@@ -1,10 +1,18 @@
 
 
-
+
 make_set
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Create a set
             from one or more values.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
 typename result_of::make_set<T0, T1,... TN>::type
@@ -56,8 +114,33 @@
 
#define FUSION_MAX_SET_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -91,8 +174,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
make_set(x0, x1,... xN);
@@ -108,21 +216,96 @@
             key types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_set.hpp>
 #include <boost/fusion/include/make_set.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
make_set(123, "hello", 12.5)
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           

 

@@ -131,7 +314,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/functions/make_vector.html b/doc/html/fusion/container/generation/functions/make_vector.html
index f8940179..21107ae1 100644
--- a/doc/html/fusion/container/generation/functions/make_vector.html
+++ b/doc/html/fusion/container/generation/functions/make_vector.html
@@ -1,10 +1,18 @@
 
 
-
+
 make_vector
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,16 +38,66 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Create a vector
             from one or more values.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
 typename result_of::make_vector<T0, T1,... TN>::type
@@ -56,8 +114,33 @@
 
#define FUSION_MAX_VECTOR_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -91,8 +174,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
make_vector(x0, x1,... xN);
@@ -104,21 +212,96 @@
             Semantics: Create a vector from x0, x1,... xN.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/include/make_vector.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
make_vector(123, "hello", 12.5)
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           

 

@@ -127,7 +310,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/functions/map_tie.html b/doc/html/fusion/container/generation/functions/map_tie.html
index 5fe8f65e..4be441af 100644
--- a/doc/html/fusion/container/generation/functions/map_tie.html
+++ b/doc/html/fusion/container/generation/functions/map_tie.html
@@ -1,10 +1,18 @@
 
 
-
+
 map_tie
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Constructs a tie using a map sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename K0, typename K1,... typename KN, typename D0, typename D1,... typename DN>
 map<pair<K0, D0&>, pair<K1, D1&>,... pair<KN, DN&> >
@@ -55,8 +113,33 @@
 
#define FUSION_MAX_MAP_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -106,8 +189,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
map_tie<K0, K1,... KN>(x0, x1,... xN);
@@ -121,15 +229,65 @@
             Semantics: Create a map of references from x0, x1,... xN with keys K0, K1,... KN
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/map_tie.hpp>
 #include <boost/fusion/include/map_tie.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
struct int_key;
 struct double_key;
@@ -141,7 +299,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/functions/tiers.html b/doc/html/fusion/container/generation/functions/tiers.html
index 510286fd..ca7f80bf 100644
--- a/doc/html/fusion/container/generation/functions/tiers.html
+++ b/doc/html/fusion/container/generation/functions/tiers.html
@@ -1,10 +1,18 @@
 
 
-
+
 Tiers
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -48,11 +56,19 @@
 vector_tie(i, c, a);
 
 

+<<<<<<< .working
             The vector_tie function creates
             a vector
             of type vector<int&, char&, double&>. The same result could be achieved
             with the call make_vector(ref(i), ref(c), ref(a))
             [9]
+=======
+            The vector_tie function creates
+            a vector
+            of type vector<int&, char&, double&>. The same result could be achieved
+            with the call make_vector(ref(i), ref(c), ref(a))
+            [9]
+>>>>>>> .merge-right.r57125
             .
           

 

@@ -69,8 +85,33 @@
             when calling functions which return sequences.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Ignore
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Ignore
+>>>>>>> .merge-right.r57125
           

 

             There is also an object called ignore which allows
@@ -83,7 +124,31 @@
 
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
[9] 
+=======
+
[9] 
+=======
+
[9] 
+=======
+
[9] 
+=======
+
[9] 
+=======
+
[9] 
+=======
+
[9] 
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
                 see Boost.Ref
                 for details about ref
               

@@ -91,7 +156,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/functions/vector_tie.html b/doc/html/fusion/container/generation/functions/vector_tie.html
index 6b91066c..4de3fccb 100644
--- a/doc/html/fusion/container/generation/functions/vector_tie.html
+++ b/doc/html/fusion/container/generation/functions/vector_tie.html
@@ -1,10 +1,18 @@
 
 
-
+
 vector_tie
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Constructs a tie using a vector sequence.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
 vector<T0&, T1&,... TN&>
@@ -55,8 +113,33 @@
 
#define FUSION_MAX_VECTOR_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -90,8 +173,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
vector_tie(x0, x1,... xN);
@@ -104,15 +212,65 @@
             Semantics: Create a vector of references from x0, x1,... xN.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/vector_tie.hpp>
 #include <boost/fusion/include/vector_tie.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
int i = 123;
 double d = 123.456;
@@ -121,7 +279,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/metafunctions.html b/doc/html/fusion/container/generation/metafunctions.html
index 07cf1cd7..19bc38b7 100644
--- a/doc/html/fusion/container/generation/metafunctions.html
+++ b/doc/html/fusion/container/generation/metafunctions.html
@@ -3,7 +3,11 @@
 
 MetaFunctions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/container/generation/metafunctions/list_tie.html b/doc/html/fusion/container/generation/metafunctions/list_tie.html
index 6e66cc72..d5008589 100644
--- a/doc/html/fusion/container/generation/metafunctions/list_tie.html
+++ b/doc/html/fusion/container/generation/metafunctions/list_tie.html
@@ -1,10 +1,18 @@
 
 
-
+
 list_tie
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of list_tie.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
 struct list_tie;
@@ -54,8 +112,33 @@
 
#define FUSION_MAX_LIST_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -89,8 +172,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::list_tie<T0, T1,... TN>::type;
@@ -103,22 +211,72 @@
             Semantics: Create a list of references from T0, T1,... TN.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/list_tie.hpp>
 #include <boost/fusion/include/list_tie.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::list_tie<int, double>::type
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/metafunctions/make_cons.html b/doc/html/fusion/container/generation/metafunctions/make_cons.html
index 7bb6a9e4..e89e7a20 100644
--- a/doc/html/fusion/container/generation/metafunctions/make_cons.html
+++ b/doc/html/fusion/container/generation/metafunctions/make_cons.html
@@ -1,10 +1,18 @@
 
 
-
+
 make_cons
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,22 +38,97 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of make_cons.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename Car, typename Cdr = nil>
 struct make_cons;
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -90,8 +173,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::make_cons<Car, Cdr>::type
@@ -107,22 +215,72 @@
             (tail).
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_cons.hpp>
 #include <boost/fusion/include/make_cons.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::make_cons<char, result_of::make_cons<int>::type>::type
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/metafunctions/make_list.html b/doc/html/fusion/container/generation/metafunctions/make_list.html
index 76de4c11..a00f6bc3 100644
--- a/doc/html/fusion/container/generation/metafunctions/make_list.html
+++ b/doc/html/fusion/container/generation/metafunctions/make_list.html
@@ -1,10 +1,18 @@
 
 
-
+
 make_list
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of make_list.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
 struct make_list;
@@ -54,8 +112,33 @@
 
#define FUSION_MAX_LIST_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -89,8 +172,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::make_list<T0, T1,... TN>::type
@@ -104,22 +212,72 @@
             Semantics: Create a list from T0, T1,... TN.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_list.hpp>
 #include <boost/fusion/include/make_list.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::make_list<int, const char(&)[7], double>::type
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/metafunctions/make_map.html b/doc/html/fusion/container/generation/metafunctions/make_map.html
index 6486dce0..e83a925d 100644
--- a/doc/html/fusion/container/generation/metafunctions/make_map.html
+++ b/doc/html/fusion/container/generation/metafunctions/make_map.html
@@ -1,10 +1,18 @@
 
 
-
+
 make_map
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of make_map.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <
     typename K0, typename K1,... typename KN
@@ -56,8 +114,33 @@
 
#define FUSION_MAX_MAP_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -106,8 +189,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
resulf_of::make_map<K0, K1,... KN, T0, T1,... TN>::type;
@@ -125,21 +233,96 @@
             key types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_map.hpp>
 #include <boost/fusion/include/make_map.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::make_map<int, double, char, double>::type
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           

 

@@ -148,7 +331,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/metafunctions/make_set.html b/doc/html/fusion/container/generation/metafunctions/make_set.html
index 14956495..d6f35c5a 100644
--- a/doc/html/fusion/container/generation/metafunctions/make_set.html
+++ b/doc/html/fusion/container/generation/metafunctions/make_set.html
@@ -1,10 +1,18 @@
 
 
-
+
 make_set
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of make_set.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
 struct make_set;
@@ -54,8 +112,33 @@
 
#define FUSION_MAX_SET_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -89,8 +172,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::make_set<T0, T1,... TN>::type
@@ -108,22 +216,72 @@
             key types.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_set.hpp>
 #include <boost/fusion/include/make_set.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::make_set<int, char, double>::type
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/metafunctions/make_vector.html b/doc/html/fusion/container/generation/metafunctions/make_vector.html
index c2a4316e..6efddfbd 100644
--- a/doc/html/fusion/container/generation/metafunctions/make_vector.html
+++ b/doc/html/fusion/container/generation/metafunctions/make_vector.html
@@ -1,10 +1,18 @@
 
 
-
+
 make_vector
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of make_vector.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
 struct make_vector;
@@ -54,8 +112,33 @@
 
#define FUSION_MAX_VECTOR_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -89,8 +172,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::make_vector<T0, T1,... TN>::type
@@ -104,22 +212,72 @@
             Semantics: Create a vector from T0, T1,... TN.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_list.hpp>
 #include <boost/fusion/include/make_list.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::make_vector<int, const char(&)[7], double>::type
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/metafunctions/map_tie.html b/doc/html/fusion/container/generation/metafunctions/map_tie.html
index e2ca97cc..d19d4517 100644
--- a/doc/html/fusion/container/generation/metafunctions/map_tie.html
+++ b/doc/html/fusion/container/generation/metafunctions/map_tie.html
@@ -1,10 +1,18 @@
 
 
-
+
 map_tie
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of map_tie.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename K0, typename K1,... typename KN, typename D0, typename D1,... typename DN>
 struct map_tie;
@@ -54,8 +112,33 @@
 
#define FUSION_MAX_MAP_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -104,8 +187,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::map_tie<K0, K1,... KN, D0, D1,... DN>::type;
@@ -119,15 +227,65 @@
             Semantics: Create a map of references from D0, D1,... DN with keys K0, K1,... KN
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/map_tie.hpp>
 #include <boost/fusion/include/map_tie.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
struct int_key;
 struct double_key;
@@ -137,7 +295,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/metafunctions/vector_tie.html b/doc/html/fusion/container/generation/metafunctions/vector_tie.html
index 30fa40f4..c0fd9e0f 100644
--- a/doc/html/fusion/container/generation/metafunctions/vector_tie.html
+++ b/doc/html/fusion/container/generation/metafunctions/vector_tie.html
@@ -1,10 +1,18 @@
 
 
-
+
 vector_tie
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           

 

             Returns the result type of vector_tie.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
 struct vector_tie;
@@ -54,8 +112,33 @@
 
#define FUSION_MAX_VECTOR_SIZE 20
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           

 
@@ -89,8 +172,33 @@
 

 

 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::vector_tie<T0, T1,... TN>::type;
@@ -103,22 +211,72 @@
             Semantics: Create a vector of references from T0, T1,... TN.
           

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/vector_tie.hpp>
 #include <boost/fusion/include/vector_tie.hpp>
 

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           

 
result_of::vector_tie<int, double>::type
 

 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/list.html b/doc/html/fusion/container/list.html
index 1d61443f..9d03d440 100644
--- a/doc/html/fusion/container/list.html
+++ b/doc/html/fusion/container/list.html
@@ -3,7 +3,11 @@
 
 list
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 

 PrevUpHomeNext
 

+<<<<<<< .working
 

 

 

@@ -33,6 +38,16 @@
 
         Description
       

+=======
+

+

+list
+

+

+
+        Description
+      

+>>>>>>> .merge-right.r57125
 

         list is a Forward
@@ -41,19 +56,33 @@
         when the target sequence is constructed piecemeal (a data at a time). The
         runtime cost of access to each element is peculiarly constant (see Recursive Inlined Functions).
       

+<<<<<<< .working
 

 
         Header
       

+=======
+

+
+        Header
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/container/list.hpp>
 #include <boost/fusion/include/list.hpp>
 #include <boost/fusion/container/list/list_fwd.hpp>
 #include <boost/fusion/include/list_fwd.hpp>
 

+<<<<<<< .working
 

 
         Synopsis
       

+=======
+

+
+        Synopsis
+      

+>>>>>>> .merge-right.r57125
 
template <
     typename T0 = unspecified
   , typename T1 = unspecified
@@ -78,10 +107,17 @@
       

 
#define FUSION_MAX_LIST_SIZE 20
 

+<<<<<<< .working
 

 
         Template parameters
       

+=======
+

+
+        Template parameters
+      

+>>>>>>> .merge-right.r57125
 
@@ -111,6 +147,7 @@
               

 
 

 
 

+<<<<<<< .working
 

 
         Model of
@@ -118,6 +155,14 @@
 

 

+=======
+

+
+        Model of
+      

+

+

+>>>>>>> .merge-right.r57125
 
Notation

 

 
L

@@ -144,10 +189,17 @@
           

 

 

+<<<<<<< .working
 

 
         Expression Semantics
       

+=======
+

+
+        Expression Semantics
+      

+>>>>>>> .merge-right.r57125
 

         Semantics of an expression is defined only where it differs from, or is not
         defined in Random
         Access Sequence requirement). The runtime complexity of at is constant (see Recursive
         Inlined Functions).
+<<<<<<< .working
       

 

 
         Example
       

+=======
+      

+

+

+
+        Example
+      

+>>>>>>> .merge-right.r57125
 
list<int, float> l(12, 5.5f);
 std::cout << at_c<0>(l) << std::endl;
 std::cout << at_c<1>(l) << std::endl;
diff --git a/doc/html/fusion/container/map.html b/doc/html/fusion/container/map.html
index e10e1901..ac870355 100644
--- a/doc/html/fusion/container/map.html
+++ b/doc/html/fusion/container/map.html
@@ -3,7 +3,11 @@
 
 map
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 

 PrevUpHomeNext
 

+<<<<<<< .working
 

 

 

@@ -33,6 +38,16 @@
 
         Description
       

+=======
+

+

+map
+

+

+
+        Description
+      

+>>>>>>> .merge-right.r57125
 

         map is an Associative
@@ -43,19 +58,33 @@
         key. Membership testing and element key lookup has constant runtime complexity
         (see Overloaded Functions).
       

+<<<<<<< .working
 

 
         Header
       

+=======
+

+
+        Header
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/container/map.hpp>
 #include <boost/fusion/include/map.hpp>
 #include <boost/fusion/container/map_fwd.hpp>
 #include <boost/fusion/include/map_fwd.hpp>
 

+<<<<<<< .working
 

 
         Synopsis
       

+=======
+

+
+        Synopsis
+      

+>>>>>>> .merge-right.r57125
 
template <
     typename T0 = unspecified
   , typename T1 = unspecified
@@ -80,10 +109,17 @@
       

 
#define FUSION_MAX_MAP_SIZE 20
 

+<<<<<<< .working
 

 
         Template parameters
       

+=======
+

+
+        Template parameters
+      

+>>>>>>> .merge-right.r57125
 
@@ -113,6 +149,7 @@
               

 
 

 
 

+<<<<<<< .working
 

 
         Model of
@@ -120,6 +157,14 @@
 

 

           Although there is a fair amount of left to do to produce a fully fledged
+<<<<<<< .working
           Fusion sequence, value_of and deref illustrate all the signficant
           concepts required. The remainder of the process is very repetitive, simply
           requiring implementation of a suitable xxxx_impl
           for each feature xxxx.
+=======
+          Fusion sequence, __valueof_ and
+          deref
+          illustrate all the signficant concepts required. The remainder of the process
+          is very repetitive, simply requiring implementation of a suitable xxxx_impl for each feature xxxx.
+>>>>>>> .merge-right.r57242
         

 

+<<<<<<< .working
 

 
         Implementing
+=======
+

+
+        Implementing
+>>>>>>> .merge-right.r57125
         the remaining iterator functionality
       

 

+<<<<<<< .working
         Ok, now we have seen the way value_of and deref work, everything else will
         work in pretty much the same way. Lets start with forward iteration, by providing
         a next_impl:
+=======
+        Ok, now we have seen the way __valueof_
+        and deref
+        work, everything else will work in pretty much the same way. Lets start with
+        forward iteration, by providing a next_impl:
+>>>>>>> .merge-right.r57242
       

 
template<>
 struct next_impl<example::example_struct_iterator_tag>
@@ -379,9 +454,15 @@
         advance_impl, distance_impl and equal_to_impl
         are provided in the example code.
       

+<<<<<<< .working
 

 
         Implementing
+=======
+

+
+        Implementing
+>>>>>>> .merge-right.r57125
         the intrinsic functions of the sequence
       

 

@@ -436,9 +517,15 @@
         Access Sequence we will also need to implement size_impl,
         value_at_impl and at_impl.
       

+<<<<<<< .working
 

 
         Enabling
+=======
+

+
+        Enabling
+>>>>>>> .merge-right.r57125
         our type as an associative container
       

 

@@ -503,10 +590,17 @@
         straightforward, and are provided in the example code, along with an implementation
         of is_associative_impl.
       

+<<<<<<< .working
 

 
         Summary
       

+=======
+

+
+        Summary
+      

+>>>>>>> .merge-right.r57125
 

         We've now worked through the entire process for adding a new random access
         sequence and we've also enabled our type to serve as an associative container.
@@ -521,7 +615,7 @@
 
 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/extension/iterator_facade.html b/doc/html/fusion/extension/iterator_facade.html
index 10320142..4148762d 100644
--- a/doc/html/fusion/extension/iterator_facade.html
+++ b/doc/html/fusion/extension/iterator_facade.html
@@ -1,10 +1,18 @@
 
 
-
+
 Iterator Facade
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 

 PrevUpHomeNext
 

+<<<<<<< .working
 

 

 

@@ -33,22 +42,46 @@
 
         Description
       

+=======
+

+

+

+
+        Description
+      

+>>>>>>> .merge-right.r57125
 

         The iterator_facade
         template provides an intrusive mechanism for producing a conforming Fusion
         iterator.
       

+<<<<<<< .working
 

 
         Synopsis
       

+=======
+

+
+        Synopsis
+      

+>>>>>>> .merge-right.r57125
 
template<typename Derived, typename TravesalTag>
 struct iterator_facade;
 

+<<<<<<< .working
 

 
         Usage
       

+=======
+

+
+        Usage
+      

+>>>>>>> .merge-right.r57125
 

         The user of iterator_facade derives his iterator type from a specialization
         of iterator_facade and passes the derived iterator type as the first template
@@ -60,8 +93,33 @@
         type.
       

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.93. Parameters

 
+=======
+
Table 1.93. Parameters

+=======
+
Table 1.97. Parameters

+=======
+
Table 1.97. Parameters

+=======
+
Table 1.97. Parameters

+=======
+
Table 1.97. Parameters

+=======
+
Table 1.97. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -96,9 +154,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
Table 1.94. Key Expressions

 
+=======
+

+
Table 1.98. Key Expressions

+

+>>>>>>> .merge-right.r57125
 @@ -268,20 +332,104 @@
               boost::same_type<It1, It2>::type()

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 
 

             
 

+            

+              iterator::template key_of<It>::type
+            

+            		
+            

+              The key type associated with the element from It
+            

+            		
+            

+              None
+            

+            

+            

+              iterator::template value_of_data<It>::type
+            

+            		
+            

+              The type of the data property associated with the element from It
+            

+            		
+            

+              None
+            

+            

+            

+              iterator::template deref_data<It>::type
+            

+            		
+            

+              The type that will be returned by dereferencing the data property of
+              the element from It
+            

+            		
+            

+              None
+            

+            

+            

+              iterator::template deref_data<It>::call(it)
+            

+            		
+            

+              Deferences the data property associated with the element referenced
+              by it
+            

+            		
+            

+              None
+            

+            

 
 

 

+<<<<<<< .working
 

 
         Header
       

+=======
+

+
+        Header
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/iterator/iterator_facade.hpp>
 #include <boost/fusion/include/iterator_facade.hpp>
 

+<<<<<<< .working
 

 
         Example
       

+=======
+

+
+        Example
+      

+>>>>>>> .merge-right.r57125
 

         A full working example using iterator_facade is provided in triple.cpp
         in the extension examples.
@@ -289,7 +437,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/extension/sequence_facade.html b/doc/html/fusion/extension/sequence_facade.html
index 753df321..5ff358a2 100644
--- a/doc/html/fusion/extension/sequence_facade.html
+++ b/doc/html/fusion/extension/sequence_facade.html
@@ -1,10 +1,18 @@
 
 
-
+
 Sequence Facade
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 

 PrevUpHomeNext
 

+<<<<<<< .working
 

 

 

@@ -33,22 +42,46 @@
 
         Description
       

+=======
+

+

+

+
+        Description
+      

+>>>>>>> .merge-right.r57125
 

         The sequence_facade
         template provides an intrusive mechanism for producing a conforming Fusion
         iterator.
       

+<<<<<<< .working
 

 
         Synopsis
       

+=======
+

+
+        Synopsis
+      

+>>>>>>> .merge-right.r57125
 
template<typename Derived, typename TravesalTag, typename IsView = mpl::false_>
 struct sequence_facade;
 

+<<<<<<< .working
 

 
         Usage
       

+=======
+

+
+        Usage
+      

+>>>>>>> .merge-right.r57125
 

         The user of sequence_facade derives his sequence
         type from a specialization of sequence_facade and passes the derived
@@ -62,8 +95,33 @@
         type.
       

 

+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
Table 1.91. Parameters

 
+=======
+
Table 1.91. Parameters

+=======
+
Table 1.95. Parameters

+=======
+
Table 1.95. Parameters

+=======
+
Table 1.95. Parameters

+=======
+
Table 1.95. Parameters

+=======
+
Table 1.95. Parameters

+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+

+>>>>>>> .merge-right.r57125
 @@ -97,9 +155,15 @@
 

 
 

 

 

+<<<<<<< .working
 

 
Table 1.92. Key Expressions

 
+=======
+

+
Table 1.96. Key Expressions

+

+>>>>>>> .merge-right.r57125
 @@ -193,17 +257,31 @@
 

 
 

 

 

+<<<<<<< .working
 

 
         Include
       

+=======
+

+
+        Include
+      

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/sequence/sequence_facade.hpp>
 #include <boost/fusion/include/sequence_facade.hpp>
 

+<<<<<<< .working
 

 
         Example
       

+=======
+

+
+        Example
+      

+>>>>>>> .merge-right.r57125
 

         A full working example using sequence_facade is provided in triple.cpp
         in the extension examples.
@@ -211,7 +289,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/functional.html b/doc/html/fusion/functional.html
index 2ed0930b..772c7964 100644
--- a/doc/html/fusion/functional.html
+++ b/doc/html/fusion/functional.html
@@ -3,7 +3,11 @@
 
 Functional
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -65,15 +69,28 @@
       Components to call functions and function objects and to make Fusion code callable
       through a function object interface.
     

+<<<<<<< .working
 

 
       Header
     

+=======
+

+
+      Header
+    

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/functional.hpp>
 

+<<<<<<< .working
 

 
       Fused and unfused
+=======
+

+
+      Fused and unfused
+>>>>>>> .merge-right.r57125
       forms
     

 

@@ -105,9 +122,15 @@
       f is the unfused
       form of f'.
     

+<<<<<<< .working
 

 
       Calling
+=======
+

+
+      Calling
+>>>>>>> .merge-right.r57125
       functions and function objects
     

 

@@ -136,9 +159,15 @@
 

       Constructors can be called applying Boost.Functional/Factory.
     

+<<<<<<< .working
 

 
       Making
+=======
+

+
+      Making
+>>>>>>> .merge-right.r57125
       Fusion code callable through a function object interface
     

 

diff --git a/doc/html/fusion/functional/adapters.html b/doc/html/fusion/functional/adapters.html
index c6fb7deb..d3bd3a52 100644
--- a/doc/html/fusion/functional/adapters.html
+++ b/doc/html/fusion/functional/adapters.html
@@ -3,7 +3,11 @@
 
  Adapters
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/functional/adapters/fused.html b/doc/html/fusion/functional/adapters/fused.html
index 2f968aae..655043ef 100644
--- a/doc/html/fusion/functional/adapters/fused.html
+++ b/doc/html/fusion/functional/adapters/fused.html
@@ -3,7 +3,11 @@
 
 fused
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 

 PrevUpHomeNext
 

+<<<<<<< .working
 

 

 

@@ -33,6 +38,16 @@
 
           Description
         

+=======
+

+

+fused
+

+

+
+          Description
+        

+>>>>>>> .merge-right.r57125
 

           An unary Polymorphic Function
@@ -59,22 +74,42 @@
           be defined (Boost provides this function for std::auto_ptr
           and boost::shared_ptr).
         

+<<<<<<< .working
 

 
           Header
         

+=======
+

+
+          Header
+        

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/functional/adapter/fused.hpp>
 

+<<<<<<< .working
 

 
           Synopsis
         

+=======
+

+
+          Synopsis
+        

+>>>>>>> .merge-right.r57125
 
template <typename Function>
 class fused;
 

+<<<<<<< .working
 

 
           Template
+=======
+

+
+          Template
+>>>>>>> .merge-right.r57125
           parameters
         

 

@@ -107,6 +142,7 @@
                 

 
 

+<<<<<<< .working
 

 
           Model of
@@ -114,6 +150,14 @@
 

 
diff --git a/doc/html/fusion/functional/adapters/fused_function_object.html b/doc/html/fusion/functional/adapters/fused_function_object.html
index 98afc11a..58b81e49 100644
--- a/doc/html/fusion/functional/adapters/fused_function_object.html
+++ b/doc/html/fusion/functional/adapters/fused_function_object.html
@@ -3,7 +3,11 @@
 fused_function_object
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
@@ -22,6 +26,7 @@
 

 PrevUpHomeNext
 

+<<<<<<< .working
 

 

 

@@ -33,6 +38,16 @@
 
           Description
         

+=======
+

+

+

+
+          Description
+        

+>>>>>>> .merge-right.r57125
 

           An unary Polymorphic Function
@@ -49,22 +64,42 @@
           for an target function object that is const or, if the target function
           object is held by value, the adapter is const).
         

+<<<<<<< .working
 

 
           Header
         

+=======
+

+
+          Header
+        

+>>>>>>> .merge-right.r57125
 
#include <boost/fusion/functional/adapter/fused_function_object.hpp>
 

+<<<<<<< .working
 

 
           Synopsis
         

+=======
+

+
+          Synopsis
+        

+>>>>>>> .merge-right.r57125
 
template <class Function>
 class fused_function_object;
 

+<<<<<<< .working
 

 
           Template
+=======
+

+
+          Template
+>>>>>>> .merge-right.r57125
           parameters
         

 

 
 
 
 

@@ -97,9 +132,15 @@
                 

 
 

+<<<<<<< .working
 

 
           Model
+=======
+

+
+          Model
+>>>>>>> .merge-right.r57125
           of
         

 
    
@@ -134,9 +175,15 @@
             
    
 
 

+<<<<<<< .working
 

 
           Expression
+=======
+

+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         

 

@@ -182,10 +229,17 @@
 

 
 

+<<<<<<< .working
 

 
           Example
         

+=======
+

+
+          Example
+        

+>>>>>>> .merge-right.r57125
 
template<class SeqOfSeqs, class Func>
 typename result_of::transform< zip_view<SeqOfSeqs> const,
     fused_function_object<Func const &> >::type
@@ -219,9 +273,15 @@
     assert(c == n_ary_transform(vector_tie(a,b), sub()));
 }
 

+<<<<<<< .working
 

 
           See
+=======
+

+
+          See
+>>>>>>> .merge-right.r57125
           also
         

 
    
diff --git a/doc/html/fusion/functional/adapters/fused_procedure.html b/doc/html/fusion/functional/adapters/fused_procedure.html
index 4dfeb73c..1b322b64 100644
--- a/doc/html/fusion/functional/adapters/fused_procedure.html
+++ b/doc/html/fusion/functional/adapters/fused_procedure.html
@@ -3,7 +3,11 @@
 
 fused_procedure
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
    
 PrevUpHomeNext
 
    
+<<<<<<< .working
 
    
 
    
 
    
@@ -33,6 +38,16 @@
 
           Description
         
    
+=======
+
    
+
    
+
    
+
+          Description
+        
    
+>>>>>>> .merge-right.r57125
 
    
           An unary Polymorphic Function
@@ -66,22 +81,42 @@
           such a pointer without returning anything does not make sense, so this
           case is not implemented).
         
    
+<<<<<<< .working
 
    
 
           Header
         
    
+=======
+
    
+
+          Header
+        
    
+>>>>>>> .merge-right.r57125
 
    #include <boost/fusion/functional/adapter/fused_procedure.hpp>
 
    
+<<<<<<< .working
 
    
 
           Synopsis
         
    
+=======
+
    
+
+          Synopsis
+        
    
+>>>>>>> .merge-right.r57125
 
    template <typename Function>
 class fused_procedure;
 
    
+<<<<<<< .working
 
    
 
           Template
+=======
+
    
+
+          Template
+>>>>>>> .merge-right.r57125
           parameters
         
    
 
    
@@ -113,9 +148,15 @@
                 
    
 
 
    
+<<<<<<< .working
 
    
 
           Model
+=======
+
    
+
+          Model
+>>>>>>> .merge-right.r57125
           of
         
    
 
      
@@ -149,9 +190,15 @@
             
      
 
 
    
+<<<<<<< .working
 
    
 
           Expression
+=======
+
    
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
    
 
    
@@ -197,10 +244,17 @@
 
    
 
 
    
+<<<<<<< .working
 
    
 
           Example
         
    
+=======
+
    
+
+          Example
+        
    
+>>>>>>> .merge-right.r57125
 
    template<class SequenceOfSequences, class Func>
 void n_ary_for_each(SequenceOfSequences const & s, Func const & f)
 {
@@ -217,9 +271,15 @@
     assert(a == make_vector(1,0.5f));
 }
 
    
+<<<<<<< .working
 
    
 
           See
+=======
+
    
+
+          See
+>>>>>>> .merge-right.r57125
           also
         
    
 
    
@@ -37,14 +42,27 @@
 
           Description
         
+=======
+
    
+
    
+
+          Description
+        
    
+>>>>>>> .merge-right.r57125
 
    
           A non-member-pointer Callable
           Object type: A pointer to a function or a class type whose objects
           can appear immediately to the left of a function call operator.
         
    
+<<<<<<< .working
 
    
 
           Refinement
+=======
+
    
+
+          Refinement
+>>>>>>> .merge-right.r57125
           of
         
    
 
    
@@ -72,9 +90,15 @@
             
    
 
 
    
+<<<<<<< .working
 
    
 
           Expression
+=======
+
    
+
+          Expression
+>>>>>>> .merge-right.r57125
           requirements
         
    
 
    
@@ -107,22 +131,38 @@
                 
    
 
 
    
+<<<<<<< .working
 
    
 
           Models
         
    
 
      
 
    • 
+=======
+
      
+
+          Models
+        
      
+
        
+
      • 
+>>>>>>> .merge-right.r57125
             function pointer types
           
        • 
 
      • 
             all kinds of function objects
           
        • 
 
      
+<<<<<<< .working
 
      
 
           Examples
         
      
+=======
+
      
+
+          Examples
+        
      
+>>>>>>> .merge-right.r57125
 
      & a_free_function
 & a_class::a_static_member_function
 std::less<int>()
diff --git a/doc/html/fusion/functional/generation.html b/doc/html/fusion/functional/generation.html
index 3a5eade9..8ba8fc6e 100644
--- a/doc/html/fusion/functional/generation.html
+++ b/doc/html/fusion/functional/generation.html
@@ -3,7 +3,11 @@
 
 Generation
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/functional/generation/functions.html b/doc/html/fusion/functional/generation/functions.html
index 7894f6a7..3a9d4d9c 100644
--- a/doc/html/fusion/functional/generation/functions.html
+++ b/doc/html/fusion/functional/generation/functions.html
@@ -3,7 +3,11 @@
 
 Functions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/functional/generation/functions/mk_fused.html b/doc/html/fusion/functional/generation/functions/mk_fused.html
index c98ca344..998d045a 100644
--- a/doc/html/fusion/functional/generation/functions/mk_fused.html
+++ b/doc/html/fusion/functional/generation/functions/mk_fused.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           make_fused
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Creates a fused adapter for a given 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      template <typename F>
 inline typename make_fused(F const & f);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
      
 
      @@ -88,8 +171,33 @@
 
      
 

 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
      
 
      make_fused(f);
@@ -101,15 +209,65 @@
             Semantics: Returns a fused adapter for f.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <boost/fusion/functional/generation/make_fused.hpp>
 #include <boost/fusion/include/make_fused.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
      
 
      float sub(float a, float b) { return a - b; }
 
@@ -123,8 +281,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
        
@@ -136,7 +319,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html b/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html
index 07e6f4be..75447d50 100644
--- a/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html
+++ b/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           make_fused_function_object
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -35,8 +43,33 @@
 
      
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Creates a fused_function_object adapter
@@ -46,8 +79,33 @@
             conversion is applied to the target function.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      template <typename F>
 inline typename make_fused_function_object(F const & f);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
      
 
      @@ -90,8 +173,33 @@
 
      
 

 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
      
 
      make_fused_function_object(f);
@@ -104,15 +212,65 @@
             for f.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <boost/fusion/functional/generation/make_fused_function_object.hpp>
 #include <boost/fusion/include/make_fused_function_object.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
      
 
      struct sub
 {
@@ -139,8 +297,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
        
@@ -152,7 +335,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/generation/functions/mk_fused_proc.html b/doc/html/fusion/functional/generation/functions/mk_fused_proc.html
index 77a726af..2a9a00f9 100644
--- a/doc/html/fusion/functional/generation/functions/mk_fused_proc.html
+++ b/doc/html/fusion/functional/generation/functions/mk_fused_proc.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           make_fused_procedure
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -35,8 +43,33 @@
 
      
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Creates a fused_procedure adapter for
@@ -46,8 +79,33 @@
             conversion applied to the target function.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      template <typename F>
 inline typename make_fused_procedure(F const & f);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
      
 
      @@ -89,8 +172,33 @@
 
      
 

 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
      
 
      make_fused_procedure(f);
@@ -103,15 +211,65 @@
             f.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <boost/fusion/functional/generation/make_fused_procedure.hpp>
 #include <boost/fusion/include/make_fused_procedure.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
      
 
      vector<int,int,int> v(1,2,3);
 using namespace boost::lambda;
@@ -119,8 +277,33 @@
 assert(front(v) == 0);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
        
@@ -132,7 +315,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/generation/functions/mk_unfused.html b/doc/html/fusion/functional/generation/functions/mk_unfused.html
index ee7de825..b2a44df6 100644
--- a/doc/html/fusion/functional/generation/functions/mk_unfused.html
+++ b/doc/html/fusion/functional/generation/functions/mk_unfused.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           make_unfused
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -34,8 +42,33 @@
 
      
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Creates a unfused adapter for a given,
@@ -45,8 +78,33 @@
             conversion is applied to the target function.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      template <typename F>
 inline typename make_unfused(F const & f);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
      
 
      @@ -89,8 +172,33 @@
 
      
 

 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
      
 
      make_unfused(f);
@@ -102,15 +210,65 @@
             Semantics: Returns a unfused adapter for f.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <boost/fusion/functional/generation/make_unfused.hpp>
 #include <boost/fusion/include/make_unfused.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
      
 
      struct fused_incrementer
 {
@@ -135,8 +293,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
        
@@ -148,7 +331,7 @@
 
      
 
-
-
-
-
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/generation/metafunctions.html b/doc/html/fusion/functional/generation/metafunctions.html
index 5e91f690..56c45703 100644
--- a/doc/html/fusion/functional/generation/metafunctions.html
+++ b/doc/html/fusion/functional/generation/metafunctions.html
@@ -3,7 +3,11 @@
 
 Metafunctions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
+
 
           make_fused
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Returns the result type of make_fused.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <boost/fusion/functional/generation/make_fused.hpp>
 #include <boost/fusion/include/make_fused.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      namespace result_of
 {
@@ -62,8 +145,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html b/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html
index 0e7413bd..d94ca702 100644
--- a/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html
+++ b/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           make_fused_function_object
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -35,23 +43,98 @@
 
      
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Returns the result type of make_fused_function_object.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <boost/fusion/functional/generation/make_fused_function_object.hpp>
 #include <boost/fusion/include/make_fused_function_object.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      namespace result_of
 {
@@ -63,8 +146,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html b/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html
index 3b31682a..638175b0 100644
--- a/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html
+++ b/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           make_fused_procedure
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -35,23 +43,98 @@
 
      
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Returns the result type of make_fused_procedure.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <boost/fusion/functional/generation/make_fused_procedure.hpp>
 #include <boost/fusion/include/make_fused_procedure.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      namespace result_of
 {
@@ -63,8 +146,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html b/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html
index f005d8ab..13138156 100644
--- a/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html
+++ b/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           make_unfused
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -34,23 +42,98 @@
 
      
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Returns the result type of make_unfused.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <boost/fusion/functional/generation/make_unfused.hpp>
 #include <boost/fusion/include/make_unfused.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      namespace result_of
 {
@@ -62,8 +145,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/invocation.html b/doc/html/fusion/functional/invocation.html
index 57b36bfe..205a8063 100644
--- a/doc/html/fusion/functional/invocation.html
+++ b/doc/html/fusion/functional/invocation.html
@@ -3,7 +3,11 @@
 
 Invocation
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
 Functions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/functional/invocation/functions/invoke.html b/doc/html/fusion/functional/invocation/functions/invoke.html
index 7795bddd..42a14b50 100644
--- a/doc/html/fusion/functional/invocation/functions/invoke.html
+++ b/doc/html/fusion/functional/invocation/functions/invoke.html
@@ -1,10 +1,18 @@
 
 
-
+
 invoke
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Calls a Boost.Functional/Factory.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      template<
     typename Function,
@@ -72,8 +130,33 @@
 invoke(Function f, Sequence const & s);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
      
 
      @@ -122,8 +205,33 @@
 
      
 

 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
      
 
      invoke(f,s);
@@ -138,21 +246,96 @@
             as arguments and returns the result of the call expression.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <boost/fusion/functional/invocation/invoke.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
      
 
      std::plus<int> add;
 assert(invoke(add,make_vector(1,1)) == 2);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
        
@@ -168,7 +351,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/invocation/functions/invoke_fobj.html b/doc/html/fusion/functional/invocation/functions/invoke_fobj.html
index 2ef57612..916382a8 100644
--- a/doc/html/fusion/functional/invocation/functions/invoke_fobj.html
+++ b/doc/html/fusion/functional/invocation/functions/invoke_fobj.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           invoke_function_object
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -34,8 +42,33 @@
 
      
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Calls a Boost.Functional/Factory.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      template<
     typename Function,
@@ -70,8 +128,33 @@
 invoke_function_object(Function f, Sequence const & s);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
      
 
      @@ -120,8 +203,33 @@
 
      
 

 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
      
 
      invoke_function_object(f,s);
@@ -136,14 +244,64 @@
             as arguments and returns the result of the call expression.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <boost/fusion/functional/invocation/invoke_function_object.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
      
 
      struct sub
 {
@@ -168,8 +326,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
        
@@ -185,7 +368,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/invocation/functions/invoke_proc.html b/doc/html/fusion/functional/invocation/functions/invoke_proc.html
index a76d070e..07672a5c 100644
--- a/doc/html/fusion/functional/invocation/functions/invoke_proc.html
+++ b/doc/html/fusion/functional/invocation/functions/invoke_proc.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           invoke_procedure
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Calls a Callable
@@ -58,8 +91,33 @@
             isn't implemented).
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      template<
     typename Function,
@@ -78,8 +136,33 @@
 invoke_procedure(Function f, Sequence const & s);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
      
 
      @@ -127,8 +210,33 @@
 
      
 

 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
      
 
      invoke_procedure(f,s);
@@ -142,14 +250,64 @@
             as arguments.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
      
 
      #include <booost/fusion/functional/invocation/invoke_procedure.hpp>
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
      
 
      vector<int,int> v(1,2);
 using namespace boost::lambda;
@@ -157,8 +315,33 @@
 assert(front(v) == 3);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
        
@@ -174,7 +357,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/invocation/limits.html b/doc/html/fusion/functional/invocation/limits.html
index e7acd676..69e1ef3b 100644
--- a/doc/html/fusion/functional/invocation/limits.html
+++ b/doc/html/fusion/functional/invocation/limits.html
@@ -3,7 +3,11 @@
 
 Limits
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -34,12 +39,29 @@
 
           Header
         
      
+=======
+
      
+
      
+Limits
+
      
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/functional/invocation/limits.hpp>
 
      
+<<<<<<< .working
 
      
 
           Macros
         
      
+=======
+
      
+
+          Macros
+        
      
+>>>>>>> .merge-right.r57125
 
      
           The following macros can be defined to change the maximum arity. The default
           is 6.
diff --git a/doc/html/fusion/functional/invocation/metafunctions.html b/doc/html/fusion/functional/invocation/metafunctions.html
index 7ad8bfe2..739671dd 100644
--- a/doc/html/fusion/functional/invocation/metafunctions.html
+++ b/doc/html/fusion/functional/invocation/metafunctions.html
@@ -3,7 +3,11 @@
 
 Metafunctions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
+
 invoke
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Returns the result type of invoke.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      namespace result_of
 {
@@ -54,8 +112,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
        
@@ -65,7 +148,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html b/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html
index dd615fe4..8521b884 100644
--- a/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html
+++ b/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           invoke_function_object
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -34,16 +42,66 @@
 
      
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Returns the result type of invoke_function_object.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      namespace result_of
 {
@@ -58,8 +116,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
        
@@ -70,7 +153,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html b/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html
index e4d7a6e6..c173c685 100644
--- a/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html
+++ b/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html
@@ -1,11 +1,19 @@
 
 
-
+
 
           invoke_procedure
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
      
 
      
             Returns the result type of invoke_procedure.
           
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
      
 
      namespace result_of
 {
@@ -58,8 +116,33 @@
 }
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             See
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            See
+>>>>>>> .merge-right.r57125
             also
           
      
 
        
@@ -70,7 +153,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/introduction.html b/doc/html/fusion/introduction.html
index 6ddd26c0..914ca926 100644
--- a/doc/html/fusion/introduction.html
+++ b/doc/html/fusion/introduction.html
@@ -1,11 +1,20 @@
 
 
-
+
 Introduction
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
 
+=======
+
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -120,7 +129,31 @@
       sequences are fully compatible with Fusion. You can work with Fusion sequences
       on MPL if you
       wish to work solely on types
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
       [1]
+=======
+      [1]
+=======
+      [1]
+=======
+      [1]
+=======
+      [1]
+=======
+      [1]
+=======
+      [1]
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
       . In MPL, Fusion
       sequences follow MPL's
       sequence-type preserving semantics (i.e. algorithms preserve the original sequence
@@ -135,7 +168,31 @@
     
      
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      [1] 
+=======
+
      [1] 
+=======
+
      [1] 
+=======
+
      [1] 
+=======
+
      [1] 
+=======
+
      [1] 
+=======
+
      [1] 
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
           Choose MPL
           over fusion when doing pure type calculations. Once the static type calculation
           is finished, you can instantiate a fusion sequence (see Conversion)
@@ -145,7 +202,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator.html b/doc/html/fusion/iterator.html
index c1fe41d3..1c44cc48 100644
--- a/doc/html/fusion/iterator.html
+++ b/doc/html/fusion/iterator.html
@@ -3,7 +3,11 @@
 
 Iterator
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -38,6 +42,8 @@
         Iterator
 
      Random
         Access Iterator
      
+
      Associative
+        Iterator
      
 
 
      Functions
      
 
      
@@ -47,6 +53,7 @@
 
      distance
      
 
      advance
      
 
      advance_c
      
+
      deref_data
      
 
      
 
      Operator
      
 
      
@@ -67,6 +74,9 @@
 
      distance
      
 
      advance
      
 
      advance_c
      
+
      key_of
      
+
      value_of_data
      
+
      deref_data
      
 
      
 
      
 
      
@@ -77,10 +87,17 @@
       iterators describe positions, and provide access to data within an underlying
       Sequence.
     
      
+<<<<<<< .working
 
      
 
       Header
     
      
+=======
+
      
+
+      Header
+    
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator.hpp>
 #include <boost/fusion/include/iterator.hpp>
 
      
diff --git a/doc/html/fusion/iterator/concepts.html b/doc/html/fusion/iterator/concepts.html
index f128002f..666749ac 100644
--- a/doc/html/fusion/iterator/concepts.html
+++ b/doc/html/fusion/iterator/concepts.html
@@ -3,7 +3,11 @@
 
 Concepts
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -37,6 +41,8 @@
         Iterator
 
      Random
         Access Iterator
      
+
      Associative
+        Iterator
      
 
 
      
         Fusion iterators are divided into different traversal categories. Random
         Access Iterator is a refinement of Bidirectional
-        Iterator.
+        Iterator. Associative
+        Iterator is a refinement of Forward
+        Iterator, Bidirectional
+        Iterator or Random
+        Access Iterator.
       
      
 
 
diff --git a/doc/html/fusion/iterator/concepts/associative_iterator.html b/doc/html/fusion/iterator/concepts/associative_iterator.html
new file mode 100644
index 00000000..309b314c
--- /dev/null
+++ b/doc/html/fusion/iterator/concepts/associative_iterator.html
@@ -0,0 +1,228 @@
+
+
+
+Associative Iterator
+
+
+
+
+
+
+
+
+
      
+
+
+
+
+
+
+
      Boost C++ LibrariesHomeLibrariesPeopleFAQMore
      
+
      
+
      
+PrevUpHomeNext
+
      
+
      
+
      
+
      
+
+          Description
+        
      
+
      
+          An Associative Iterator provides additional semantics to obtain the properties
+          of the element of an associative forward, bidirectional or random access
+          sequence.
+        
      
+
      
+
      Notation
      
+
      
+
      i
      
+
      
+              Associative Iterator
+            
      
+
      I
      
+
      
+              Associative Iterator type
+            
      
+
      
+
      
+
      
+
+          Refinement
+          of
+        
      
+
      
+          Forward Iterator,
+          Bidirectional
+          Iterator or Random
+          Access Iterator
+        
      
+
      
+
+          Expression
+          requirements
+        
      
+
      
+          In addition to the requirements defined in Forward
+          Iterator, Bidirectional
+          Iterator or Random
+          Access Iterator the following expressions must be valid:
+        
      
+
      
+++++
+
+
+
+
+
+
+
+
+
+
+
      




      
+                
      
+                  Expression
+                
      
+                      		
+                
      
+                  Return type
+                
      
+                      		
+                
      
+                  Runtime Complexity
+                
      
+                
      
+                
      
+                  deref_data(i)
+                
      
+                      		
+                
      
+                  result_of::deref_data<I>::type
+                
      
+                      		
+                
      
+                  Constant
+                
      
+                
      
+
      
+
+          Meta
+          Expressions
+        
      
+
      
++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      



      
+                
      
+                  Expression
+                
      
+                      		
+                
      
+                  Compile Time Complexity
+                
      
+                
      
+                
      
+                  result_of::key_of<I>::type
+                
      
+                      		
+                
      
+                  Amortized constant time
+                
      
+                
      
+                
      
+                  result_of::value_of_data<I>::type
+                
      
+                      		
+                
      
+                  Amortized constant time
+                
      
+                
      
+                
      
+                  result_of::deref_data<I>::type
+                
      
+                      		
+                
      
+                  Amortized constant time
+                
      
+                
      
+
      
+
+          Models
+        
      
+
      
+
      
+
+
+
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+      Schwinger
      
+        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)
+      
      
+
      
+
      
+
      
+PrevUpHomeNext
+
      
+
+
diff --git a/doc/html/fusion/iterator/concepts/bidirectional_iterator.html b/doc/html/fusion/iterator/concepts/bidirectional_iterator.html
index ec43505a..f0f407cc 100644
--- a/doc/html/fusion/iterator/concepts/bidirectional_iterator.html
+++ b/doc/html/fusion/iterator/concepts/bidirectional_iterator.html
@@ -4,7 +4,11 @@
 Bidirectional
         Iterator
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 Bidirectional
         Iterator
+<<<<<<< .working
 
 
      
 
@@ -38,6 +43,13 @@
 
           Description
         
+=======
+
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           A Bidirectional Iterator traverses a Sequence
           allowing movement in either direction one element at a time.
@@ -64,18 +76,30 @@
             
      
 
 
+<<<<<<< .working
 
      
 
           Refinement
+=======
+
      
+
+          Refinement
+>>>>>>> .merge-right.r57125
           of
         
      
 
      
           Forward Iterator
         
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           requirements
         
      
 
      
@@ -155,9 +179,15 @@
 
      
       
 
      
+<<<<<<< .working
 
      
 
           Meta
+=======
+
      
+
+          Meta
+>>>>>>> .merge-right.r57125
           Expressions
         
      
 
      
@@ -182,9 +212,15 @@
                 
      
 
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      
@@ -215,10 +251,17 @@
                 
      		
 
      
 
      
+<<<<<<< .working
 
      
 
           Invariants
         
      
+=======
+
      
+
+          Invariants
+        
      
+>>>>>>> .merge-right.r57125
 
      
           In addition to the invariants of Forward
@@ -232,6 +275,7 @@
             will never return a previously seen position
           
 
+<<<<<<< .working
 
      
 
           Models
@@ -239,6 +283,15 @@
 
        
 
      • 
 std::pair
+=======
+
        
+
+          Models
+        
        
+
          
+
        • 
+std::pair
+>>>>>>> .merge-right.r57125
             iterator
           
          • 
 
        • 
diff --git a/doc/html/fusion/iterator/concepts/forward_iterator.html b/doc/html/fusion/iterator/concepts/forward_iterator.html
index 5947a2d7..7c348fb6 100644
--- a/doc/html/fusion/iterator/concepts/forward_iterator.html
+++ b/doc/html/fusion/iterator/concepts/forward_iterator.html
@@ -4,7 +4,11 @@
 Forward
         Iterator
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -30,6 +34,7 @@
 Forward
         Iterator
+<<<<<<< .working
 
      
 
      
 
@@ -37,6 +42,13 @@
 
           Description
         
+=======
+
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           A Forward Iterator traverses a Sequence
           allowing movement in only one direction through it's elements, one element
@@ -66,9 +78,15 @@
             
      
 
 
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           requirements
         
      
 
      
@@ -193,9 +211,15 @@
 
      
       
 
      
+<<<<<<< .working
 
      
 
           Meta
+=======
+
      
+
+          Meta
+>>>>>>> .merge-right.r57125
           Expressions
         
      
 
      
@@ -272,9 +296,15 @@
 
      
 
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      
@@ -362,10 +392,17 @@
 
      
 
 
      
+<<<<<<< .working
 
      
 
           Invariants
         
      
+=======
+
      
+
+          Invariants
+        
      
+>>>>>>> .merge-right.r57125
 
      
           The following invariants always hold:
         
      
@@ -386,6 +423,7 @@
             j then *i is equivalent to *j
 
 
+<<<<<<< .working
 
      
 
           Models
@@ -393,6 +431,15 @@
 
        
 
      • 
 std::pair
+=======
+
        
+
+          Models
+        
        
+
          
+
        • 
+std::pair
+>>>>>>> .merge-right.r57125
             iterator
           
          • 
 
        • 
diff --git a/doc/html/fusion/iterator/concepts/random_access_iterator.html b/doc/html/fusion/iterator/concepts/random_access_iterator.html
index 014afd40..ac3bb4a5 100644
--- a/doc/html/fusion/iterator/concepts/random_access_iterator.html
+++ b/doc/html/fusion/iterator/concepts/random_access_iterator.html
@@ -4,12 +4,16 @@
 Random
         Access Iterator
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
-
+
 
 
 
@@ -22,7 +26,7 @@
 
          
 
          
 
          
-PrevUpHomeNext
+PrevUpHomeNext
 
          
 
          
 
          
@@ -30,6 +34,7 @@
 Random
         Access Iterator
+<<<<<<< .working
 
      
 
      
 
@@ -37,6 +42,13 @@
 
           Description
         
+=======
+
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           A Random Access Iterator traverses a Sequence
           moving in either direction, permitting efficient arbitrary distance movements
@@ -66,9 +78,15 @@
             
      
 
 
+<<<<<<< .working
 
      
 
           Refinement
+=======
+
      
+
+          Refinement
+>>>>>>> .merge-right.r57125
           of
         
      
 
      
@@ -76,9 +94,15 @@
         Iterator">Bidirectional
           Iterator
         
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           requirements
         
      
 
      
@@ -158,9 +182,15 @@
 
      
       
 
      
+<<<<<<< .working
 
      
 
           Meta
+=======
+
      
+
+          Meta
+>>>>>>> .merge-right.r57125
           Expressions
         
      
 
      
@@ -205,6 +235,7 @@
 
      
 
 
      
+<<<<<<< .working
 
      
 
           Models
@@ -212,6 +243,15 @@
 
        
 
      • 
 vector
+=======
+
        
+
+          Models
+        
        
+
          
+
        • 
+vector
+>>>>>>> .merge-right.r57125
             iterator
           
          • 
 
        • 
@@ -253,7 +293,7 @@
 
      
 
      
 
      
-PrevUpHomeNext
+PrevUpHomeNext
 
      
 
 
diff --git a/doc/html/fusion/iterator/functions.html b/doc/html/fusion/iterator/functions.html
index 24eba686..4287a611 100644
--- a/doc/html/fusion/iterator/functions.html
+++ b/doc/html/fusion/iterator/functions.html
@@ -3,11 +3,19 @@
 
 Functions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57242
 
 
 
@@ -21,7 +29,7 @@
 
      
 
      
 
      
-PrevUpHomeNext
+PrevUpHomeNext
 
      
 
      
 
      
@@ -37,6 +45,7 @@
 
      distance
      
 
      advance
      
 
      advance_c
      
+
      deref_data
      
 
      
 
      
         Fusion provides functions for manipulating iterators, analogous to the similar
@@ -55,7 +64,7 @@
 
      
 
      
 
      
-PrevUpHomeNext
+PrevUpHomeNext
 
      
 
 
diff --git a/doc/html/fusion/iterator/functions/advance.html b/doc/html/fusion/iterator/functions/advance.html
index 28021510..cf8d9d8a 100644
--- a/doc/html/fusion/iterator/functions/advance.html
+++ b/doc/html/fusion/iterator/functions/advance.html
@@ -1,10 +1,18 @@
 
 
-
+
 advance
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,13 +42,30 @@
 
           Description
         
      
+=======
+
      
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Moves an iterator by a specified distance.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I,
     typename M
@@ -47,8 +73,33 @@
 typename result_of::advance<I, M>::type advance(I const& i);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.6. Parameters
      
 
+=======
+
      Table 1.6. Parameters
      
+=======
+
      Table 1.6. Parameters
      
+=======
+
      Table 1.6. Parameters
      
+=======
+
      Table 1.6. Parameters
      
+=======
+
      Table 1.6. Parameters
      
+=======
+
      Table 1.6. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -94,9 +145,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      advance<M>(i);
@@ -114,18 +171,33 @@
           Iterator then M
           may be negative.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/include/advance.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
         
      
 
      typedef vector<int,int,int> vec;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,int,int> vec;
+>>>>>>> .merge-right.r57125
 
 vec v(1,2,3);
 assert(deref(advance<mpl::int_<2> >(begin(v))) == 3);
@@ -133,7 +205,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/functions/advance_c.html b/doc/html/fusion/iterator/functions/advance_c.html
index ec98c71a..7cec4f67 100644
--- a/doc/html/fusion/iterator/functions/advance_c.html
+++ b/doc/html/fusion/iterator/functions/advance_c.html
@@ -1,13 +1,21 @@
 
 
-
+
 advance_c
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
-
+
 
 
 
@@ -20,8 +28,9 @@
 
      
 
      
 
      
-PrevUpHomeNext
+PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,13 +42,30 @@
 
           Description
         
      
+=======
+
      
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Moves an iterator by a specified distance.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I,
     int N
@@ -47,8 +73,33 @@
 typename result_of::advance_c<I, N>::type advance_c(I const& i);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.7. Parameters
      
 
+=======
+
      Table 1.7. Parameters
      
+=======
+
      Table 1.7. Parameters
      
+=======
+
      Table 1.7. Parameters
      
+=======
+
      Table 1.7. Parameters
      
+=======
+
      Table 1.7. Parameters
      
+=======
+
      Table 1.7. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -93,9 +144,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      advance_c<N>(i);
@@ -113,18 +170,33 @@
           Iterator then N
           may be negative.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/include/advance.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
         
      
 
      typedef vector<int,int,int> vec;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,int,int> vec;
+>>>>>>> .merge-right.r57125
 
 vec v(1,2,3);
 assert(deref(advance_c<2>(begin(v))) == 3);
@@ -132,7 +204,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
@@ -141,7 +213,7 @@
 
      
 
      
 
      
-PrevUpHomeNext
+PrevUpHomeNext
 
      
 
 
diff --git a/doc/html/fusion/iterator/functions/deref.html b/doc/html/fusion/iterator/functions/deref.html
index 91e26f39..ae79a1fd 100644
--- a/doc/html/fusion/iterator/functions/deref.html
+++ b/doc/html/fusion/iterator/functions/deref.html
@@ -1,10 +1,18 @@
 
 
-
+
 deref
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,21 +42,63 @@
 
           Description
         
      
+=======
+
      
+
      
+deref
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Deferences an iterator.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I
     >
 typename result_of::deref<I>::type deref(I const& i);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.2. Parameters
      
 
+=======
+
      Table 1.2. Parameters
      
+=======
+
      Table 1.2. Parameters
      
+=======
+
      Table 1.2. Parameters
      
+=======
+
      Table 1.2. Parameters
      
+=======
+
      Table 1.2. Parameters
      
+=======
+
      Table 1.2. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -79,9 +130,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      deref(i);
@@ -93,18 +150,33 @@
           Semantics: Dereferences the iterator
           i.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/include/deref.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
         
      
 
      typedef vector<int,int&> vec;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,int&> vec;
+>>>>>>> .merge-right.r57125
 
 int i(0);
 vec v(1,i);
@@ -115,7 +187,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/functions/deref_data.html b/doc/html/fusion/iterator/functions/deref_data.html
new file mode 100644
index 00000000..0f4092aa
--- /dev/null
+++ b/doc/html/fusion/iterator/functions/deref_data.html
@@ -0,0 +1,138 @@
+
+
+
+deref_data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      Boost C++ LibrariesHomeLibrariesPeopleFAQMore
      
+
      
+
      
+PrevUpHomeNext
+
      
+
      
+
      
+
      
+
+          Description
+        
      
+
      
+          Deferences the data property associated with the element referenced by
+          an associative iterator.
+        
      
+
      
+
+          Synopsis
+        
      
+
      template<
+    typename I
+    >
+typename result_of::deref_data<I>::type deref(I const& i);
+
      
+
      
+
      Table 1.8. Parameters
      
+
      
+++++
+
+
+
+
+
+
+
+
+
+
+
      




      
+              
      
+                Parameter
+              
      
+                    		
+              
      
+                Requirement
+              
      
+                    		
+              
      
+                Description
+              
      
+              
      
+              
      
+                i
+              
      
+                    		
+              
      
+                Model of Associative
+                Iterator
+              
      
+                    		
+              
      
+                Operation's argument
+              
      
+              
      
+
      
+
      
+
+          Expression
+          Semantics
+        
      
+
      deref_data(i);
+
      
+
      
+          Return type: result_of::deref_data<I>::type
+        
      
+
      
+          Semantics: Dereferences the data property
+          associated with the element referenced by an associative iterator i.
+        
      
+
      
+
+          Header
+        
      
+
      #include <boost/fusion/iterator/deref_data.hpp>
+#include <boost/fusion/include/deref_data.hpp>
+
      
+
      
+
+          Example
+        
      
+
      typedef map<pair<float,int&> > map;
+
+int i(0);
+map m(1.0f,i);
+assert(deref_data(begin(m)) == 0);
+assert(&(deref_data(begin(m))) == &i);
+
      
+
      
+
+
+
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+      Schwinger
      
+        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)
+      
      
+
      
+
      
+
      
+PrevUpHomeNext
+
      
+
+
diff --git a/doc/html/fusion/iterator/functions/distance.html b/doc/html/fusion/iterator/functions/distance.html
index aeda1092..3558305e 100644
--- a/doc/html/fusion/iterator/functions/distance.html
+++ b/doc/html/fusion/iterator/functions/distance.html
@@ -1,10 +1,18 @@
 
 
-
+
 distance
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,13 +42,30 @@
 
           Description
         
      
+=======
+
      
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Returns the distance between 2 iterators.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I,
     typename J
@@ -47,8 +73,33 @@
 typename result_of::distance<I, J>::type distance(I const& i, J const& j);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.5. Parameters
      
 
+=======
+
      Table 1.5. Parameters
      
+=======
+
      Table 1.5. Parameters
      
+=======
+
      Table 1.5. Parameters
      
+=======
+
      Table 1.5. Parameters
      
+=======
+
      Table 1.5. Parameters
      
+=======
+
      Table 1.5. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -80,9 +131,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      distance(i,j);
@@ -94,18 +151,33 @@
           Semantics: Returns the distance between
           iterators i and j.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/distance.hpp>
 #include <boost/fusion/include/distance.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
         
      
 
      typedef vector<int,int,int> vec;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,int,int> vec;
+>>>>>>> .merge-right.r57125
 
 vec v(1,2,3);
 assert(distance(begin(v), next(next(begin(v)))) == 2);
@@ -113,7 +185,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/functions/next.html b/doc/html/fusion/iterator/functions/next.html
index cbae5a92..431cb4c3 100644
--- a/doc/html/fusion/iterator/functions/next.html
+++ b/doc/html/fusion/iterator/functions/next.html
@@ -1,10 +1,18 @@
 
 
-
+
 next
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,21 +42,63 @@
 
           Description
         
      
+=======
+
      
+
      
+next
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Moves an iterator 1 position forwards.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I
     >
 typename result_of::next<I>::type next(I const& i);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.3. Parameters
      
 
+=======
+
      Table 1.3. Parameters
      
+=======
+
      Table 1.3. Parameters
      
+=======
+
      Table 1.3. Parameters
      
+=======
+
      Table 1.3. Parameters
      
+=======
+
      Table 1.3. Parameters
      
+=======
+
      Table 1.3. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -79,9 +130,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      next(i);
@@ -94,18 +151,33 @@
           Semantics: Returns an iterator to the
           next element after i.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/include/next.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
         
      
 
      typedef vector<int,int,int> vec;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,int,int> vec;
+>>>>>>> .merge-right.r57125
 
 vec v(1,2,3);
 assert(deref(begin(v)) == 1);
@@ -115,7 +187,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/functions/prior.html b/doc/html/fusion/iterator/functions/prior.html
index 82538126..fed439ea 100644
--- a/doc/html/fusion/iterator/functions/prior.html
+++ b/doc/html/fusion/iterator/functions/prior.html
@@ -1,10 +1,18 @@
 
 
-
+
 prior
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,21 +42,63 @@
 
           Description
         
      
+=======
+
      
+
      
+prior
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Moves an iterator 1 position backwards.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I
     >
 typename result_of::prior<I>::type prior(I const& i);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.4. Parameters
      
 
+=======
+
      Table 1.4. Parameters
      
+=======
+
      Table 1.4. Parameters
      
+=======
+
      Table 1.4. Parameters
      
+=======
+
      Table 1.4. Parameters
      
+=======
+
      Table 1.4. Parameters
      
+=======
+
      Table 1.4. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -79,9 +130,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      prior(i);
@@ -94,18 +151,33 @@
           Semantics: Returns an iterator to the
           element prior to i.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/prior.hpp>
 #include <boost/fusion/include/prior.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
         
      
 
      typedef vector<int,int> vec;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,int> vec;
+>>>>>>> .merge-right.r57125
 
 vec v(1,2);
 assert(deref(next(begin(v))) == 2);
@@ -114,7 +186,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/metafunctions.html b/doc/html/fusion/iterator/metafunctions.html
index 8d1fb1fd..3b2d5523 100644
--- a/doc/html/fusion/iterator/metafunctions.html
+++ b/doc/html/fusion/iterator/metafunctions.html
@@ -3,7 +3,11 @@
 
 Metafunctions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 distance
 
      advance
      
 
      advance_c
      
+
      key_of
      
+
      value_of_data
      
+
      deref_data
      
 
      
 
 
diff --git a/doc/html/fusion/iterator/metafunctions/advance.html b/doc/html/fusion/iterator/metafunctions/advance.html
index 1ba7988b..35230acc 100644
--- a/doc/html/fusion/iterator/metafunctions/advance.html
+++ b/doc/html/fusion/iterator/metafunctions/advance.html
@@ -1,10 +1,18 @@
 
-
+advance
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,13 +42,30 @@
 
           Description
         
      
+=======
+
      
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Moves an iterator a specified distance.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I,
     typename M
@@ -50,8 +76,33 @@
 };
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.17. Parameters
      
 
      
 
 
 
 
 
      
+=======
+
      Table 1.17. Parameters
      
+=======
+
      Table 1.18. Parameters
      
+=======
+
      Table 1.18. Parameters
      
+=======
+
      Table 1.18. Parameters
      
+=======
+
      Table 1.18. Parameters
      
+=======
+
      Table 1.18. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -97,9 +148,15 @@
 
      
 
 

 
      
 
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      result_of::advance<I,M>::type
@@ -116,13 +173,21 @@
           Iterator then M
           may be negative.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/include/advance.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
@@ -131,13 +196,23 @@
 typedef result_of::begin<vec>::type first;
 typedef result_of::next<first>::type second;
 typedef result_of::next<second>::type third;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,double,char> vec;
+typedef result_of::begin<vec>::type first;
+typedef result_of::next<first>::type second;
+typedef result_of::next<second>::type third;
+>>>>>>> .merge-right.r57125
 
 BOOST_MPL_ASSERT((result_of::equal_to<result_of::advance<first, boost::mpl::int_<2> >::type, third>));
 
      
 
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/metafunctions/advance_c.html b/doc/html/fusion/iterator/metafunctions/advance_c.html
index b2812187..4beb3a7c 100644
--- a/doc/html/fusion/iterator/metafunctions/advance_c.html
+++ b/doc/html/fusion/iterator/metafunctions/advance_c.html
@@ -1,13 +1,21 @@
 
 
-
+
 advance_c
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
-
+
 
 
 
@@ -20,8 +28,9 @@
 
      
 
      
 
      
-PrevUpHomeNext
+PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,13 +42,30 @@
 
           Description
         
      
+=======
+
      
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Moves an iterator by a specified distance.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I,
     int N
@@ -50,8 +76,33 @@
 };
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.18. Parameters
      
 
+=======
+
      Table 1.18. Parameters
      
+=======
+
      Table 1.19. Parameters
      
+=======
+
      Table 1.19. Parameters
      
+=======
+
      Table 1.19. Parameters
      
+=======
+
      Table 1.19. Parameters
      
+=======
+
      Table 1.19. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -96,9 +147,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      result_of::advance_c<I, N>::type
@@ -115,13 +172,21 @@
           Iterator then N
           may be negative. Equivalent to result_of::advance<I, boost::mpl::int_<N> >::type.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/include/advance.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
@@ -130,13 +195,23 @@
 typedef result_of::begin<vec>::type first;
 typedef result_of::next<first>::type second;
 typedef result_of::next<second>::type third;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,double,char> vec;
+typedef result_of::begin<vec>::type first;
+typedef result_of::next<first>::type second;
+typedef result_of::next<second>::type third;
+>>>>>>> .merge-right.r57125
 
 BOOST_MPL_ASSERT((result_of::equal_to<result_of::advance_c<first, 2>::type, third>));
 
      
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
@@ -145,7 +220,7 @@
 
      
 
      
 
      
-PrevUpHomeNext
+PrevUpHomeNext
 
      
 
 
diff --git a/doc/html/fusion/iterator/metafunctions/deref.html b/doc/html/fusion/iterator/metafunctions/deref.html
index 51c2b998..7c40d635 100644
--- a/doc/html/fusion/iterator/metafunctions/deref.html
+++ b/doc/html/fusion/iterator/metafunctions/deref.html
@@ -1,10 +1,18 @@
 
 
-
+
 deref
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,13 +42,30 @@
 
           Description
         
      
+=======
+
      
+
      
+deref
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Returns the type that will be returned by dereferencing an iterator.
         
      
+<<<<<<< .working
 
      
 
           Synposis
         
      
+=======
+
      
+
+          Synposis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I
     >
@@ -49,8 +75,33 @@
 };
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.12. Parameters
      
 
+=======
+
      Table 1.12. Parameters
      
+=======
+
      Table 1.13. Parameters
      
+=======
+
      Table 1.13. Parameters
      
+=======
+
      Table 1.13. Parameters
      
+=======
+
      Table 1.13. Parameters
      
+=======
+
      Table 1.13. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -82,9 +133,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      result_of::deref<I>::type
@@ -96,18 +153,33 @@
           Semantics: Returns the result of dereferencing
           an iterator of type I.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/include/deref.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
         
      
 
      typedef vector<int,int&> vec;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,int&> vec;
+>>>>>>> .merge-right.r57125
 typedef const vec const_vec;
 typedef result_of::begin<vec>::type first;
 typedef result_of::next<first>::type second;
@@ -121,7 +193,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/metafunctions/deref_data.html b/doc/html/fusion/iterator/metafunctions/deref_data.html
new file mode 100644
index 00000000..140c292c
--- /dev/null
+++ b/doc/html/fusion/iterator/metafunctions/deref_data.html
@@ -0,0 +1,139 @@
+
+
+
+deref_data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      Boost C++ LibrariesHomeLibrariesPeopleFAQMore
      
+
      
+
      
+PrevUpHomeNext
+
      
+
      
+
      
+
      
+
+          Description
+        
      
+
      
+          Returns the type that will be returned by dereferencing the data property
+          referenced by an associative iterator.
+        
      
+
      
+
+          Synposis
+        
      
+
      template<
+    typename I
+    >
+struct deref_data
+{
+    typedef unspecified type;
+};
+
      
+
      
+
      Table 1.22. Parameters
      
+
      
+++++
+
+
+
+
+
+
+
+
+
+
+
      




      
+              
      
+                Parameter
+              
      
+                    		
+              
      
+                Requirement
+              
      
+                    		
+              
      
+                Description
+              
      
+              
      
+              
      
+                I
+              
      
+                    		
+              
      
+                Model of Associative
+                Iterator
+              
      
+                    		
+              
      
+                Operation's argument
+              
      
+              
      
+
      
+
      
+
+          Expression
+          Semantics
+        
      
+
      result_of::deref_data<I>::type
+
      
+
      
+          Return type: Any type
+        
      
+
      
+          Semantics: Returns the result of dereferencing
+          the data property referenced by an associative iterator of type I.
+        
      
+
      
+
+          Header
+        
      
+
      #include <boosta/fusion/iterator/deref_data.hpp>
+#include <boost/fusion/include/deref_data.hpp>
+
      
+
      
+
+          Example
+        
      
+
      typedef map<pair<float,int> > map;
+typedef result_of::begin<vec>::type first;
+
+BOOST_MPL_ASSERT((boost::is_same<result_of::deref_data<first>::type, int&>));
+
      
+
      
+
+
+
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+      Schwinger
      
+        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)
+      
      
+
      
+
      
+
      
+PrevUpHomeNext
+
      
+
+
diff --git a/doc/html/fusion/iterator/metafunctions/distance.html b/doc/html/fusion/iterator/metafunctions/distance.html
index 6d070176..e0ac77d8 100644
--- a/doc/html/fusion/iterator/metafunctions/distance.html
+++ b/doc/html/fusion/iterator/metafunctions/distance.html
@@ -1,10 +1,18 @@
 
 
-
+
 distance
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,13 +42,30 @@
 
           Description
         
      
+=======
+
      
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Returns the distance between two iterators.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I,
     typename J
@@ -50,8 +76,33 @@
 };
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.16. Parameters
      
 
+=======
+
      Table 1.16. Parameters
      
+=======
+
      Table 1.17. Parameters
      
+=======
+
      Table 1.17. Parameters
      
+=======
+
      Table 1.17. Parameters
      
+=======
+
      Table 1.17. Parameters
      
+=======
+
      Table 1.17. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -83,9 +134,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      result_of::distance<I, J>::type
@@ -99,13 +156,21 @@
           iterators of types I and
           J.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/distance.hpp>
 #include <boost/fusion/include/distance.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
@@ -115,13 +180,24 @@
 typedef result_of::next<first>::type second;
 typedef result_of::next<second>::type third;
 typedef result_of::distance<first,third>::type dist;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,double,char> vec;
+typedef result_of::begin<vec>::type first;
+typedef result_of::next<first>::type second;
+typedef result_of::next<second>::type third;
+typedef result_of::distance<first,third>::type dist;
+>>>>>>> .merge-right.r57125
 
 BOOST_MPL_ASSERT_RELATION(dist::value, ==, 2);
 
      
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/metafunctions/equal_to.html b/doc/html/fusion/iterator/metafunctions/equal_to.html
index 419c5abc..bc7c0b87 100644
--- a/doc/html/fusion/iterator/metafunctions/equal_to.html
+++ b/doc/html/fusion/iterator/metafunctions/equal_to.html
@@ -1,10 +1,18 @@
 
 
-
+
 equal_to
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,15 +42,32 @@
 
           Description
         
      
+=======
+
      
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Returns a true-valued MPL
           Integral Constant if I
           and J are equal.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I,
     typename J
@@ -52,8 +78,33 @@
 };
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.15. Parameters
      
 
+=======
+
      Table 1.15. Parameters
      
+=======
+
      Table 1.16. Parameters
      
+=======
+
      Table 1.16. Parameters
      
+=======
+
      Table 1.16. Parameters
      
+=======
+
      Table 1.16. Parameters
      
+=======
+
      Table 1.16. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -83,9 +134,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      result_of::equal_to<I, J>::type
@@ -99,13 +156,21 @@
           if I and J are iterators to the same position.
           Returns boost::mpl::false_ otherwise.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/include/equal_to.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
@@ -115,11 +180,22 @@
 typedef result_of::end<vec>::type last;
 BOOST_MPL_ASSERT((result_of::equal_to<first, first>));
 BOOST_MPL_ASSERT_NOT((result_of::equal_to<first,last>));
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,double> vec;
+typedef result_of::begin<vec>::type first;
+typedef result_of::end<vec>::type last;
+BOOST_MPL_ASSERT((result_of::equal_to<first, first>));
+BOOST_MPL_ASSERT_NOT((result_of::equal_to<first,last>));
+>>>>>>> .merge-right.r57125
 
      
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/metafunctions/key_of.html b/doc/html/fusion/iterator/metafunctions/key_of.html
new file mode 100644
index 00000000..8e0b6f20
--- /dev/null
+++ b/doc/html/fusion/iterator/metafunctions/key_of.html
@@ -0,0 +1,139 @@
+
+
+
+key_of
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      Boost C++ LibrariesHomeLibrariesPeopleFAQMore
      
+
      
+
      
+PrevUpHomeNext
+
      
+
      
+
      
+key_of
+
      
+
      
+
+          Description
+        
      
+
      
+          Returns the key type associated with the element referenced by an associative
+          iterator.
+        
      
+
      
+
+          Synopsis
+        
      
+
      template<
+    typename I
+    >
+struct key_of
+{
+    typedef unspecified type;
+};
+
      
+
      
+
      Table 1.20. Parameters
      
+
      
+++++
+
+
+
+
+
+
+
+
+
+
+
      




      
+              
      
+                Parameter
+              
      
+                    		
+              
      
+                Requirement
+              
      
+                    		
+              
      
+                Description
+              
      
+              
      
+              
      
+                I
+              
      
+                    		
+              
      
+                Model of Associative
+                Iterator
+              
      
+                    		
+              
      
+                Operation's argument
+              
      
+              
      
+
      
+
      
+
+          Expression
+          Semantics
+        
      
+
      result_of::key_of<I>::type
+
      
+
      
+          Return type: Any type
+        
      
+
      
+          Semantics: Returns the key type associated
+          with the element referenced by an associative iterator I.
+        
      
+
      
+
+          Header
+        
      
+
      #include <boost/fusion/iterator/key_of.hpp>
+#include <boost/fusion/include/key_of.hpp>
+
      
+
      
+
+          Example
+        
      
+
      typedef map<pair<float,int> > vec;
+typedef result_of::begin<vec>::type first;
+
+BOOST_MPL_ASSERT((boost::is_same<result_of::key_of<first>::type, float>));
+
      
+
      
+
+
+
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+      Schwinger
      
+        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)
+      
      
+
      
+
      
+
      
+PrevUpHomeNext
+
      
+
+
diff --git a/doc/html/fusion/iterator/metafunctions/next.html b/doc/html/fusion/iterator/metafunctions/next.html
index c5d8abf4..323853bd 100644
--- a/doc/html/fusion/iterator/metafunctions/next.html
+++ b/doc/html/fusion/iterator/metafunctions/next.html
@@ -1,10 +1,18 @@
 
 
-
+
 next
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,13 +42,30 @@
 
           Description
         
      
+=======
+
      
+
      
+next
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Returns the type of the next iterator in a sequence.
         
      
+<<<<<<< .working
 
      
 
           Synposis
         
      
+=======
+
      
+
+          Synposis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I
     >
@@ -49,8 +75,33 @@
 };
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.13. Parameters
      
 
+=======
+
      Table 1.13. Parameters
      
+=======
+
      Table 1.14. Parameters
      
+=======
+
      Table 1.14. Parameters
      
+=======
+
      Table 1.14. Parameters
      
+=======
+
      Table 1.14. Parameters
      
+=======
+
      Table 1.14. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -82,9 +133,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      result_of::next<I>::type
@@ -97,26 +154,42 @@
           Semantics: Returns an iterator to the
           next element in the sequence after I.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/include/next.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
         
      
 
      typedef vector<int,double> vec;
 typedef result_of::next<result_of::begin<vec>::type>::type second;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,double> vec;
+typedef result_of::next<result_of::begin<vec>::type>::type second;
+>>>>>>> .merge-right.r57125
 
 BOOST_MPL_ASSERT((boost::is_same<result_of::value_of<second>::type, double>));
 
      
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/metafunctions/prior.html b/doc/html/fusion/iterator/metafunctions/prior.html
index 23b46481..6ca37f01 100644
--- a/doc/html/fusion/iterator/metafunctions/prior.html
+++ b/doc/html/fusion/iterator/metafunctions/prior.html
@@ -1,10 +1,18 @@
 
 
-
+
 prior
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,13 +42,30 @@
 
           Description
         
      
+=======
+
      
+
      
+prior
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Returns the type of the previous iterator in a sequence.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I
     >
@@ -49,8 +75,33 @@
 };
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.14. Parameters
      
 
+=======
+
      Table 1.14. Parameters
      
+=======
+
      Table 1.15. Parameters
      
+=======
+
      Table 1.15. Parameters
      
+=======
+
      Table 1.15. Parameters
      
+=======
+
      Table 1.15. Parameters
      
+=======
+
      Table 1.15. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -82,9 +133,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      result_of::prior<I>::type
@@ -97,19 +154,35 @@
           Semantics: Returns an iterator to the
           previous element in the sequence before I.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/prior.hpp>
 #include <boost/fusion/include/prior.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
         
      
 
      typedef vector<int,double> vec;
 typedef result_of::next<result_of::begin<vec>::type>::type second;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,double> vec;
+typedef result_of::next<result_of::begin<vec>::type>::type second;
+>>>>>>> .merge-right.r57125
 
 BOOST_MPL_ASSERT((boost::is_same<result_of::value_of<second>::type, double>));
 
@@ -119,7 +192,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/metafunctions/value_of.html b/doc/html/fusion/iterator/metafunctions/value_of.html
index 18d8d8a1..806eb22e 100644
--- a/doc/html/fusion/iterator/metafunctions/value_of.html
+++ b/doc/html/fusion/iterator/metafunctions/value_of.html
@@ -1,10 +1,18 @@
 
 
-
+
 value_of
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -22,6 +30,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,13 +42,30 @@
 
           Description
         
      
+=======
+
      
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Returns the type stored at the position of an iterator.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I
     >
@@ -49,8 +75,33 @@
 };
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.11. Parameters
      
 
+=======
+
      Table 1.11. Parameters
      
+=======
+
      Table 1.12. Parameters
      
+=======
+
      Table 1.12. Parameters
      
+=======
+
      Table 1.12. Parameters
      
+=======
+
      Table 1.12. Parameters
      
+=======
+
      Table 1.12. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -82,9 +133,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      result_of::value_of<I>::type
@@ -96,13 +153,21 @@
           Semantics: Returns the type stored in
           a sequence at iterator position I.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/include/value_of.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
@@ -111,6 +176,16 @@
 typedef result_of::begin<vec>::type first;
 typedef result_of::next<first>::type second;
 typedef result_of::next<second>::type third;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,int&,const int&> vec;
+typedef result_of::begin<vec>::type first;
+typedef result_of::next<first>::type second;
+typedef result_of::next<second>::type third;
+>>>>>>> .merge-right.r57125
 
 BOOST_MPL_ASSERT((boost::is_same<result_of::value_of<first>::type, int>));
 BOOST_MPL_ASSERT((boost::is_same<result_of::value_of<second>::type, int&>));
@@ -119,7 +194,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/metafunctions/value_of_data.html b/doc/html/fusion/iterator/metafunctions/value_of_data.html
new file mode 100644
index 00000000..d14d922e
--- /dev/null
+++ b/doc/html/fusion/iterator/metafunctions/value_of_data.html
@@ -0,0 +1,140 @@
+
+
+
+value_of_data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      Boost C++ LibrariesHomeLibrariesPeopleFAQMore
      
+
      
+
      
+PrevUpHomeNext
+
      
+
      
+
      
+
      
+
+          Description
+        
      
+
      
+          Returns the type of the data property associated with the element referenced
+          by an associative iterator references.
+        
      
+
      
+
+          Synopsis
+        
      
+
      template<
+    typename I
+    >
+struct value_of_data
+{
+    typedef unspecified type;
+};
+
      
+
      
+
      Table 1.21. Parameters
      
+
      
+++++
+
+
+
+
+
+
+
+
+
+
+
      




      
+              
      
+                Parameter
+              
      
+                    		
+              
      
+                Requirement
+              
      
+                    		
+              
      
+                Description
+              
      
+              
      
+              
      
+                I
+              
      
+                    		
+              
      
+                Model of Associative
+                Iterator
+              
      
+                    		
+              
      
+                Operation's argument
+              
      
+              
      
+
      
+
      
+
+          Expression
+          Semantics
+        
      
+
      result_of::value_of_data<I>::type
+
      
+
      
+          Return type: Any type
+        
      
+
      
+          Semantics: Returns the type of the data
+          property associated with the element referenced by an associative iterator
+          I.
+        
      
+
      
+
+          Header
+        
      
+
      #include <boost/fusion/iterator/value_of_data.hpp>
+#include <boost/fusion/include/value_of_data.hpp>
+
      
+
      
+
+          Example
+        
      
+
      typedef map<pair<float,int> > vec;
+typedef result_of::begin<vec>::type first;
+
+BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<first>::type, int>));
+
      
+
      
+
+
+
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+      Schwinger
      
+        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)
+      
      
+
      
+
      
+
      
+PrevUpHomeNext
+
      
+
+
diff --git a/doc/html/fusion/iterator/operator.html b/doc/html/fusion/iterator/operator.html
index ebc0f2c0..55d56832 100644
--- a/doc/html/fusion/iterator/operator.html
+++ b/doc/html/fusion/iterator/operator.html
@@ -3,12 +3,21 @@
 
 Operator
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
+<<<<<<< .working
 
 
+=======
+
+
+>>>>>>> .merge-right.r57242
 
 
 
@@ -21,7 +30,7 @@
 
      
 
      
 
      
-PrevUpHomeNext
+PrevUpHomeNext
 
      
 
      
 
      
@@ -54,7 +63,7 @@
 
      
 
      
 
      
-PrevUpHomeNext
+PrevUpHomeNext
 
      
 
 
diff --git a/doc/html/fusion/iterator/operator/operator_equality.html b/doc/html/fusion/iterator/operator/operator_equality.html
index e58e17d5..cb798255 100644
--- a/doc/html/fusion/iterator/operator/operator_equality.html
+++ b/doc/html/fusion/iterator/operator/operator_equality.html
@@ -1,11 +1,19 @@
 
 
-
+
  Operator
         ==
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -31,6 +39,7 @@
  Operator
         ==
+<<<<<<< .working
 
      
 
      
 
      
@@ -38,13 +47,27 @@
 
           Description
         
+=======
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Compares 2 iterators for equality.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I,
     typename J
@@ -52,8 +75,33 @@
 unspecified operator==(I const& i, J const& i);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.9. Parameters
      
 
+=======
+
      Table 1.9. Parameters
      
+=======
+
      Table 1.10. Parameters
      
+=======
+
      Table 1.10. Parameters
      
+=======
+
      Table 1.10. Parameters
      
+=======
+
      Table 1.10. Parameters
      
+=======
+
      Table 1.10. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -83,9 +131,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      i == j
@@ -98,17 +152,24 @@
           where I and J are the types of i
           and j respectively.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/include/equal_to.hpp>
 
      
 
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/operator/operator_inequality.html b/doc/html/fusion/iterator/operator/operator_inequality.html
index 83600171..0a33f206 100644
--- a/doc/html/fusion/iterator/operator/operator_inequality.html
+++ b/doc/html/fusion/iterator/operator/operator_inequality.html
@@ -1,11 +1,19 @@
 
 
-
+
  Operator
         !=
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -30,6 +38,7 @@
  Operator
         !=
+<<<<<<< .working
 
      
 
      
 
@@ -37,13 +46,27 @@
 
           Description
         
+=======
+
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Compares 2 iterators for inequality.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I,
     typename J
@@ -51,8 +74,33 @@
 unspecified operator==(I const& i, J const& i);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.10. Parameters
      
 
+=======
+
      Table 1.10. Parameters
      
+=======
+
      Table 1.11. Parameters
      
+=======
+
      Table 1.11. Parameters
      
+=======
+
      Table 1.11. Parameters
      
+=======
+
      Table 1.11. Parameters
      
+=======
+
      Table 1.11. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -82,9 +130,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      
@@ -95,17 +149,24 @@
           where I and J are the types of i
           and j respectively.
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/include/equal_to.hpp>
 
      
 
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/iterator/operator/operator_unary_star.html b/doc/html/fusion/iterator/operator/operator_unary_star.html
index bcbb00d1..75c6c887 100644
--- a/doc/html/fusion/iterator/operator/operator_unary_star.html
+++ b/doc/html/fusion/iterator/operator/operator_unary_star.html
@@ -1,11 +1,19 @@
 
 
-
+
  Operator
         *
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
  Operator
         *
+<<<<<<< .working
 
      
 
      
 
@@ -37,21 +46,60 @@
 
           Description
         
+=======
+
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           Dereferences an iterator.
         
      
+<<<<<<< .working
 
      
 
           Synopsis
         
      
+=======
+
      
+
+          Synopsis
+        
      
+>>>>>>> .merge-right.r57125
 
      template<
     typename I
     >
 typename result_of::deref<I>::type operator*(unspecified<I> const& i);
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      Table 1.8. Parameters
      
 
+=======
+
      Table 1.8. Parameters
      
+=======
+
      Table 1.9. Parameters
      
+=======
+
      Table 1.9. Parameters
      
+=======
+
      Table 1.9. Parameters
      
+=======
+
      Table 1.9. Parameters
      
+=======
+
      Table 1.9. Parameters
      
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
      
+>>>>>>> .merge-right.r57125
 @@ -83,9 +131,15 @@
 
      
 
 

 
      
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      *i
@@ -97,18 +151,33 @@
 
      
           Semantics: Equivalent to deref(i).
         
      
+<<<<<<< .working
 
      
 
           Header
         
      
+=======
+
      
+
+          Header
+        
      
+>>>>>>> .merge-right.r57125
 
      #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/include/deref.hpp>
 
      
+<<<<<<< .working
 
      
 
           Example
         
      
 
      typedef vector<int,int&> vec;
+=======
+
      
+
+          Example
+        
      
+
      typedef vector<int,int&> vec;
+>>>>>>> .merge-right.r57125
 
 int i(0);
 vec v(1,i);
@@ -119,7 +188,7 @@
 
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/notes.html b/doc/html/fusion/notes.html
index a713a936..3897a977 100644
--- a/doc/html/fusion/notes.html
+++ b/doc/html/fusion/notes.html
@@ -1,11 +1,20 @@
 
 
-
+
 Notes
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
 
+=======
+
+
+>>>>>>> .merge-right.r58299
 
 
@@ -23,6 +32,7 @@
 
      
 PrevUpHomeNext
 
      
+<<<<<<< .working
 
      
 
      
 
      
@@ -33,6 +43,15 @@
 
      
 
       Recursive Inlined
+=======
+
      
+
      
+
      
+
+      Recursive Inlined
+>>>>>>> .merge-right.r57125
       Functions
     
      
 
      
@@ -44,20 +63,34 @@
       deeply recursive (up to a certain compiler limit of course). Compile time complexity
       remains linear.
     
      
+<<<<<<< .working
 
      
 
       Overloaded Functions
     
      
+=======
+
      
+
+      Overloaded Functions
+    
      
+>>>>>>> .merge-right.r57125
 
      
       Associative sequences use function overloading to implement membership testing
       and type associated key lookup. This amounts to constant runtime and amortized
       constant compile time complexities. There is an overloaded function, f(k), for each key type k. The compiler chooses the appropriate function
       given a key, k.
     
      
+<<<<<<< .working
 
      
 
       Tag Dispatching
     
      
+=======
+
      
+
+      Tag Dispatching
+    
      
+>>>>>>> .merge-right.r57125
 
      
       Tag dispatching is a generic programming technique for selecting template specializations.
       There are typically 3 components involved in the tag dispatching mechanism:
@@ -105,10 +138,17 @@
         to provide an implementation for each tag type
       
 
      
+<<<<<<< .working
 
      
 
       Extensibility
     
      
+=======
+
      
+
+      Extensibility
+    
      
+>>>>>>> .merge-right.r57125
 
      
       Unlike MPL, there
       is no extensibe sequence concept in fusion. This does not mean that Fusion
@@ -140,10 +180,17 @@
       holds a reference to the original sequence plus the appended data --making
       it very cheap to pass around.
     
      
+<<<<<<< .working
 
      
 
       Element Conversion
     
      
+=======
+
      
+
+      Element Conversion
+    
      
+>>>>>>> .merge-right.r57125
 
      
       Functions that take in elemental values to form sequences (e.g. make_list) convert their arguments
       to something suitable to be stored as a sequence element. In general, the element
@@ -163,7 +210,31 @@
     
      
 
      
       Array arguments are deduced to reference to const types. For example
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
       [10]
+=======
+      [10]
+=======
+      [10]
+=======
+      [10]
+=======
+      [10]
+=======
+      [10]
+=======
+      [10]
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
       :
     
      
 
      make_list("Donald", "Daisy")
@@ -191,10 +262,17 @@
     
      
 
      list<void (*)(int)>
 
      
+<<<<<<< .working
 
      
 
       boost::ref
     
      
+=======
+
      
+
+      boost::ref
+    
      
+>>>>>>> .merge-right.r57125
 
      
       Fusion's generation functions (e.g. make_list) by default stores the element
       types as plain non-reference types. Example:
@@ -232,7 +310,31 @@
     
      
 
      
 
      
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
      [10] 
+=======
+
      [10] 
+=======
+
      [10] 
+=======
+
      [10] 
+=======
+
      [10] 
+=======
+
      [10] 
+=======
+
      [10] 
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
           Note that the type of a string literal is an array of const characters,
           not const char*. To get make_list to create a list with an element of a non-const
           array type one must use the ref
@@ -242,7 +344,7 @@
 
      
 
-
      
 
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
      Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
      
         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)
diff --git a/doc/html/fusion/organization.html b/doc/html/fusion/organization.html
index ea3a451d..2b14dbe0 100644
--- a/doc/html/fusion/organization.html
+++ b/doc/html/fusion/organization.html
@@ -1,11 +1,20 @@
 
 
-
+
 Organization
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
 
+=======
+
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -37,10 +46,17 @@
 
      
       The library is organized in three layers:
     
      
+<<<<<<< .working
 
      
 
       Layers
     
      
+=======
+
      
+
+      Layers
+    
      
+>>>>>>> .merge-right.r57125
 
      
 
      
         
      
@@ -68,12 +84,21 @@
       The library is header-only. There is no need to build object files to link
       against.
     
      
+<<<<<<< .working
 
      
 
       Directory
     
      
 
        
 
      • 
+=======
+
        
+
+      Directory
+    
        
+
          
+
        • 
+>>>>>>> .merge-right.r57125
         tuple
       
          • 
 
        • 
@@ -189,10 +214,17 @@
         support
       
          • 
 
        
+<<<<<<< .working
 
        
 
       Example
     
        
+=======
+
        
+
+      Example
+    
        
+>>>>>>> .merge-right.r57125
 
        
       If, for example, you want to use list,
       depending on the granularity that you desire, you may do so by including one
@@ -204,13 +236,42 @@
 #include <boost/fusion/include/list.hpp>
 
 
        
+<<<<<<< .working
       The first includes all containers The second includes only list
       [4]
+=======
+      The first includes all containers The second includes only list
+      [4]
+>>>>>>> .merge-right.r57125
       .
     
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        [4] 
+=======
+
        [4] 
+=======
+
        [4] 
+=======
+
        [4] 
+=======
+
        [4] 
+=======
+
        [4] 
+=======
+
        [4] 
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
           Modules may contain smaller components. Header file information for each
           component will be provided as part of the component's documentation.
         
        
@@ -218,7 +279,7 @@
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/preface.html b/doc/html/fusion/preface.html
index 077f198e..74fbcd22 100644
--- a/doc/html/fusion/preface.html
+++ b/doc/html/fusion/preface.html
@@ -1,12 +1,22 @@
 
 
-
+
 Preface
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
 
 
+=======
+
+
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -47,10 +57,17 @@
 
        
       
        
 
        
+<<<<<<< .working
 
        
 
       Description
     
        
+=======
+
        
+
+      Description
+    
        
+>>>>>>> .merge-right.r57125
 
        
       Fusion is a library for working with heterogenous collections of data, commonly
       referred to as tuples. A set of containers (vector, list, set and map) is provided,
@@ -65,10 +82,17 @@
       It is named "fusion" because the library is a "fusion"
       of compile time metaprogramming with runtime programming.
     
        
+<<<<<<< .working
 
        
 
       Motivation
     
        
+=======
+
        
+
+      Motivation
+    
        
+>>>>>>> .merge-right.r57125
 
        
       Tuples are powerful beasts. After having developed two significant projects
       (Spirit and Phoenix)
@@ -91,17 +115,49 @@
       had an adhoc collection of tuple manipulation and traversal routines. It was
       an instant AHA! moment.
     
        
+<<<<<<< .working
 
        
 
       How to use this manual
     
        
+=======
+
        
+
+      How to use this manual
+    
        
+>>>>>>> .merge-right.r57125
 
        
       Some icons are used to mark certain topics indicative of their relevance. These
       icons precede some text to indicate:
     
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.1. Icons
        
 
+=======
+
        Table 1.1. Icons
        
+=======
+
        Table 1.1. Icons
        
+=======
+
        Table 1.1. Icons
        
+=======
+
        Table 1.1. Icons
        
+=======
+
        Table 1.1. Icons
        
+=======
+
        Table 1.1. Icons
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -172,10 +228,17 @@
       tool. QuickBook can be found in the Boost
       Tools.
     
        
+<<<<<<< .working
 
        
 
       Support
     
        
+=======
+
        
+
+      Support
+    
        
+>>>>>>> .merge-right.r57125
 
        
       Please direct all questions to Spirit's mailing list. You can subscribe to
       the Spirit
@@ -189,7 +252,7 @@
 
 
        
 
 

        
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/quick_start.html b/doc/html/fusion/quick_start.html
index 61c148ec..27b17111 100644
--- a/doc/html/fusion/quick_start.html
+++ b/doc/html/fusion/quick_start.html
@@ -1,11 +1,20 @@
 
 
-
+
 Quick Start
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
 
+=======
+
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -36,16 +45,26 @@
       is more or less a synonym for fusion's vector.
     
        
 
        
+<<<<<<< .working
       For starters, we shall include all of Fusion's Sequence(s)
       [2]
+=======
+      For starters, we shall include all of Fusion's Sequence(s)
+      [2]
+>>>>>>> .merge-right.r57125
       :
     
        
 
        #include <boost/fusion/sequence.hpp>
 #include <boost/fusion/include/sequence.hpp>
 
        
 
        
+<<<<<<< .working
       Let's begin with a vector
       [3]
+=======
+      Let's begin with a vector
+      [3]
+>>>>>>> .merge-right.r57125
       :
     
        
 
        vector<int, char, std::string> stuff(1, 'x', "howdy");
@@ -61,9 +80,15 @@
       there. You can do a lot more with Fusion vector or tuple.
       Let's see some examples.
     
        
+<<<<<<< .working
 
        
 
       Print the vector
+=======
+
        
+
+      Print the vector
+>>>>>>> .merge-right.r57125
       as XML
     
        
 
        
@@ -116,10 +141,17 @@
       print_xml, you can use it to
       print just about any Fusion Sequence.
     
        
+<<<<<<< .working
 
        
 
       Print only pointers
     
        
+=======
+
        
+
+      Print only pointers
+    
        
+>>>>>>> .merge-right.r57125
 
        
       Let's get a little cleverer. Say we wish to write a generic
       function that takes in an arbitrary sequence and XML prints only those elements
@@ -148,10 +180,17 @@
 
        
       Easy, right?
     
        
+<<<<<<< .working
 
        
 
       Associative tuples
     
        
+=======
+
        
+
+      Associative tuples
+    
        
+>>>>>>> .merge-right.r57125
 
        
       Ok, moving on...
     
        
@@ -220,10 +259,17 @@
       regardless if it is a person,
       a dog or a whole alternate_universe.
     
        
+<<<<<<< .working
 
        
 
       Tip of the Iceberg
     
        
+=======
+
        
+
+      Tip of the Iceberg
+    
        
+>>>>>>> .merge-right.r57125
 
        
       And... we've barely scratched the surface! You can compose and expand the data
       structures, remove elements from the structures, find specific data types,
@@ -232,21 +278,71 @@
     
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        [2] 
+=======
+
        [2] 
+=======
+
        [2] 
+=======
+
        [2] 
+=======
+
        [2] 
+=======
+
        [2] 
+=======
+
        [2] 
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
           There are finer grained header files available if you wish to have more
           control over which components to include (see section Orgainization
           for details).
         
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        [3] 
           Unless otherwise noted, components are in namespace boost::fusion.
           For the sake of simplicity, code in this quick start implies using directives for the fusion components
+=======
+
        [3] 
+=======
+
        [3] 
+=======
+
        [3] 
+=======
+
        [3] 
+=======
+
        [3] 
+=======
+
        [3] 
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+          Unless otherwise noted, components are in namespace boost::fusion.
+          For the sake of simplicity, code in this quick start implies using directives for the fusion components
+>>>>>>> .merge-right.r57125
           we will be using.
         
        
 
        
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/references.html b/doc/html/fusion/references.html
index f2ae59a4..ac36add6 100644
--- a/doc/html/fusion/references.html
+++ b/doc/html/fusion/references.html
@@ -3,7 +3,11 @@
 
 References
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/sequence.html b/doc/html/fusion/sequence.html
index ecd22443..40e81ed7 100644
--- a/doc/html/fusion/sequence.html
+++ b/doc/html/fusion/sequence.html
@@ -3,10 +3,18 @@
 
 Sequence
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57242
 
 
 
@@ -20,7 +28,7 @@
 
        
 
        
 
        
-PrevUpHomeNext
+PrevUpHomeNext
 
        
 
        
 
        
@@ -62,10 +70,17 @@
       Sequence have an associated Iterator
       type that can be used to iterate through the Sequence's elements.
     
        
+<<<<<<< .working
 
        
 
       Header
     
        
+=======
+
        
+
+      Header
+    
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/sequence.hpp>
 #include <boost/fusion/include/sequence.hpp>
 
        
@@ -81,7 +96,7 @@
 
        
 
        
 
        
-PrevUpHomeNext
+PrevUpHomeNext
 
        
 
 
diff --git a/doc/html/fusion/sequence/concepts.html b/doc/html/fusion/sequence/concepts.html
index 7cff49ef..fb9cc64c 100644
--- a/doc/html/fusion/sequence/concepts.html
+++ b/doc/html/fusion/sequence/concepts.html
@@ -3,7 +3,11 @@
 
 Concepts
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -43,10 +47,17 @@
 
        
         Fusion Sequences are organized into a hierarchy of concepts.
       
        
+<<<<<<< .working
 
        
 
         Traversal
       
        
+=======
+
        
+
+        Traversal
+      
        
+>>>>>>> .merge-right.r57125
 
        
         Fusion's sequence traversal related concepts parallel Fusion's Iterator
         Concepts. Bidirectional
         Sequence. These concepts pertain to sequence traversal.
       
        
+<<<<<<< .working
 
        
 
         Associativity
       
        
+=======
+
        
+
+        Associativity
+      
        
+>>>>>>> .merge-right.r57125
 
        
         The Associative
diff --git a/doc/html/fusion/sequence/concepts/associative_sequence.html b/doc/html/fusion/sequence/concepts/associative_sequence.html
index 1c4f7d02..91cc0c21 100644
--- a/doc/html/fusion/sequence/concepts/associative_sequence.html
+++ b/doc/html/fusion/sequence/concepts/associative_sequence.html
@@ -4,7 +4,11 @@
 Associative
         Sequence
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 Associative
         Sequence
+<<<<<<< .working
 
        
 
        
 
@@ -37,17 +42,19 @@
 
           Description
         
+=======
+
+
        
+
+          Description
+        
        
+>>>>>>> .merge-right.r57125
 
        
           An Associative Sequence allows efficient retrieval of elements based on
           keys. Like associative sequences in MPL,
           and unlike associative containers in STL,
           Fusion associative sequences have no implied ordering relation. Instead,
-          type identity is used to impose an equivalence relation on keys, and the
-          order in which sequence elements are traversed during iteration is left
-          unspecified. In addition, unlike STL,
-          Associative Sequences have mutable iterators. This is due to the fact that
-          there is no associated ordering relation and the runtime value of the keys
-          themselves do not have any effect on the associativity of the sequence.
+          type identity is used to impose an equivalence relation on keys.
         
        
 
        
 
        Notation
        
@@ -74,9 +81,15 @@
             
        
 
 
        
+<<<<<<< .working
 
        
 
           Valid
+=======
+
        
+
+          Valid
+>>>>>>> .merge-right.r57125
           Expressions
         
        
 
        
@@ -151,9 +164,15 @@
 
        
         
 
        
+<<<<<<< .working
 
        
 
           Result
+=======
+
        
+
+          Result
+>>>>>>> .merge-right.r57125
           Type Expressions
         
        
 
        
@@ -205,11 +224,20 @@
           most cases, this is a reference. Hence, there is no way to know the exact
           element type using result_of::at_key<S, K>.The element at K
           may actually be a reference to begin with. For this purpose, you can use
+<<<<<<< .working
           result_of::value_at_key<S, N>.
         
        
 
           Expression
+=======
+          result_of::value_at_key<S, N>.
+        
        
+
+
        
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
        
 
 
        
@@ -250,6 +278,7 @@
 
        
 
 
        
+<<<<<<< .working
 
        
 
           Models
@@ -257,6 +286,15 @@
 
        
 
diff --git a/doc/html/fusion/sequence/concepts/bidirectional_sequence.html b/doc/html/fusion/sequence/concepts/bidirectional_sequence.html
index 7df699ee..143941be 100644
--- a/doc/html/fusion/sequence/concepts/bidirectional_sequence.html
+++ b/doc/html/fusion/sequence/concepts/bidirectional_sequence.html
@@ -4,7 +4,11 @@
 Bidirectional
         Sequence
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 Bidirectional
         Sequence
+<<<<<<< .working
 
        
@@ -38,6 +43,13 @@
 Description
+=======
+
+
        
+
+          Description
+        
        
+>>>>>>> .merge-right.r57125
 
        
           A Bidirectional Sequence is a Forward
@@ -45,9 +57,15 @@
         Iterator">Bidirectional
           Iterator.
         
        
+<<<<<<< .working
 
        
 
           Refinement
+=======
+
        
+
+          Refinement
+>>>>>>> .merge-right.r57125
           of
         
        
@@ -75,9 +93,15 @@
             
        
+<<<<<<< .working
 
        
 
           Valid
+=======
+
        
+
+          Valid
+>>>>>>> .merge-right.r57125
           Expressions
         
        
@@ -170,9 +194,15 @@
 
        
 
 
 
 
 
           
         
 
 
 
 
        
         
 
        
+<<<<<<< .working
 
        
 
           Result
+=======
+
        
+
+          Result
+>>>>>>> .merge-right.r57125
           Type Expressions
         
        
 
        
@@ -215,9 +245,15 @@
 
        
 
 
        
+<<<<<<< .working
 
        
 
           Expression
+=======
+
        
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
        
 
        
@@ -248,6 +284,7 @@
                 
      		
 
      
 
      
+<<<<<<< .working
 
      
 
           Models
@@ -259,6 +296,19 @@
 
    • reverse_view
      • 
 
    • 
 iterator_range
+=======
+
      
+
+          Models
+        
      
+
        
+
      • std::pair
        • 
+
      • boost::array
        • 
+
      • vector
        • 
+
      • reverse_view
        • 
+
      • 
+iterator_range
+>>>>>>> .merge-right.r57125
             (where adapted sequence is a Bidirectional Sequence)
           
        • 
 
      • 
diff --git a/doc/html/fusion/sequence/concepts/forward_sequence.html b/doc/html/fusion/sequence/concepts/forward_sequence.html
index 75785533..fd9580ad 100644
--- a/doc/html/fusion/sequence/concepts/forward_sequence.html
+++ b/doc/html/fusion/sequence/concepts/forward_sequence.html
@@ -4,7 +4,11 @@
 Forward
         Sequence
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -30,6 +34,7 @@
 Forward
         Sequence
+<<<<<<< .working
 
      • 
 
      
 
      
@@ -37,6 +42,13 @@
 
           Description
         
+=======
+
      
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           A Forward Sequence is a Sequence whose elements are arranged in a definite
           order. The ordering is guaranteed not to change from iteration to iteration.
@@ -65,9 +77,15 @@
             
      
 
 
      
+<<<<<<< .working
 
      
 
           Valid
+=======
+
      
+
+          Valid
+>>>>>>> .merge-right.r57125
           Expressions
         
      
 
      
@@ -186,9 +204,15 @@
 
      
       
 
      
+<<<<<<< .working
 
      
 
           Result
+=======
+
      
+
+          Result
+>>>>>>> .merge-right.r57125
           Type Expressions
         
      
 
      
@@ -247,9 +271,15 @@
 
      
 
 
      
+<<<<<<< .working
 
      
 
           Expression
+=======
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
 
      
@@ -311,10 +341,17 @@
 
      
 
 
      
+<<<<<<< .working
 
      
 
           Invariants
         
      
+=======
+
      
+
+          Invariants
+        
      
+>>>>>>> .merge-right.r57125
 
      
           For any Forward Sequence s the following invariants always hold:
         
      
@@ -337,6 +374,7 @@
             will access its elements in the same order.
           
 
+<<<<<<< .working
 
      
 
           Models
@@ -356,6 +394,27 @@
 
    • transform_view
      • 
 
    • reverse_view
      • 
 
    • zip_view
      • 
+=======
+
      
+
+          Models
+        
      
+
      
 
 
diff --git a/doc/html/fusion/sequence/concepts/random_access_sequence.html b/doc/html/fusion/sequence/concepts/random_access_sequence.html
index 8f7a7a90..035dda7b 100644
--- a/doc/html/fusion/sequence/concepts/random_access_sequence.html
+++ b/doc/html/fusion/sequence/concepts/random_access_sequence.html
@@ -4,7 +4,11 @@
 Random
         Access Sequence
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 Random
         Access Sequence
+<<<<<<< .working
 
      
@@ -38,6 +43,13 @@
 Description
+=======
+
+
      
+
+          Description
+        
      
+>>>>>>> .merge-right.r57125
 
      
           A Random Access Sequence is a Bidirectional
@@ -46,9 +58,15 @@
           Access Iterator. It guarantees constant time access to arbitrary
           sequence elements.
         
      
+<<<<<<< .working
 
      
 
           Refinement
+=======
+
      
+
+          Refinement
+>>>>>>> .merge-right.r57125
           of
         
      
@@ -82,9 +100,15 @@
             
      
+<<<<<<< .working
 
      
 
           Valid
+=======
+
      
+
+          Valid
+>>>>>>> .merge-right.r57125
           Expressions
         
      
@@ -177,9 +201,15 @@
 
      
 
 
 
 
 
           
         
 
 
 
 
      
       
 
      
+<<<<<<< .working
 
      
 
           Result
+=======
+
      
+
+          Result
+>>>>>>> .merge-right.r57125
           Type Expressions
         
      
 
      
@@ -238,11 +268,20 @@
           most cases, this is a reference. Hence, there is no way to know the exact
           element type using result_of::at<S, N>.The element at N
           may actually be a reference to begin with. For this purpose, you can use
+<<<<<<< .working
           result_of::value_at<S, N>.
         
      
 
           Expression
+=======
+          result_of::value_at<S, N>.
+        
      
+
+
      
+
+          Expression
+>>>>>>> .merge-right.r57125
           Semantics
         
      
@@ -273,6 +312,7 @@
                 
      
 
 
 
 
      
+<<<<<<< .working
 
      
 
           Models
@@ -284,6 +324,19 @@
 
    • reverse_view
      • 
 
    • 
 iterator_range
+=======
+
      
+
+          Models
+        
      
+
        
+
      • std::pair
        • 
+
      • boost::array
        • 
+
      • vector
        • 
+
      • reverse_view
        • 
+
      • 
+iterator_range
+>>>>>>> .merge-right.r57125
             (where adapted sequence is a Random Access Sequence)
           
        • 
 
      • 
diff --git a/doc/html/fusion/sequence/intrinsic.html b/doc/html/fusion/sequence/intrinsic.html
index 50577a23..9ec52ed8 100644
--- a/doc/html/fusion/sequence/intrinsic.html
+++ b/doc/html/fusion/sequence/intrinsic.html
@@ -1,10 +1,18 @@
 
 
-
+
 Intrinsic
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -38,22 +46,60 @@
         Intrinsic form the essential interface of every Fusion Sequence.
         STL
         counterparts of these functions are usually implemented as member functions.
+<<<<<<< .working
         Intrinsic functions, unlike Algorithms,
         are not generic across the full Sequence
         repertoire. They need to be implemented for each Fusion Sequence
         [5]
+=======
+        Intrinsic functions, unlike Algorithms,
+        are not generic across the full Sequence
+        repertoire. They need to be implemented for each Fusion Sequence
+        [5]
+>>>>>>> .merge-right.r57125
         .
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/include/intrinsic.hpp>
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        [5] 
+=======
+
        [5] 
+=======
+
        [5] 
+=======
+
        [5] 
+=======
+
        [5] 
+=======
+
        [5] 
+=======
+
        [5] 
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
             In practice, many of intrinsic functions have default implementations
             that will work in majority of cases
           
        
@@ -61,7 +107,7 @@
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions.html b/doc/html/fusion/sequence/intrinsic/functions.html
index e2b94ae0..7641faa5 100644
--- a/doc/html/fusion/sequence/intrinsic/functions.html
+++ b/doc/html/fusion/sequence/intrinsic/functions.html
@@ -3,7 +3,11 @@
 
 Functions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/sequence/intrinsic/functions/at.html b/doc/html/fusion/sequence/intrinsic/functions/at.html
index a71a663e..d453246b 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/at.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/at.html
@@ -1,10 +1,18 @@
 
 
-
+
 at
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the N-th element from the beginning of the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename N, typename Sequence>
 typename result_of::at<Sequence, N>::type
@@ -49,8 +107,33 @@
 at(Sequence const& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -98,8 +181,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        at<N>(seq);
@@ -124,15 +232,65 @@
 
        deref(advance<N>(begin(s)))
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/include/at.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, int, int> v(1, 2, 3);
 assert(at<mpl::int_<1> >(v) == 2);
@@ -140,7 +298,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions/at_c.html b/doc/html/fusion/sequence/intrinsic/functions/at_c.html
index 71e1f788..7aef617d 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/at_c.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/at_c.html
@@ -1,10 +1,18 @@
 
 
-
+
 at_c
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the N-th element from the beginning of the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <int N, typename Sequence>
 typename result_of::at_c<Sequence, N>::type
@@ -49,8 +107,33 @@
 at_c(Sequence const& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -97,8 +180,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        at_c<N>(seq);
@@ -124,15 +232,65 @@
 
        deref(advance<N>(begin(s)))
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/intrinsic/at_c.hpp>
 #include <boost/fusion/include/at_c.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, int, int> v(1, 2, 3);
 assert(at_c<1>(v) == 2);
@@ -140,7 +298,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions/at_key.html b/doc/html/fusion/sequence/intrinsic/functions/at_key.html
index 1843dfaa..eba5d13b 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/at_key.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/at_key.html
@@ -1,10 +1,18 @@
 
 
-
+
 at_key
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the element associated with a Key from the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Key, typename Sequence>
 typename result_of::at_key<Sequence, Key>::type
@@ -49,8 +107,33 @@
 at_key(Sequence const& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -97,8 +180,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        at_key<Key>(seq);
@@ -120,15 +228,65 @@
             with Key.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/include/at_key.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        set<int, char, bool> s(1, 'x', true);
 assert(at_key<char>(s) == 'x');
@@ -136,7 +294,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions/back.html b/doc/html/fusion/sequence/intrinsic/functions/back.html
index 6a90422e..6179605e 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/back.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/back.html
@@ -1,10 +1,18 @@
 
 
-
+
 back
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the last element in the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Sequence>
 typename result_of::back<Sequence>::type
@@ -49,8 +107,33 @@
 back(Sequence const& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -84,8 +167,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        back(seq);
@@ -107,15 +215,65 @@
             in the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/intrinsic/back.hpp>
 #include <boost/fusion/include/back.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, int, int> v(1, 2, 3);
 assert(back(v) == 3);
@@ -123,7 +281,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions/begin.html b/doc/html/fusion/sequence/intrinsic/functions/begin.html
index 4d30a547..6b8b1232 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/begin.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/begin.html
@@ -1,10 +1,18 @@
 
 
-
+
 begin
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns an iterator pointing to the first element in the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Sequence>
 typename result_of::begin<Sequence>::type
@@ -49,8 +107,33 @@
 begin(Sequence const& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -84,13 +167,39 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        begin(seq);
 
        
 
        
+<<<<<<< .working
             Return type: Forward
             Iterator if seq
@@ -107,21 +216,94 @@
             is a Random
             Access Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           
        
+
        
 
        
             Semantics: Returns an iterator pointing
             to the first element in the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/include/begin.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, int, int> v(1, 2, 3);
 assert(deref(begin(v)) == 1);
@@ -129,7 +311,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions/empty.html b/doc/html/fusion/sequence/intrinsic/functions/empty.html
index 5c410a05..1c99ad21 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/empty.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/empty.html
@@ -1,10 +1,18 @@
 
 
-
+
 empty
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns a type convertible to bool
@@ -39,16 +72,66 @@
             the sequence is empty, else, evaluates to false.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Sequence>
 typename result_of::empty<Sequence>::type
 empty(Sequence const& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -82,8 +165,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        empty(seq);
@@ -96,15 +204,65 @@
             to false.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/include/empty.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, int, int> v(1, 2, 3);
 assert(empty(v) == false);
@@ -112,7 +270,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions/end.html b/doc/html/fusion/sequence/intrinsic/functions/end.html
index 1bcac953..30b5513f 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/end.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/end.html
@@ -1,10 +1,18 @@
 
 
-
+
 end
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns an iterator pointing to one element past the end of the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Sequence>
 typename result_of::end<Sequence>::type
@@ -49,8 +107,33 @@
 end(Sequence const& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -84,13 +167,39 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        end(seq);
 
        
 
        
+<<<<<<< .working
             Return type: Forward
             Iterator if seq
@@ -107,21 +216,94 @@
             is a Random
             Access Sequence.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           
        
+
        
 
        
             Semantics: Returns an iterator pointing
             to one element past the end of the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/include/end.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, int, int> v(1, 2, 3);
 assert(deref(prior(end(v))) == 3);
@@ -129,7 +311,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions/front.html b/doc/html/fusion/sequence/intrinsic/functions/front.html
index 78b58256..a7462fd9 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/front.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/front.html
@@ -1,10 +1,18 @@
 
 
-
+
 front
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the first element in the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Sequence>
 typename result_of::front<Sequence>::type
@@ -49,8 +107,33 @@
 front(Sequence const& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -84,8 +167,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        front(seq);
@@ -107,15 +215,65 @@
             in the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/include/front.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, int, int> v(1, 2, 3);
 assert(front(v) == 1);
@@ -123,7 +281,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions/has_key.html b/doc/html/fusion/sequence/intrinsic/functions/has_key.html
index b2bae525..e20c697c 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/has_key.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/has_key.html
@@ -1,10 +1,18 @@
 
 
-
+
 has_key
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,8 +38,33 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns a type convertible to bool
@@ -40,16 +73,66 @@
             to false.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Key, typename Sequence>
 typename result_of::has_key<Sequence, Key>::type
 has_key(Sequence const& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -96,8 +179,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        has_key<Key>(seq);
@@ -110,15 +218,65 @@
             associated with Key, else, evaluates to false.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/intrinsic/has_key.hpp>
 #include <boost/fusion/include/has_key.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        set<int, char, bool> s(1, 'x', true);
 assert(has_key<char>(s) == true);
@@ -126,7 +284,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions/size.html b/doc/html/fusion/sequence/intrinsic/functions/size.html
index b83dce43..1e38be8d 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/size.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/size.html
@@ -1,10 +1,18 @@
 
 
-
+
 size
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,24 +38,99 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns a type convertible to int
             that evaluates the number of elements in the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Sequence>
 typename result_of::size<Sequence>::type
 size(Sequence const& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -81,8 +164,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        size(seq);
@@ -95,15 +203,65 @@
             in the sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/include/size.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, int, int> v(1, 2, 3);
 assert(size(v) == 3);
@@ -111,7 +269,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/functions/swap.html b/doc/html/fusion/sequence/intrinsic/functions/swap.html
index 85d277c2..c0b834b4 100644
--- a/doc/html/fusion/sequence/intrinsic/functions/swap.html
+++ b/doc/html/fusion/sequence/intrinsic/functions/swap.html
@@ -1,10 +1,18 @@
 
 
-
+
 swap
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,22 +38,97 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Performs an element by element swap of the elements in 2 sequences.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<typename Seq1, typename Seq2>
 void swap(Seq1& seq1, Seq2& seq2);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -79,8 +162,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        swap(seq1, seq2);
@@ -98,8 +206,33 @@
             /sequence/intrinsic/swap.hpp>
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, std::string> v1(1, "hello"), v2(2, "world");
 swap(v1, v2);
@@ -109,7 +242,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions.html b/doc/html/fusion/sequence/intrinsic/metafunctions.html
index 8166d000..27b5f384 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions.html
@@ -3,7 +3,11 @@
 
 Metafunctions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/at.html b/doc/html/fusion/sequence/intrinsic/metafunctions/at.html
index c6409c32..e0d62e69 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/at.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/at.html
@@ -1,10 +1,18 @@
 
 
-
+
 at
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,17 +38,72 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
+<<<<<<< .working
             Returns the result type of at
             [6]
+=======
+            Returns the result type of at
+            [6]
+>>>>>>> .merge-right.r57125
             .
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<
     typename Seq,
@@ -51,8 +114,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.25. Parameters
        
 
+=======
+
        Table 1.25. Parameters
        
+=======
+
        Table 1.29. Parameters
        
+=======
+
        Table 1.29. Parameters
        
+=======
+
        Table 1.29. Parameters
        
+=======
+
        Table 1.29. Parameters
        
+=======
+
        Table 1.29. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -98,9 +186,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::at<Seq, N>::type
@@ -112,29 +206,86 @@
             Semantics: Returns the result type of
             using at to access the Nth element of Seq.
           
        
-
        
-            /sequence/intrinsic/at.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/at.hpp>
+#include <boost/fusion/include/at.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef vector<int,float,char> vec;
 BOOST_MPL_ASSERT((boost::is_same<result_of::at<vec, boost::mpl::int_<1> >::type, float&>));
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        [6] 
                 result_of::at reflects the actual return
                 type of the function at. Sequence(s)
                 typically return references to its elements via the at function. If you want
                 to get the actual element type, use result_of::value_at
+=======
+
        [6] 
+=======
+
        [6] 
+=======
+
        [6] 
+=======
+
        [6] 
+=======
+
        [6] 
+=======
+
        [6] 
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+                result_of::at reflects the actual return
+                type of the function at. Sequence(s)
+                typically return references to its elements via the at function. If you want
+                to get the actual element type, use result_of::value_at
+>>>>>>> .merge-right.r57125
               
        
 
        
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html b/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html
index 33968e9b..69fd5f00 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html
@@ -1,10 +1,18 @@
 
 
-
+
 at_c
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,17 +38,72 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
+<<<<<<< .working
             Returns the result type of at_c
             [7]
+=======
+            Returns the result type of at_c
+            [7]
+>>>>>>> .merge-right.r57125
             .
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<
     typename Seq,
@@ -51,8 +114,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.26. Parameters
        
 
+=======
+
        Table 1.26. Parameters
        
+=======
+
        Table 1.30. Parameters
        
+=======
+
        Table 1.30. Parameters
        
+=======
+
        Table 1.30. Parameters
        
+=======
+
        Table 1.30. Parameters
        
+=======
+
        Table 1.30. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -97,9 +185,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::at_c<Seq, M>::type
@@ -111,29 +205,86 @@
             Semantics: Returns the result type of
             using at_c to access the Mth element of Seq.
           
        
-
        
-            /sequence/intrinsic/at.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/at.hpp>
+#include <boost/fusion/include/at.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef vector<int,float,char> vec;
 BOOST_MPL_ASSERT((boost::is_same<result_of::at_c<vec, 1>::type, float&>));
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        [7] 
                 result_of::at_c reflects the actual
                 return type of the function at_c. Sequence(s)
                 typically return references to its elements via the at_c function. If you want
                 to get the actual element type, use result_of::value_at_c
+=======
+
        [7] 
+=======
+
        [7] 
+=======
+
        [7] 
+=======
+
        [7] 
+=======
+
        [7] 
+=======
+
        [7] 
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+                result_of::at_c reflects the actual
+                return type of the function at_c. Sequence(s)
+                typically return references to its elements via the at_c function. If you want
+                to get the actual element type, use result_of::value_at_c
+>>>>>>> .merge-right.r57125
               
        
 
        
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html b/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html
index 4d39311c..6cc6cdd7 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html
@@ -1,10 +1,18 @@
 
 
-
+
 at_key
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,17 +38,72 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
+<<<<<<< .working
             Returns the result type of at_key
             [8]
+=======
+            Returns the result type of at_key
+            [8]
+>>>>>>> .merge-right.r57125
             .
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<
     typename Seq,
@@ -51,8 +114,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.30. Parameters
        
 
+=======
+
        Table 1.30. Parameters
        
+=======
+
        Table 1.34. Parameters
        
+=======
+
        Table 1.34. Parameters
        
+=======
+
        Table 1.34. Parameters
        
+=======
+
        Table 1.34. Parameters
        
+=======
+
        Table 1.34. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -97,9 +185,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::at_key<Seq, Key>::type
@@ -113,29 +207,86 @@
             with key type Key in
             Seq.
           
        
-
        
-            /sequence/intrinsic/at_key.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/at_key.hpp>
+#include <boost/fusion/include/at_key.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef map<pair<int, char>, pair<char, char>, pair<double, char> > mymap;
 BOOST_MPL_ASSERT((boost::is_same<result_of::at_key<mymap, int>::type, char&>));
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        [8] 
                 result_of::at_key reflects the actual
                 return type of the function at_key. _sequence_s
                 typically return references to its elements via the at_key function. If you
                 want to get the actual element type, use result_of::value_at_key
+=======
+
        [8] 
+=======
+
        [8] 
+=======
+
        [8] 
+=======
+
        [8] 
+=======
+
        [8] 
+=======
+
        [8] 
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+                result_of::at_key reflects the actual
+                return type of the function at_key. _sequence_s
+                typically return references to its elements via the at_key function. If you
+                want to get the actual element type, use result_of::value_at_key
+>>>>>>> .merge-right.r57125
               
        
 
        
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/back.html b/doc/html/fusion/sequence/intrinsic/metafunctions/back.html
index f8750874..7204c919 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/back.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/back.html
@@ -1,10 +1,18 @@
 
 
-
+
 back
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the result type of back.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<typename Seq>
 struct back
@@ -47,8 +105,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.23. Parameters
        
 
+=======
+
        Table 1.23. Parameters
        
+=======
+
        Table 1.27. Parameters
        
+=======
+
        Table 1.27. Parameters
        
+=======
+
        Table 1.27. Parameters
        
+=======
+
        Table 1.27. Parameters
        
+=======
+
        Table 1.27. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -80,9 +163,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::back<Seq>::type
@@ -94,12 +183,41 @@
             Semantics: The type returned by dereferencing
             an iterator to the last element in the sequence. Equivalent to result_of::deref<result_of::prior<result_of::end<Seq>::type>::type>::type.
           
        
-
        
-            /sequence/intrinsic/back.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/back.hpp>
+#include <boost/fusion/include/back.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef vector<int,char> vec;
 BOOST_MPL_ASSERT((boost::is_same<result_of::back<vec>::type, char&>));
@@ -107,7 +225,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html b/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html
index ed242471..af5640f0 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html
@@ -1,10 +1,18 @@
 
 
-
+
 begin
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the result type of begin.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<typename Seq>
 struct begin
@@ -47,8 +105,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.19. Parameters
        
 
+=======
+
        Table 1.19. Parameters
        
+=======
+
        Table 1.23. Parameters
        
+=======
+
        Table 1.23. Parameters
        
+=======
+
        Table 1.23. Parameters
        
+=======
+
        Table 1.23. Parameters
        
+=======
+
        Table 1.23. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -80,27 +163,86 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::begin<Seq>::type
 
        
 
        
+<<<<<<< .working
             Return type: An iterator modelling the
             same traversal concept as Seq.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           
        
+
        
 
        
             Semantics: Returns the type of an iterator
             to the first element of Seq.
           
        
-
        
-            /sequence/intrinsic/begin.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/include/begin.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef vector<int> vec;
 typedef result_of::begin<vec>::type it;
@@ -109,7 +251,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html b/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html
index 614d9b33..fc56f48a 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html
@@ -1,10 +1,18 @@
 
 
-
+
 empty
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the result type of empty.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<typename Seq>
 struct empty
@@ -47,8 +105,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.21. Parameters
        
 
+=======
+
        Table 1.21. Parameters
        
+=======
+
        Table 1.25. Parameters
        
+=======
+
        Table 1.25. Parameters
        
+=======
+
        Table 1.25. Parameters
        
+=======
+
        Table 1.25. Parameters
        
+=======
+
        Table 1.25. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -80,9 +163,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::empty<Seq>::type
@@ -96,12 +185,41 @@
             if Seq has zero elements,
             mpl::false_ otherwise.
           
        
-
        
-            /sequence/intrinsic/empty.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/empty.hpp>
+#include <boost/fusion/include/empty.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef vector<> empty_vec;
 typedef vector<int,float,char> vec;
@@ -112,7 +230,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/end.html b/doc/html/fusion/sequence/intrinsic/metafunctions/end.html
index 132a7bcc..fae3e999 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/end.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/end.html
@@ -1,10 +1,18 @@
 
 
-
+
 end
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the result type of end.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<typename Seq>
 struct end
@@ -47,8 +105,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.20. Parameters
        
 
+=======
+
        Table 1.20. Parameters
        
+=======
+
        Table 1.24. Parameters
        
+=======
+
        Table 1.24. Parameters
        
+=======
+
        Table 1.24. Parameters
        
+=======
+
        Table 1.24. Parameters
        
+=======
+
        Table 1.24. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -80,27 +163,86 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::end<Seq>::type
 
        
 
        
+<<<<<<< .working
             Return type: A model of the same traversal
             concept as Seq.
+=======
+            Return type:
+>>>>>>> .merge-right.r57242
           
        
+
        
 
        
             Semantics: Returns the type of an iterator
             one past the end of Seq.
           
        
-
        
-            /sequence/intrinsic/end.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/include/end.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef vector<int> vec;
 typedef result_of::prior<result_of::end<vec>::type>::type first;
@@ -109,7 +251,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/front.html b/doc/html/fusion/sequence/intrinsic/metafunctions/front.html
index 1490b953..6523f792 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/front.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/front.html
@@ -1,10 +1,18 @@
 
 
-
+
 front
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the result type of front.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<typename Seq>
 struct front
@@ -47,8 +105,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.22. Parameters
        
 
+=======
+
        Table 1.22. Parameters
        
+=======
+
        Table 1.26. Parameters
        
+=======
+
        Table 1.26. Parameters
        
+=======
+
        Table 1.26. Parameters
        
+=======
+
        Table 1.26. Parameters
        
+=======
+
        Table 1.26. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -80,9 +163,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::front<Seq>::type
@@ -95,12 +184,41 @@
             an iterator to the first element in Seq.
             Equivalent to result_of::deref<result_of::begin<Seq>::type>::type.
           
        
-
        
-            /sequence/intrinsic/front.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/front.hpp>
+#include <boost/fusion/include/front.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef vector<int,char> vec;
 BOOST_MPL_ASSERT((boost::is_same<result_of::front<vec>::type, int&>));
@@ -108,7 +226,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html b/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html
index ddb91f51..31966869 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html
@@ -1,10 +1,18 @@
 
 
-
+
 has_key
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the result type of has_key.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<
     typename Seq,
@@ -49,8 +107,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.29. Parameters
        
 
+=======
+
        Table 1.29. Parameters
        
+=======
+
        Table 1.33. Parameters
        
+=======
+
        Table 1.33. Parameters
        
+=======
+
        Table 1.33. Parameters
        
+=======
+
        Table 1.33. Parameters
        
+=======
+
        Table 1.33. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -95,9 +178,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::has_key<Seq, Key>::type
@@ -112,12 +201,41 @@
             with key type Key, returns
             mpl::false_ otherwise.
           
        
-
        
-            /sequence/intrinsic/has_key.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/has_key.hpp>
+#include <boost/fusion/include/has_key.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef map<pair<int, char>, pair<char, char>, pair<double, char> > mymap;
 BOOST_MPL_ASSERT((result_of::has_key<mymap, int>));
@@ -126,7 +244,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/size.html b/doc/html/fusion/sequence/intrinsic/metafunctions/size.html
index 0d379b65..fbc12b75 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/size.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/size.html
@@ -1,10 +1,18 @@
 
 
-
+
 size
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the result type of size.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<typename Seq>
 struct size
@@ -47,8 +105,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.24. Parameters
        
 
+=======
+
        Table 1.24. Parameters
        
+=======
+
        Table 1.28. Parameters
        
+=======
+
        Table 1.28. Parameters
        
+=======
+
        Table 1.28. Parameters
        
+=======
+
        Table 1.28. Parameters
        
+=======
+
        Table 1.28. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -80,9 +163,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::size<Seq>::type
@@ -95,12 +184,41 @@
             Semantics: Returns the number of elements
             in Seq.
           
        
-
        
-            /sequence/intrinsic/size.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/size.hpp>
+#include <boost/fusion/include/size.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef vector<int,float,char> vec;
 typedef result_of::size<vec>::type size_mpl_integral_constant;
@@ -109,7 +227,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html b/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html
index 3d52d217..fda3ffc4 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html
@@ -1,10 +1,18 @@
 
 
-
+
 swap
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the return type of swap.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<typename Seq1, typename Seq2>
 struct swap
@@ -47,8 +105,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.32. Parameters
        
 
+=======
+
        Table 1.32. Parameters
        
+=======
+
        Table 1.36. Parameters
        
+=======
+
        Table 1.36. Parameters
        
+=======
+
        Table 1.36. Parameters
        
+=======
+
        Table 1.36. Parameters
        
+=======
+
        Table 1.36. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -80,9 +163,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::swap<Seq1, Seq2>::type
@@ -93,13 +182,17 @@
 
        
             Semantics: Always returns void.
           
        
-
        
-            /sequence/intrinsic/swap.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/swap.hpp>
+#include <boost/fusion/include/swap.hpp>
+
        
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html b/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html
index 5a8b0d69..fc08ad89 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html
@@ -1,10 +1,18 @@
 
 
-
+
 value_at
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the actual type at a given index from the Sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<
     typename Seq,
@@ -49,8 +107,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.27. Parameters
        
 
+=======
+
        Table 1.27. Parameters
        
+=======
+
        Table 1.31. Parameters
        
+=======
+
        Table 1.31. Parameters
        
+=======
+
        Table 1.31. Parameters
        
+=======
+
        Table 1.31. Parameters
        
+=======
+
        Table 1.31. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -96,9 +179,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::value_at<Seq, N>::type
@@ -110,12 +199,41 @@
             Semantics: Returns the actual type at
             the Nth element of Seq.
           
        
-
        
-            /sequence/intrinsic/value_at.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/value_at.hpp>
+#include <boost/fusion/include/value_at.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef vector<int,float,char> vec;
 BOOST_MPL_ASSERT((boost::is_same<result_of::value_at<vec, boost::mpl::int_<1> >::type, float>));
@@ -123,7 +241,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html b/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html
index 1697ff5c..40ac3703 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html
@@ -1,10 +1,18 @@
 
 
-
+
 value_at_c
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the actual type at a given index from the Sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<
     typename Seq,
@@ -49,8 +107,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.28. Parameters
        
 
+=======
+
        Table 1.28. Parameters
        
+=======
+
        Table 1.32. Parameters
        
+=======
+
        Table 1.32. Parameters
        
+=======
+
        Table 1.32. Parameters
        
+=======
+
        Table 1.32. Parameters
        
+=======
+
        Table 1.32. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -95,9 +178,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::value_at_c<Seq, M>::type
@@ -109,12 +198,41 @@
             Semantics: Returns the actual type at
             the Mth element of Seq.
           
        
-
        
-            /sequence/intrinsic/value_at.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/value_at.hpp>
+#include <boost/fusion/include/value_at.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef vector<int,float,char> vec;
 BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_c<vec, 1>::type, float>));
@@ -122,7 +240,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html b/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html
index 28e784ec..b435209b 100644
--- a/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html
+++ b/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html
@@ -1,10 +1,18 @@
 
 
-
+
 value_at_key
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,15 +38,65 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Returns the actual element type associated with a Key from the Sequence.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template<
     typename Seq,
@@ -49,8 +107,33 @@
 };
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
        Table 1.31. Parameters
        
 
+=======
+
        Table 1.31. Parameters
        
+=======
+
        Table 1.35. Parameters
        
+=======
+
        Table 1.35. Parameters
        
+=======
+
        Table 1.35. Parameters
        
+=======
+
        Table 1.35. Parameters
        
+=======
+
        Table 1.35. Parameters
        
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+
        
+>>>>>>> .merge-right.r57125
 @@ -95,9 +178,15 @@
 
        
 
 

 
        
 
        
+<<<<<<< .working
 
        
 
             Expression
+=======
+
        
+
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        result_of::value_at_key<Seq, Key>::type
@@ -110,12 +199,41 @@
             type associated with key type Key
             in Seq.
           
        
-
        
-            /sequence/intrinsic/value_at_key.hpp>
-          
        
+
        
+
+            Header
+          
        
+
        #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
+#include <boost/fusion/include/value_at_key.hpp>
+
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        typedef map<pair<int, char>, pair<char, char>, pair<double, char> > mymap;
 BOOST_MPL_ASSERT((boost::is_same<result_of::at_key<mymap, int>::type, char>));
@@ -123,7 +241,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/operator.html b/doc/html/fusion/sequence/operator.html
index 6c3f0e63..eb2bc218 100644
--- a/doc/html/fusion/sequence/operator.html
+++ b/doc/html/fusion/sequence/operator.html
@@ -3,7 +3,11 @@
 
 Operator
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/sequence/operator/comparison.html b/doc/html/fusion/sequence/operator/comparison.html
index 6d7fa800..fd744658 100644
--- a/doc/html/fusion/sequence/operator/comparison.html
+++ b/doc/html/fusion/sequence/operator/comparison.html
@@ -3,7 +3,11 @@
 
 Comparison
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -51,10 +55,17 @@
           elementary comparisons start from the first elements and are performed
           only until the result is clear.
         
        
+<<<<<<< .working
 
        
 
           Header
         
        
+=======
+
        
+
+          Header
+        
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/sequence/comparison.hpp>
 #include <boost/fusion/include/comparison.hpp>
 
        
diff --git a/doc/html/fusion/sequence/operator/comparison/equal.html b/doc/html/fusion/sequence/operator/comparison/equal.html
index 9a6f2d60..d1c216b3 100644
--- a/doc/html/fusion/sequence/operator/comparison/equal.html
+++ b/doc/html/fusion/sequence/operator/comparison/equal.html
@@ -1,10 +1,18 @@
 
 
-
+
 equal
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Compare two sequences for equality.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Seq1, typename Seq2>
 bool
 operator==(Seq1 const& a, Seq2 const& b);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -80,8 +163,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        a == b
@@ -115,15 +223,65 @@
             true.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/include/equal_to.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, char> v1(5, 'a');
 vector<int, char> v2(5, 'a');
@@ -132,7 +290,7 @@
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/operator/comparison/greater_than.html b/doc/html/fusion/sequence/operator/comparison/greater_than.html
index da0e1ae3..b4add9c8 100644
--- a/doc/html/fusion/sequence/operator/comparison/greater_than.html
+++ b/doc/html/fusion/sequence/operator/comparison/greater_than.html
@@ -1,11 +1,19 @@
 
 
-
+
 greater
           than
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -38,16 +46,66 @@
             Lexicographically compare two sequences.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Seq1, typename Seq2>
 bool
 operator>(Seq1 const& a, Seq2 const& b);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -80,8 +138,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        a > b
@@ -107,15 +190,65 @@
             Semantics: Returns b < a.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/comparison/less_equal.hpp>
 #include <boost/fusion/include/less_equal.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, float> v1(4, 3.3f);
 vector<short, float> v2(5, 3.3f);
@@ -126,7 +259,7 @@
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html b/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html
index 64541c98..e56dcba2 100644
--- a/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html
+++ b/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html
@@ -1,11 +1,19 @@
 
 
-
+
 greater
           than equal
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -37,16 +45,66 @@
             Lexicographically compare two sequences.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Seq1, typename Seq2>
 bool
 operator>=(Seq1 const& a, Seq2 const& b);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -79,8 +137,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        a >= b
@@ -106,15 +189,65 @@
             Semantics: Returns !(a < b).
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/comparison/greater_equal.hpp>
 #include <boost/fusion/include/greater_equal.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, float> v1(4, 3.3f);
 vector<short, float> v2(5, 3.3f);
@@ -125,7 +258,7 @@
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/operator/comparison/less_than.html b/doc/html/fusion/sequence/operator/comparison/less_than.html
index 65e36053..bfc938ae 100644
--- a/doc/html/fusion/sequence/operator/comparison/less_than.html
+++ b/doc/html/fusion/sequence/operator/comparison/less_than.html
@@ -1,11 +1,19 @@
 
 
-
+
 less
           than
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -38,16 +46,66 @@
             Lexicographically compare two sequences.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Seq1, typename Seq2>
 bool
 operator<(Seq1 const& a, Seq2 const& b);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -80,8 +138,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        a < b
@@ -109,15 +192,65 @@
             and b.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/comparison/less.hpp>
 #include <boost/fusion/include/less.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, float> v1(4, 3.3f);
 vector<short, float> v2(5, 3.3f);
@@ -128,7 +261,7 @@
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/operator/comparison/less_than_equal.html b/doc/html/fusion/sequence/operator/comparison/less_than_equal.html
index d81c9247..7117f266 100644
--- a/doc/html/fusion/sequence/operator/comparison/less_than_equal.html
+++ b/doc/html/fusion/sequence/operator/comparison/less_than_equal.html
@@ -1,11 +1,19 @@
 
 
-
+
 less
           than equal
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
@@ -38,16 +46,66 @@
             Lexicographically compare two sequences.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Seq1, typename Seq2>
 bool
 operator<=(Seq1 const& a, Seq2 const& b);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -80,8 +138,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        a <= b
@@ -107,15 +190,65 @@
             Semantics: Returns !(b < a).
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/comparison/less_equal.hpp>
 #include <boost/fusion/include/less_equal.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, float> v1(4, 3.3f);
 vector<short, float> v2(5, 3.3f);
@@ -126,7 +259,7 @@
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/operator/comparison/not_equal.html b/doc/html/fusion/sequence/operator/comparison/not_equal.html
index 43bf5c9f..821020f1 100644
--- a/doc/html/fusion/sequence/operator/comparison/not_equal.html
+++ b/doc/html/fusion/sequence/operator/comparison/not_equal.html
@@ -1,11 +1,19 @@
 
 
-
+
 not
           equal
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename Seq1, typename Seq2>
 bool
 operator!=(Seq1 const& a, Seq2 const& b);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -79,8 +137,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        a != b
@@ -109,15 +192,65 @@
             Returns !(a == b).
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/include/not_equal_to.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, char> v3(5, 'b');
 vector<int, char> t4(2, 'a');
@@ -128,7 +261,7 @@
 
        
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/operator/i_o.html b/doc/html/fusion/sequence/operator/i_o.html
index 575313ab..0474cbac 100644
--- a/doc/html/fusion/sequence/operator/i_o.html
+++ b/doc/html/fusion/sequence/operator/i_o.html
@@ -3,7 +3,11 @@
 
 I/O
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -115,10 +119,17 @@
           not generally work, since the streamed Sequence
           representation may not be unambiguously parseable.
         
        
+<<<<<<< .working
 
        
 
           Header
         
        
+=======
+
        
+
+          Header
+        
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/sequence/io.hpp>
 #include <boost/fusion/include/io.hpp>
 
        
diff --git a/doc/html/fusion/sequence/operator/i_o/in.html b/doc/html/fusion/sequence/operator/i_o/in.html
index 10be1c26..4f7adc3d 100644
--- a/doc/html/fusion/sequence/operator/i_o/in.html
+++ b/doc/html/fusion/sequence/operator/i_o/in.html
@@ -1,10 +1,18 @@
 
 
-
+
 in
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,24 +38,99 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Read a Sequence from an input
             stream.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename IStream, typename Sequence>
 IStream&
 operator>>(IStream& is, Sequence& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -92,8 +175,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        is >> seq
@@ -107,15 +215,65 @@
             e.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/io/in.hpp>
 #include <boost/fusion/include/in.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        vector<int, std::string, char> v;
 std::cin >> v;
@@ -123,7 +281,7 @@
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/sequence/operator/i_o/out.html b/doc/html/fusion/sequence/operator/i_o/out.html
index 277292c9..db10b8bb 100644
--- a/doc/html/fusion/sequence/operator/i_o/out.html
+++ b/doc/html/fusion/sequence/operator/i_o/out.html
@@ -1,10 +1,18 @@
 
 
-
+
 out
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -30,24 +38,99 @@
 
        
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Description
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Description
+>>>>>>> .merge-right.r57125
           
        
 
        
             Write a Sequence to an output
             stream.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Synopsis
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Synopsis
+>>>>>>> .merge-right.r57125
           
        
 
        template <typename OStream, typename Sequence>
 OStream&
 operator<<(OStream& os, Sequence& seq);
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Parameters
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Parameters
+>>>>>>> .merge-right.r57125
           
        
 
        @@ -92,8 +175,33 @@
 
        
 

 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Expression
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Expression
+>>>>>>> .merge-right.r57125
             Semantics
           
        
 
        os << seq
@@ -107,22 +215,72 @@
             e.
           
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Header
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Header
+>>>>>>> .merge-right.r57125
           
        
 
        #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/include/out.hpp>
 
        
 
        
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
             Example
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+            Example
+>>>>>>> .merge-right.r57125
           
        
 
        std::cout << make_vector(123, "Hello", 'x') << std::endl;
 
        
 
 
-
        
 
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
         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)
diff --git a/doc/html/fusion/support.html b/doc/html/fusion/support.html
index 7b36fd9c..ff7883fe 100644
--- a/doc/html/fusion/support.html
+++ b/doc/html/fusion/support.html
@@ -3,7 +3,11 @@
 
 Support
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/support/category_of.html b/doc/html/fusion/support/category_of.html
index 232c6eda..e2c443b9 100644
--- a/doc/html/fusion/support/category_of.html
+++ b/doc/html/fusion/support/category_of.html
@@ -3,7 +3,11 @@
 
 category_of
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,16 +38,33 @@
 
         Description
       
        
+=======
+
        
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         A metafunction that establishes the conceptual classification of a particular
         Sequence or Iterator
         (see Iterator Concepts and
         Sequence Concepts).
       
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        namespace traits
 {
     template <typename T>
@@ -52,10 +74,17 @@
     };
 }
 
        
+<<<<<<< .working
 
        
 
         Parameters
       
        
+=======
+
        
+
+        Parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        @@ -85,9 +114,15 @@
               
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Expression
+=======
+
        
+
+        Expression
+>>>>>>> .merge-right.r57125
         Semantics
       
        
 
        typedef traits::category_of<T>::type category;
@@ -96,27 +131,7 @@
         Return type:
       
        
 
        
-        For Iterators, the return type is derived from one of:
-      
        
-
        namespace boost { namespace fusion
-{
-    struct incrementable_traversal_tag {};
-
-    struct single_pass_traversal_tag
-        : incrementable_traversal_tag {};
-
-    struct forward_traversal_tag
-        : single_pass_traversal_tag {};
-
-    struct bidirectional_traversal_tag
-        : forward_traversal_tag {};
-
-    struct random_access_traversal_tag
-        : bidirectional_traversal_tag {};
-}}
-
        
-
        
-        For Sequences, the return type is derived from one of:
+        The return type is derived from one of:
       
        
 
        namespace boost { namespace fusion
 {
@@ -140,24 +155,38 @@
       
        
 
        namespace boost { namespace fusion
 {
-    struct associative_sequence_tag {};
+    struct associative_tag {};
 }}
 
        
 
        
         Semantics: Establishes the conceptual classification
         of a particular Sequence or Iterator.
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/support/category_of.hpp>
 #include <boost/fusion/include/category_of.hpp>
 
        
+<<<<<<< .working
 
        
 
         Example
       
        
+=======
+
        
+
+        Example
+      
        
+>>>>>>> .merge-right.r57125
 
        using boost::is_base_of;
 typedef traits::category_of<list<> >::type list_category;
 typedef traits::category_of<vector<> >::type vector_category;
diff --git a/doc/html/fusion/support/deduce.html b/doc/html/fusion/support/deduce.html
index c7bb56ad..f30bee40 100644
--- a/doc/html/fusion/support/deduce.html
+++ b/doc/html/fusion/support/deduce.html
@@ -3,7 +3,11 @@
 
 deduce
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,6 +38,16 @@
 
         Description
       
        
+=======
+
        
+
        
+deduce
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         Metafunction to apply element
         conversion to the full argument type.
@@ -42,17 +57,31 @@
         references to array types are kept, even if the array is const.
         Reference wrappers are removed (see boost::ref).
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/support/deduce.hpp>
 #include <boost/fusion/include/deduce.hpp>
 
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        namespace traits
 {
     template <typename T>
@@ -62,10 +91,17 @@
     };
 }
 
        
+<<<<<<< .working
 
        
 
         Example
       
        
+=======
+
        
+
+        Example
+      
        
+>>>>>>> .merge-right.r57125
 
        template <typename T>
 struct holder
 {
@@ -82,11 +118,19 @@
     return holder<T>(a);
 }
 
        
+<<<<<<< .working
 
        
 
         See also
       
        
 
        
+=======
+
        
+
+        See also
+      
        
+
        
+>>>>>>> .merge-right.r57125
 
        
 
diff --git a/doc/html/fusion/support/deduce_sequence.html b/doc/html/fusion/support/deduce_sequence.html
index 91e5103d..2ecf217b 100644
--- a/doc/html/fusion/support/deduce_sequence.html
+++ b/doc/html/fusion/support/deduce_sequence.html
@@ -3,7 +3,11 @@
 deduce_sequence
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,6 +38,16 @@
 
         Description
       
        
+=======
+
        
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         Applies element
         conversion to each element in a 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/support/deduce_sequence.hpp>
 #include <boost/fusion/include/deduce_sequence.hpp>
 
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        namespace traits
 {
     template <class Sequence>
@@ -62,10 +91,17 @@
     };
 }
 
        
+<<<<<<< .working
 
        
 
         Example
       
        
+=======
+
        
+
+        Example
+      
        
+>>>>>>> .merge-right.r57125
 
        template <class Seq>
 struct holder
 {
@@ -84,11 +120,19 @@
     return holder<arg_vec_t>( arg_vec_t(a0,a1) );
 }
 
        
+<<<<<<< .working
 
        
 
         See also
       
        
 
        
+=======
+
        
+
+        See also
+      
        
+
        
+>>>>>>> .merge-right.r57125
 
        
 
        
 
 
 
 
 
        
diff --git a/doc/html/fusion/support/is_sequence.html b/doc/html/fusion/support/is_sequence.html
index 6d1a85e1..62e4bcd5 100644
--- a/doc/html/fusion/support/is_sequence.html
+++ b/doc/html/fusion/support/is_sequence.html
@@ -3,7 +3,11 @@
 is_sequence
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,6 +38,16 @@
 
         Description
       
        
+=======
+
        
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         Metafunction that evaluates to mpl::true_
         if a certain type T is a
@@ -40,10 +55,17 @@
         otherwise. This may be specialized to accomodate clients which provide Fusion
         conforming sequences.
       
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        namespace traits
 {
     template <typename T>
@@ -53,10 +75,17 @@
     };
 }
 
        
+<<<<<<< .working
 
        
 
         Parameters
       
        
+=======
+
        
+
+        Parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        
 
 
 
 
 
        @@ -86,9 +115,15 @@
               
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Expression
+=======
+
        
+
+        Expression
+>>>>>>> .merge-right.r57125
         Semantics
       
        
 
        typedef traits::is_sequence<T>::type c;
@@ -103,17 +138,31 @@
         is a conforming Fusion sequence, mpl::false_
         otherwise.
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/support/is_sequence.hpp>
 #include <boost/fusion/include/is_sequence.hpp>
 
        
+<<<<<<< .working
 
        
 
         Example
       
        
+=======
+
        
+
+        Example
+      
        
+>>>>>>> .merge-right.r57125
 
        BOOST_MPL_ASSERT_NOT(( traits::is_sequence< std::vector<int> > ));
 BOOST_MPL_ASSERT_NOT(( is_sequence< int > ));
 BOOST_MPL_ASSERT(( traits::is_sequence<list<> > ));
diff --git a/doc/html/fusion/support/is_view.html b/doc/html/fusion/support/is_view.html
index 4f935e6f..43959cb9 100644
--- a/doc/html/fusion/support/is_view.html
+++ b/doc/html/fusion/support/is_view.html
@@ -3,7 +3,11 @@
 
 is_view
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,6 +38,16 @@
 
         Description
       
        
+=======
+
        
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         Metafunction that evaluates to mpl::true_
         if a certain type T is a
@@ -43,10 +58,17 @@
         reference. is_view may be
         specialized to accomodate clients providing Fusion conforming views.
       
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        namespace traits
 {
     template <typename T>
@@ -56,10 +78,17 @@
     };
 }
 
        
+<<<<<<< .working
 
        
 
         Parameters
       
        
+=======
+
        
+
+        Parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        @@ -89,10 +118,17 @@
               
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Expression Semantics
       
        
+=======
+
        
+
+        Expression Semantics
+      
        
+>>>>>>> .merge-right.r57125
 
        typedef traits::is_view<T>::type c;
 
        
 
        
@@ -105,17 +141,31 @@
         is a conforming Fusion view, mpl::false_
         otherwise.
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/support/is_view.hpp>
 #include <boost/fusion/include/is_view.hpp>
 
        
+<<<<<<< .working
 
        
 
         Example
       
        
+=======
+
        
+
+        Example
+      
        
+>>>>>>> .merge-right.r57125
 
        BOOST_MPL_ASSERT_NOT(( traits::is_view<std::vector<int> > ));
 BOOST_MPL_ASSERT_NOT(( traits::is_view<int> ));
 
diff --git a/doc/html/fusion/support/pair.html b/doc/html/fusion/support/pair.html
index 29681901..7af4501f 100644
--- a/doc/html/fusion/support/pair.html
+++ b/doc/html/fusion/support/pair.html
@@ -3,7 +3,11 @@
 
 pair
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,17 +38,33 @@
 
         Description
       
        
+=======
+
        
+
        
+pair
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         Fusion pair type is a half
         runtime pair. A half runtime pair is similar to a std::pair,
         but, unlike std::pair,
-        the first type does not have data. It is used as elements in _map_s,
-        for example.
+        the first type does not have data. It is used as elements in maps, for example.
       
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        template <typename First, typename Second>
 struct pair;
 
@@ -63,10 +84,17 @@
 typename result_of::make_pair<First,Second>::type
 make_pair(Second const &);
 
        
+<<<<<<< .working
 
        
 
         Template parameters
       
        
+=======
+
        
+
+        Template parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        @@ -130,10 +158,17 @@
           
        
+<<<<<<< .working
 
        
 
         Expression Semantics
       
        
+=======
+
        
+
+        Expression Semantics
+      
        
+>>>>>>> .merge-right.r57125
 
        
 
 

 
 
        @@ -258,17 +293,31 @@
 
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/support/pair.hpp>
 #include <boost/fusion/include/pair.hpp>
 
        
+<<<<<<< .working
 
        
 
         Example
       
        
+=======
+
        
+
+        Example
+      
        
+>>>>>>> .merge-right.r57125
 
        pair<int, char> p('X');
 std::cout << p << std::endl;
 std::cout << make_pair<int>('X') << std::endl;
diff --git a/doc/html/fusion/support/tag_of.html b/doc/html/fusion/support/tag_of.html
index 0883b982..97f98520 100644
--- a/doc/html/fusion/support/tag_of.html
+++ b/doc/html/fusion/support/tag_of.html
@@ -3,7 +3,11 @@
 
 tag_of
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,6 +38,16 @@
 
         Description
       
        
+=======
+
        
+
        
+tag_of
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         All conforming Fusion sequences and iterators have an associated tag type.
         The purpose of the tag is to enable tag
@@ -43,10 +58,17 @@
         This metafunction may be specialized to accomodate clients providing Fusion
         conforming sequences.
       
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        namespace traits
 {
     template<typename Sequence>
@@ -56,10 +78,17 @@
     };
 }
 
        
+<<<<<<< .working
 
        
 
         Parameters
       
        
+=======
+
        
+
+        Parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        @@ -89,10 +118,17 @@
               
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Expression Semantics
       
        
+=======
+
        
+
+        Expression Semantics
+      
        
+>>>>>>> .merge-right.r57125
 
        typedef traits::tag_of<T>::type tag;
 
        
 
        
@@ -102,13 +138,21 @@
         Semantics: Returns the tag type associated
         with T.
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/include/tag_of.hpp>
 
        
+<<<<<<< .working
 
        
 
         Example
@@ -117,6 +161,16 @@
 typedef traits::tag_of<list<int> >::type tag2;
 typedef traits::tag_of<vector<> >::type tag3;
 typedef traits::tag_of<vector<int> >::type tag4;
+=======
+
        
+
+        Example
+      
        
+
        typedef traits::tag_of<list<> >::type tag1;
+typedef traits::tag_of<list<int> >::type tag2;
+typedef traits::tag_of<vector<> >::type tag3;
+typedef traits::tag_of<vector<int> >::type tag4;
+>>>>>>> .merge-right.r57125
 
 BOOST_MPL_ASSERT((boost::is_same<tag1, tag2>));
 BOOST_MPL_ASSERT((boost::is_same<tag3, tag4>));
diff --git a/doc/html/fusion/tuple.html b/doc/html/fusion/tuple.html
index 9abb1754..9ab63dc1 100644
--- a/doc/html/fusion/tuple.html
+++ b/doc/html/fusion/tuple.html
@@ -3,7 +3,11 @@
 
 Tuple
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
diff --git a/doc/html/fusion/tuple/class_template_tuple.html b/doc/html/fusion/tuple/class_template_tuple.html
index 702ce257..3a162626 100644
--- a/doc/html/fusion/tuple/class_template_tuple.html
+++ b/doc/html/fusion/tuple/class_template_tuple.html
@@ -3,7 +3,11 @@
 
 Class template tuple
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -51,10 +55,17 @@
         Currently tuple is basically a synonym for vector, although this may be changed
         in future releases of fusion.
       
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        template<
     typename T1 = unspecified,
     typename T2 = unspecified,
diff --git a/doc/html/fusion/tuple/class_template_tuple/construction.html b/doc/html/fusion/tuple/class_template_tuple/construction.html
index 343d67bf..c122b56c 100644
--- a/doc/html/fusion/tuple/class_template_tuple/construction.html
+++ b/doc/html/fusion/tuple/class_template_tuple/construction.html
@@ -3,7 +3,11 @@
 
 Construction
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -23,6 +27,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -34,6 +39,16 @@
 
           Description
         
        
+=======
+
        
+
        
+
        
+
+          Description
+        
        
+>>>>>>> .merge-right.r57125
 
        
           The TR1
           Tuple type provides a default constructor, a constructor that takes
@@ -41,11 +56,19 @@
           copy constructor. The details of the various constructors are described
           in this section.
         
        
+<<<<<<< .working
 
        
 
           Specification
         
        
 
        
+=======
+
        
+
+          Specification
+        
        
+
        
+>>>>>>> .merge-right.r57125
 
        Notation
        
 
        
 
        T1
diff --git a/doc/html/fusion/tuple/class_template_tuple/element_access.html b/doc/html/fusion/tuple/class_template_tuple/element_access.html
index 109030be..c632aeae 100644
--- a/doc/html/fusion/tuple/class_template_tuple/element_access.html
+++ b/doc/html/fusion/tuple/class_template_tuple/element_access.html
@@ -4,7 +4,11 @@
 Element
         access
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 Element
         access
+<<<<<<< .working
 
        
 
        
 
        
@@ -38,15 +43,29 @@
 
           Description
         
+=======
+
        
+
        
+
+          Description
+        
        
+>>>>>>> .merge-right.r57125
 
        
           The TR1
           Tuple provides the get
           function to provide access to it's elements by zero based numeric index.
         
        
+<<<<<<< .working
 
        
 
           Specification
         
        
+=======
+
        
+
+          Specification
+        
        
+>>>>>>> .merge-right.r57125
 
        template<int I, T>
 RJ get(T& t);
 
        
diff --git a/doc/html/fusion/tuple/class_template_tuple/relational_operators.html b/doc/html/fusion/tuple/class_template_tuple/relational_operators.html
index 1ac49290..179c3c6b 100644
--- a/doc/html/fusion/tuple/class_template_tuple/relational_operators.html
+++ b/doc/html/fusion/tuple/class_template_tuple/relational_operators.html
@@ -4,7 +4,11 @@
 Relational
         operators
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 Relational
         operators
+<<<<<<< .working
 
        
 
        
 
        
@@ -37,15 +42,30 @@
 
           Description
         
+=======
+
        
+
        
+
+          Description
+        
        
+>>>>>>> .merge-right.r57125
 
        
           The TR1
           Tuple provides the standard boolean relational operators.
         
        
+<<<<<<< .working
 
        
 
           Specification
         
        
 
        
+=======
+
        
+
+          Specification
+        
        
+
        
+>>>>>>> .merge-right.r57125
 
        Notation
        
 
        
 
        T1
diff --git a/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html b/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html
index 91851959..d08cbe5d 100644
--- a/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html
+++ b/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html
@@ -4,7 +4,11 @@
 Tuple
         creation functions
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -30,6 +34,7 @@
 Tuple
         creation functions
+<<<<<<< .working
 
        
 
        
 
        
@@ -37,16 +42,30 @@
 
           Description
         
+=======
+
        
+
        
+
+          Description
+        
        
+>>>>>>> .merge-right.r57125
 
        
           TR1 describes 2 utility functions for creating _tr1tuple_s. make_tuple
           builds a tuple out of it's argument list, and tie
           builds a tuple of references to it's arguments. The details of these creation
           functions are described in this section.
         
        
+<<<<<<< .working
 
        
 
           Specification
         
        
+=======
+
        
+
+          Specification
+        
        
+>>>>>>> .merge-right.r57125
 
        template<typename T1, typename T2, ..., typename TN>
 tuple<V1, V2, ..., VN> make_tuple(const T1& t1, const T2& t2, ..., const TN& tn);
 
        
diff --git a/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html b/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html
index 24589a52..ba7397b7 100644
--- a/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html
+++ b/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html
@@ -4,7 +4,11 @@
 Tuple
         helper classes
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 Tuple
         helper classes
+<<<<<<< .working
 
        
 
        
 
        
@@ -38,15 +43,29 @@
 
           Description
         
+=======
+
        
+
        
+
+          Description
+        
        
+>>>>>>> .merge-right.r57125
 
        
           The TR1
           Tuple provides 2 helper traits, for compile time access to the
           tuple size, and the element types.
         
        
+<<<<<<< .working
 
        
 
           Specification
         
        
+=======
+
        
+
+          Specification
+        
        
+>>>>>>> .merge-right.r57125
 
        tuple_size<T>::value
 
        
 
        
diff --git a/doc/html/fusion/tuple/pairs.html b/doc/html/fusion/tuple/pairs.html
index c7604ff7..9c5d1cbd 100644
--- a/doc/html/fusion/tuple/pairs.html
+++ b/doc/html/fusion/tuple/pairs.html
@@ -3,7 +3,11 @@
 
 Pairs
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -34,15 +39,32 @@
 
         Description
       
        
+=======
+
        
+
        
+Pairs
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         The TR1
         Tuple interface is specified to provide uniform access to std::pair
         as if it were a 2 element tuple.
       
        
+<<<<<<< .working
 
        
 
         Specification
       
        
+=======
+
        
+
+        Specification
+      
        
+>>>>>>> .merge-right.r57125
 
        tuple_size<std::pair<T1, T2> >::value
 
        
 
        
diff --git a/doc/html/fusion/view.html b/doc/html/fusion/view.html
index 0f332aea..8a6670ed 100644
--- a/doc/html/fusion/view.html
+++ b/doc/html/fusion/view.html
@@ -3,7 +3,11 @@
 
 View
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -48,10 +52,17 @@
       sequence(s) are actually accessed. Views' lazy nature make them very cheap
       to copy and be passed around by value.
     
        
+<<<<<<< .working
 
        
 
       Header
     
        
+=======
+
        
+
+      Header
+    
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/view.hpp>
 #include <boost/fusion/include/view.hpp>
 
        
diff --git a/doc/html/fusion/view/filter_view.html b/doc/html/fusion/view/filter_view.html
index 7256cf97..aabad6bf 100644
--- a/doc/html/fusion/view/filter_view.html
+++ b/doc/html/fusion/view/filter_view.html
@@ -3,7 +3,11 @@
 
 filter_view
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,6 +38,16 @@
 
         Description
       
        
+=======
+
        
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         filter_view is a view into
         a subset of its underlying sequence's elements satisfying a given predicate
@@ -40,24 +55,45 @@
         The filter_view presents
         only those elements for which its predicate evaluates to mpl::true_.
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/view/filter_view.hpp>
 #include <boost/fusion/include/filter_view.hpp>
 
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        template <typename Sequence, typename Pred>
 struct filter_view;
 
        
+<<<<<<< .working
 
        
 
         Template parameters
       
        
+=======
+
        
+
+        Template parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        @@ -100,6 +136,7 @@
 
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Model of
@@ -107,6 +144,22 @@
 
        
 
        
+=======
+
        
+
+        Model of
+      
        
+
        
+
        
+>>>>>>> .merge-right.r57125
 
        Notation
        
 
        
 
        F
        
@@ -125,15 +178,26 @@
           
        
 
        
 
        
+<<<<<<< .working
 
        
 
         Expression Semantics
       
        
+=======
+
        
+
+        Expression Semantics
+      
        
+>>>>>>> .merge-right.r57125
 
        
         Semantics of an expression is defined only where it differs from, or is not
+<<<<<<< .working
         defined in Forward
         Sequence.
+=======
+        defined in the implemented models.
+>>>>>>> .merge-right.r57242
       
        
 
        @@ -181,10 +245,17 @@
 
        
 

 
 
        
+<<<<<<< .working
 
        
 
         Example
       
        
+=======
+
        
+
+        Example
+      
        
+>>>>>>> .merge-right.r57125
 
        using boost::mpl::_;
 using boost::mpl::not_;
 using boost::is_class;
diff --git a/doc/html/fusion/view/iterator_range.html b/doc/html/fusion/view/iterator_range.html
index dab5178b..a38b3fa1 100644
--- a/doc/html/fusion/view/iterator_range.html
+++ b/doc/html/fusion/view/iterator_range.html
@@ -3,7 +3,11 @@
 
 iterator_range
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,28 +38,59 @@
 
         Description
       
        
+=======
+
        
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         iterator_range presents a
         sub-range of its underlying sequence delimited by a pair of iterators.
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/view/iterator_range.hpp>
 #include <boost/fusion/include/iterator_range.hpp>
 
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        template <typename First, typename Last>
 struct iterator_range;
 
        
+<<<<<<< .working
 
        
 
         Template parameters
       
        
+=======
+
        
+
+        Template parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        @@ -95,6 +131,7 @@
 
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Model of
@@ -106,10 +143,29 @@
         Sequence">Bidirectional
           Sequence or Random
+=======
+
        
+
+        Model of
+      
        
+
        
+        
+
      • 
+Associative
+          Sequence if First
+          and Last implement the
+          Associative
+          Iterator model.
+        
        • 
+
        
 
        
 
        Notation
        
 
        
@@ -132,16 +188,26 @@
           
        
 
        
 
        
+<<<<<<< .working
 
        
 
         Expression
+=======
+
        
+
+        Expression
+>>>>>>> .merge-right.r57125
         Semantics
       
        
 
        
         Semantics of an expression is defined only where it differs from, or is not
+<<<<<<< .working
         defined in Forward
         Sequence.
+=======
+        defined in the implemented models.
+>>>>>>> .merge-right.r57242
       
        
 
        @@ -191,10 +257,17 @@
 
        
 

 
 
        
+<<<<<<< .working
 
        
 
         Example
       
        
+=======
+
        
+
+        Example
+      
        
+>>>>>>> .merge-right.r57125
 
        char const* s = "Ruby";
 typedef vector<int, char, double, char const*> vector_type;
 vector_type vec(1, 'x', 3.3, s);
diff --git a/doc/html/fusion/view/joint_view.html b/doc/html/fusion/view/joint_view.html
index 4ec643f8..093c67a4 100644
--- a/doc/html/fusion/view/joint_view.html
+++ b/doc/html/fusion/view/joint_view.html
@@ -3,7 +3,11 @@
 
 joint_view
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,28 +38,59 @@
 
         Description
       
        
+=======
+
        
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         joint_view presents a view
         which is a concatenation of two sequences.
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/view/joint_view.hpp>
 #include <boost/fusion/include/joint_view.hpp>
 
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        template <typename Sequence1, typename Sequence2>
 struct joint_view;
 
        
+<<<<<<< .working
 
        
 
         Template parameters
       
        
+=======
+
        
+
+        Template parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        @@ -99,6 +135,7 @@
 
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Model of
@@ -106,6 +143,23 @@
 
        
 
        
+=======
+
        
+
+        Model of
+      
        
+
        
+
        
+>>>>>>> .merge-right.r57125
 
        Notation
        
 
        
 
        JV
        
@@ -127,15 +181,26 @@
           
        
 
        
 
        
+<<<<<<< .working
 
        
 
         Expression Semantics
       
        
+=======
+
        
+
+        Expression Semantics
+      
        
+>>>>>>> .merge-right.r57125
 
        
         Semantics of an expression is defined only where it differs from, or is not
+<<<<<<< .working
         defined in Forward
         Sequence.
+=======
+        defined in the implemented models.
+>>>>>>> .merge-right.r57242
       
        
 
        @@ -184,12 +249,21 @@
 
        
 

 
 
        
+<<<<<<< .working
 
        
 
         Example
       
        
 
        vector<int, char> v1(3, 'x');
 vector<std::string, int> v2("hello", 123);
+=======
+
        
+
+        Example
+      
        
+
        vector<int, char> v1(3, 'x');
+vector<std::string, int> v2("hello", 123);
+>>>>>>> .merge-right.r57125
 joint_view<
     vector<int, char>
   , vector<std::string, int>
diff --git a/doc/html/fusion/view/nview.html b/doc/html/fusion/view/nview.html
index c571a6ef..b4b53faf 100644
--- a/doc/html/fusion/view/nview.html
+++ b/doc/html/fusion/view/nview.html
@@ -3,7 +3,11 @@
 
 nview
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,6 +38,16 @@
 
         Description
       
        
+=======
+
        
+
        
+nview
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         nview presents a view which
         iterates over a given Sequence in
@@ -40,17 +55,31 @@
         is constructed from an arbitrary Sequence
         and a list of indicies specifying the elements to iterate over.
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/view/nview.hpp>
 #include <boost/fusion/include/nview.hpp>
 
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        template <typename Sequence, typename Indicies>
 struct nview;
 
@@ -58,10 +87,17 @@
 typename result_of::nview<Sequence, I1, I2, ...>::type
 as_nview(Sequence& s);
 
        
+<<<<<<< .working
 
        
 
         Template parameters
       
        
+=======
+
        
+
+        Template parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        @@ -116,6 +152,7 @@
 
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Model of
@@ -124,6 +161,15 @@
 Random
           Access Sequence (see Sequence
+=======
+
        
+
+        Model of
+      
        
+
        
 
        
@@ -144,10 +190,17 @@
           
        
 
 
        
+<<<<<<< .working
 
        
 
         Expression Semantics
       
        
+=======
+
        
+
+        Expression Semantics
+      
        
+>>>>>>> .merge-right.r57125
 
        
         Semantics of an expression is defined only where it differs from, or is not
         defined in vector
         of references to the elements of the original Fusion Sequence
       
        
+<<<<<<< .working
 
        
 
         Example
       
        
 
        typedef vector<int, char, double> vec;
+=======
+
        
+
+        Example
+      
        
+
        typedef vector<int, char, double> vec;
+>>>>>>> .merge-right.r57125
 typedef mpl::vector_c<int, 2, 1, 0, 2, 0> indicies;
 
 vec v1(1, 'c', 2.0);
diff --git a/doc/html/fusion/view/reverse_view.html b/doc/html/fusion/view/reverse_view.html
index 61d7a51a..b8f1945e 100644
--- a/doc/html/fusion/view/reverse_view.html
+++ b/doc/html/fusion/view/reverse_view.html
@@ -3,7 +3,11 @@
 
 reverse_view
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -34,24 +38,45 @@
         view of underlying sequence. The first element will be its last and the last
         element will be its first.
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/view/reverse_view.hpp>
 #include <boost/fusion/include/reverse_view.hpp>
 
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        template <typename Sequence>
 struct reverse_view;
 
        
+<<<<<<< .working
 
        
 
         Template parameters
       
        
+=======
+
        
+
+        Template parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        @@ -82,13 +107,40 @@
               
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Model of
       
        
 
        
         
 
        
+<<<<<<< .working
 
        
 
         Example
       
        
+=======
+
        
+
+        Example
+      
        
+>>>>>>> .merge-right.r57125
 
        struct square
 {
     template<typename Sig>
diff --git a/doc/html/fusion/view/zip_view.html b/doc/html/fusion/view/zip_view.html
index c9204f7f..815e0482 100644
--- a/doc/html/fusion/view/zip_view.html
+++ b/doc/html/fusion/view/zip_view.html
@@ -3,7 +3,11 @@
 
 zip_view
 
+<<<<<<< .working
 
+=======
+
+>>>>>>> .merge-right.r57125
 
 
 
@@ -22,6 +26,7 @@
 
        
 PrevUpHomeNext
 
        
+<<<<<<< .working
 
        
 
        
 
        
@@ -33,6 +38,16 @@
 
         Description
       
        
+=======
+
        
+
        
+
        
+
+        Description
+      
        
+>>>>>>> .merge-right.r57125
 
        
         zip_view presents a view
         which iterates over a collection of Sequence(s)
@@ -40,24 +55,45 @@
         constructed from a Sequence of references
         to the component _sequence_s.
       
        
+<<<<<<< .working
 
        
 
         Header
       
        
+=======
+
        
+
+        Header
+      
        
+>>>>>>> .merge-right.r57125
 
        #include <boost/fusion/view/zip_view.hpp>
 #include <boost/fusion/include/zip_view.hpp>
 
        
+<<<<<<< .working
 
        
 
         Synopsis
       
        
+=======
+
        
+
+        Synopsis
+      
        
+>>>>>>> .merge-right.r57125
 
        template <typename Sequences>
 struct zip_view;
 
        
+<<<<<<< .working
 
        
 
         Template parameters
       
        
+=======
+
        
+
+        Template parameters
+      
        
+>>>>>>> .merge-right.r57125
 
        @@ -88,6 +124,7 @@
               
        
 
 

 
 
        
+<<<<<<< .working
 
        
 
         Model of
@@ -99,6 +136,16 @@
         Sequence">Bidirectional
           Sequence or Random
+=======
+
        
+
+        Model of
+      
        
+
        
+<<<<<<< .working
 
        
 
         Expression Semantics
       
        
+=======
+
        
+
+        Expression Semantics
+      
        
+>>>>>>> .merge-right.r57125
 
        
         Semantics of an expression is defined only where it differs from, or is not
         defined in 
        
 
         Example
       
        
 
        typedef vector<int,int> vec1;
 typedef vector<char,char> vec2;
+=======
+
        
+
+        Example
+      
        
+
        typedef vector<int,int> vec1;
+typedef vector<char,char> vec2;
+>>>>>>> .merge-right.r57125
 vec1 v1(1,2);
 vec2 v2('a','b');
 typedef vector<vec1&, vec2&> sequences;
diff --git a/doc/html/index.html b/doc/html/index.html
index d329753f..2a083d37 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -1,10 +1,18 @@
 
 
-
-Chapter 1. Fusion 2.0
+
+Chapter 1. Fusion 2.0
 
+<<<<<<< .working
 
+=======
+
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 
+=======
+
+>>>>>>> .merge-right.r58299
 
 
 
@@ -18,11 +26,16 @@
 
        
 
        
 
        Next
        
+<<<<<<< .working
 
        
 
        
 
        
+=======
+
        
+
        
+>>>>>>> .merge-right.r58299
 
        
-Chapter 1. Fusion 2.0
        
+Chapter 1. Fusion 2.0
        
 
        
 Joel de Guzman
 
        
@@ -32,9 +45,14 @@
 
        
 Tobias Schwinger
 
        
-
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
        Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger
        
+<<<<<<< .working
 
        
+=======
+
        
+
        
+>>>>>>> .merge-right.r57125
         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)
       
        
@@ -68,6 +86,8 @@
         Iterator
 
        Random
         Access Iterator
        
+
        Associative
+        Iterator
        
 
 
        Functions
        
 
        
@@ -77,6 +97,7 @@
 
        distance
        
 
        advance
        
 
        advance_c
        
+
        deref_data
        
 
        
 
        Operator
        
 
        
@@ -97,6 +118,9 @@
 
        distance
        
 
        advance
        
 
        advance_c
        
+
        key_of
        
+
        value_of_data
        
+
        deref_data
        
 
        
 
 
        Sequence
        
@@ -242,7 +266,31 @@
 
        
 
        
 
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+=======
+
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
 
        Last revised: October 11, 2009 at 16:05:02 GMT
        Last revised: October 20, 2009 at 14:59:29 GMT
        Last revised: October 30, 2009 at 00:09:36 GMT
        Last revised: November 03, 2009 at 17:25:59 GMT
        Last revised: December 11, 2009 at 10:57:59 GMT
        Last revised: December 28, 2009 at 16:58:16 GMT
        Last revised: December 29, 2009 at 14:02:18 GMT
        		
 
        
 
        
diff --git a/doc/iterator.qbk b/doc/iterator.qbk
index b057513c..5a706c5a 100644
--- a/doc/iterator.qbk
+++ b/doc/iterator.qbk
@@ -20,7 +20,9 @@ provide access to data within an underlying __sequence__.
 Fusion iterators are divided into different traversal categories.
 __forward_iterator__ is the most basic concept. __bidirectional_iterator__
 is a refinement of __forward_iterator__. __random_access_iterator__ is a
-refinement of __bidirectional_iterator__.
+refinement of __bidirectional_iterator__. __associative_iterator__ is a
+refinement of __forward_iterator__, __bidirectional_iterator__ or
+__random_access_iterator__.
 
 [section Forward Iterator]
 
@@ -210,6 +212,47 @@ the following expressions must be valid:
 
 [endsect]
 
+[section Associative Iterator]
+[heading Description]
+An Associative Iterator provides additional semantics to obtain the properties
+of the element of an associative forward, bidirectional or random access sequence.
+
+[variablelist Notation
+    [[`i`]         [Associative Iterator]]
+    [[`I`]         [Associative Iterator type]]
+]
+
+[heading Refinement of]
+__forward_iterator__, __bidirectional_iterator__ or __random_access_iterator__
+
+[heading Expression requirements]
+In addition to the requirements defined in __forward_iterator__,
+__bidirectional_iterator__ or __random_access_iterator__ the following
+expressions must be valid:
+
+[table
+    [[Expression]        [Return type]                [Runtime Complexity]]
+    [[`__deref_data__(i)`][`__result_of_deref_data__::type`][Constant]]
+]
+
+[heading Meta Expressions]
+[table
+    [[Expression]                       [Compile Time Complexity]]
+    [[`__result_of_key_of__::type`][Amortized constant time]]
+    [[`__result_of_value_of_data__::type`][Amortized constant time]]
+    [[`__result_of_deref_data__::type`][Amortized constant time]]
+]
+
+[heading Models]
+* __map__ iterator
+* __set__ iterator
+* __filter_view__ iterator (where adapted sequence is an __associative_sequence__ and a __forward_sequence__)
+* __iterator_range__ iterator (where adapted iterators are __associative_iterator__\ s)
+* __joint_view__ iterator (where adapted sequences are __associative_sequence__\ s and __forward_sequence__\ s)
+* __reverse_view__ iterator (where adapted sequence is an __associative_sequence__ and a __bidirectional_sequence__)
+
+[endsect]
+
 [endsect]
 
 [section Functions]
@@ -437,6 +480,43 @@ Moves an iterator by a specified distance.
 
 [endsect]
 
+[section deref_data]
+
+[heading Description]
+Deferences the data property associated with the element referenced by an associative iterator.
+
+[heading Synopsis]
+    template<
+        typename I
+        >
+    typename __result_of_deref_data__::type deref(I const& i);
+
+[table Parameters
+    [[Parameter]      [Requirement]    [Description]]
+    [[`i`]            [Model of __associative_iterator__] [Operation's argument]]
+]
+
+[heading Expression Semantics]
+    __deref_data__(i);
+
+[*Return type]: `__result_of_deref_data__::type`
+
+[*Semantics]: Dereferences the data property associated with the element referenced by an associative iterator `i`.
+
+[heading Header]
+    #include 
+    #include 
+
+[heading Example]
+    typedef __map__<__pair__ > map;
+
+    int i(0);
+    map m(1.0f,i);
+    assert(__deref_data__(__begin__(m)) == 0);
+    assert(&(__deref_data__(__begin__(m))) == &i);
+
+[endsect]
+
 [endsect]
 
 [section Operator]
@@ -876,6 +956,122 @@ Moves an iterator by a specified distance.
 
 [endsect]
 
+[section key_of]
+
+[heading Description]
+
+Returns the key type associated with the element referenced by an associative iterator.
+
+[heading Synopsis]
+    template<
+        typename I
+        >
+    struct key_of
+    {
+        typedef __unspecified__ type;
+    };
+
+[table Parameters
+    [[Parameter]    [Requirement]   [Description]]
+    [[`I`]          [Model of __associative_iterator__] [Operation's argument]]
+]
+
+[heading Expression Semantics]
+    __result_of_key_of__::type
+
+[*Return type]: Any type
+
+[*Semantics]: Returns the key type associated with the element referenced by an associative iterator `I`.
+
+[heading Header]
+    #include 
+    #include 
+
+[heading Example]
+    typedef __map__<__pair__ > vec;
+    typedef __result_of_begin__::type first;
+	
+    BOOST_MPL_ASSERT((boost::is_same<__result_of_key_of__::type, float>));
+    
+[endsect]
+
+[section value_of_data]
+
+[heading Description]
+
+Returns the type of the data property associated with the element referenced by an associative iterator references.
+
+[heading Synopsis]
+    template<
+        typename I
+        >
+    struct value_of_data
+    {
+        typedef __unspecified__ type;
+    };
+
+[table Parameters
+    [[Parameter]    [Requirement]   [Description]]
+    [[`I`]          [Model of __associative_iterator__] [Operation's argument]]
+]
+
+[heading Expression Semantics]
+    __result_of_value_of_data__::type
+
+[*Return type]: Any type
+
+[*Semantics]: Returns the type of the data property associated with the element referenced by an associative iterator `I`.
+
+[heading Header]
+    #include 
+    #include 
+
+[heading Example]
+    typedef __map__<__pair__ > vec;
+    typedef __result_of_begin__::type first;
+	
+    BOOST_MPL_ASSERT((boost::is_same<__result_of_value_of_data__::type, int>));
+    
+[endsect]
+
+[section deref_data]
+
+[heading Description]
+Returns the type that will be returned by dereferencing the data property referenced by an associative iterator.
+
+[heading Synposis]
+    template<
+        typename I
+        >
+    struct deref_data
+    {
+        typedef __unspecified__ type;
+    };
+
+[table Parameters
+    [[Parameter] [Requirement]                   [Description]]
+    [[`I`]       [Model of __associative_iterator__] [Operation's argument]]
+]
+
+[heading Expression Semantics]
+    __result_of_deref_data__::type
+
+[*Return type]: Any type
+
+[*Semantics]: Returns the result of dereferencing the data property referenced by an associative iterator of type `I`.
+
+[heading Header]
+    #include 
+    #include 
+
+[heading Example]
+    typedef __map__<__pair__ > map;
+    typedef __result_of_begin__::type first;
+
+    BOOST_MPL_ASSERT((boost::is_same<__result_of_deref_data__::type, int&>));
+
+[endsect]
+
 [endsect]
 
 [endsect]
diff --git a/doc/sequence.qbk b/doc/sequence.qbk
index 18d65191..1b0a34ba 100644
--- a/doc/sequence.qbk
+++ b/doc/sequence.qbk
@@ -191,7 +191,7 @@ are not defined in __forward_sequence__.
 * __reverse_view__
 * __iterator_range__ (where adapted sequence is a Bidirectional Sequence)
 * __transform_view__ (where adapted sequence is a Bidirectional Sequence)
-* __zip_view__       (where adapted sequences are models Bidirectional Sequence)
+* __zip_view__       (where adapted sequences are models of Bidirectional Sequence)
 
 [endsect]
 
@@ -266,7 +266,7 @@ are not defined in __bidirectional_sequence__.
 * __reverse_view__
 * __iterator_range__ (where adapted sequence is a Random Access Sequence)
 * __transform_view__ (where adapted sequence is a Random Access Sequence)
-* __zip_view__       (where adapted sequences are models Random Access Sequence)
+* __zip_view__       (where adapted sequences are models of Random Access Sequence)
 
 [endsect]
 
@@ -277,13 +277,7 @@ are not defined in __bidirectional_sequence__.
 An Associative Sequence allows efficient retrieval of elements based on keys.
 Like associative sequences in __mpl__, and unlike associative containers in
 __stl__, Fusion associative sequences have no implied ordering relation.
-Instead, type identity is used to impose an equivalence relation on keys, and
-the order in which sequence elements are traversed during iteration is left
-unspecified. In addition, unlike __stl__, Associative Sequences have mutable
-iterators. This is due to the fact that there is no associated ordering relation
-and the runtime value of the keys themselves do not have any effect on the
-associativity of the sequence.
-
+Instead, type identity is used to impose an equivalence relation on keys.
 
 [variablelist Notation
     [[`s`]       [An Associative Sequence]]
@@ -340,6 +334,10 @@ you can use `__result_of_value_at_key__`.]
 
 * __set__
 * __map__
+* __filter_view__    (where adapted sequence is an __associative_sequence__ and a __forward_sequence__)
+* __iterator_range__ (where adapted iterators are __associative_iterator__\ s)
+* __joint_view__     (where adapted sequences are __associative_sequence__\ s and __forward_sequence__\ s)
+* __reverse_view__   (where adapted sequence is an __associative_sequence__ and a __bidirectional_sequence__)
 
 [endsect]
 
@@ -388,9 +386,12 @@ Returns an iterator pointing to the first element in the sequence.
 
     begin(seq);
 
-[*Return type]: __forward_iterator__ if `seq` is a __forward_sequence__
+[*Return type]:
+
+* A model of __forward_iterator__ if `seq` is a __forward_sequence__
 else, __bidirectional_iterator__ if `seq` is a __bidirectional_sequence__
 else, __random_access_iterator__ if `seq` is a __random_access_sequence__.
+* A model of __associative_iterator__ if `seq` is an __associative_sequence__.
 
 [*Semantics]: Returns an iterator pointing to the first element in the sequence.
 
@@ -433,9 +434,12 @@ Returns an iterator pointing to one element past the end of the sequence.
 
     end(seq);
 
-[*Return type]: __forward_iterator__ if `seq` is a __forward_sequence__
+[*Return type]:
+
+* A model of __forward_iterator__ if `seq` is a __forward_sequence__
 else, __bidirectional_iterator__ if `seq` is a __bidirectional_sequence__
 else, __random_access_iterator__ if `seq` is a __random_access_sequence__.
+* A model of __associative_iterator__ if `seq` is an __associative_sequence__.
 
 [*Semantics]: Returns an iterator pointing to one element past the end of
 the sequence.
@@ -888,11 +892,19 @@ Returns the result type of __begin__.
 [heading Expression Semantics]
     result_of::begin::type
 
-[*Return type]: An iterator modelling the same traversal concept as `Seq`.
+[*Return type]:
+
+* A model of __forward_iterator__ if `seq` is a __forward_sequence__
+else, __bidirectional_iterator__ if `seq` is a __bidirectional_sequence__
+else, __random_access_iterator__ if `seq` is a __random_access_sequence__.
+* A model of __associative_iterator__ if `seq` is an __associative_sequence__.
 
 [*Semantics]: Returns the type of an iterator to the first element of `Seq`.
 
-/sequence/intrinsic/begin.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __vector__ vec;
@@ -921,11 +933,19 @@ Returns the result type of __end__.
 [heading Expression Semantics]
     result_of::end::type
 
-[*Return type]: A model of the same traversal concept as `Seq`.
+[*Return type]:
+
+* A model of __forward_iterator__ if `seq` is a __forward_sequence__
+else, __bidirectional_iterator__ if `seq` is a __bidirectional_sequence__
+else, __random_access_iterator__ if `seq` is a __random_access_sequence__.
+* A model of __associative_iterator__ if `seq` is an __associative_sequence__.
 
 [*Semantics]: Returns the type of an iterator one past the end of `Seq`.
 
-/sequence/intrinsic/end.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __vector__ vec;
@@ -958,7 +978,10 @@ Returns the result type of __empty__.
 
 [*Semantics]: Returns `mpl::true_` if `Seq` has zero elements, `mpl::false_` otherwise.
 
-/sequence/intrinsic/empty.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __vector__<> empty_vec;
@@ -993,7 +1016,10 @@ Returns the result type of __front__.
 
 [*Semantics]: The type returned by dereferencing an iterator to the first element in `Seq`. Equivalent to `__result_of_deref__<__result_of_begin__::type>::type`.
 
-/sequence/intrinsic/front.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __vector__ vec;
@@ -1025,7 +1051,10 @@ Returns the result type of __back__.
 
 [*Semantics]: The type returned by dereferencing an iterator to the last element in the sequence. Equivalent to `__result_of_deref__<__result_of_prior__<__result_of_end__::type>::type>::type`.
 
-/sequence/intrinsic/back.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __vector__ vec;
@@ -1057,7 +1086,10 @@ Returns the result type of __size__.
 
 [*Semantics]: Returns the number of elements in `Seq`.
 
-/sequence/intrinsic/size.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __vector__ vec;
@@ -1097,7 +1129,10 @@ the actual element type, use __result_of_value_at__].
 
 [*Semantics]: Returns the result type of using __at__ to access the `N`th element of `Seq`.
 
-/sequence/intrinsic/at.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __vector__ vec;
@@ -1136,7 +1171,10 @@ get the actual element type, use __result_of_value_at_c__].
 
 [*Semantics]: Returns the result type of using __at_c__ to access the `M`th element of `Seq`.
 
-/sequence/intrinsic/at.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __vector__ vec;
@@ -1172,7 +1210,10 @@ Returns the actual type at a given index from the __sequence__.
 
 [*Semantics]: Returns the actual type at the `N`th element of `Seq`.
 
-/sequence/intrinsic/value_at.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __vector__ vec;
@@ -1208,7 +1249,10 @@ Returns the actual type at a given index from the __sequence__.
 
 [*Semantics]: Returns the actual type at the `M`th element of `Seq`.
 
-/sequence/intrinsic/value_at.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __vector__ vec;
@@ -1243,7 +1287,10 @@ Returns the result type of __has_key__.
 
 [*Semantics]: Returns `mpl::true_` if `Seq` contains an element with key type `Key`, returns `mpl::false_` otherwise.
 
-/sequence/intrinsic/has_key.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __map__<__pair__, __pair__, __pair__ > mymap;
@@ -1283,7 +1330,10 @@ you want to get the actual element type, use __result_of_value_at_key__].
 
 [*Semantics]: Returns the result of using __at_key__ to access the element with key type `Key` in `Seq`.
 
-/sequence/intrinsic/at_key.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [heading Example]
     typedef __map__<__pair__, __pair__, __pair__ > mymap;
@@ -1319,8 +1369,11 @@ Returns the actual element type associated with a Key from the __sequence__.
 [*Semantics]: Returns the actual element type associated with key type
 `Key` in `Seq`.
 
-/sequence/intrinsic/value_at_key.hpp>
+[heading Header]
 
+    #include 
+    #include 
+    
 [heading Example]
     typedef __map__<__pair__, __pair__, __pair__ > mymap;
     BOOST_MPL_ASSERT((boost::is_same<__result_of_at_key__::type, char>));
@@ -1351,7 +1404,10 @@ Returns the return type of swap.
 
 [*Semantics]: Always returns `void`.
 
-/sequence/intrinsic/swap.hpp>
+[heading Header]
+
+    #include 
+    #include 
 
 [endsect]
 
diff --git a/doc/support.qbk b/doc/support.qbk
index 6418766e..dae8d031 100644
--- a/doc/support.qbk
+++ b/doc/support.qbk
@@ -202,7 +202,7 @@ __sequence_concepts__).
 
 [*Return type]:
 
-For Iterators, the return type is derived from one of:
+The return type is derived from one of:
 
         namespace boost { namespace fusion
         {
@@ -221,30 +221,11 @@ For Iterators, the return type is derived from one of:
                 : bidirectional_traversal_tag {};
         }}
 
-For Sequences, the return type is derived from one of:
-
-        namespace boost { namespace fusion
-        {
-            struct incrementable_sequence_tag {};
-
-            struct single_pass_sequence_tag
-                : incrementable_sequence_tag {};
-
-            struct forward_traversal_tag
-                : single_pass_sequence_tag {};
-
-            struct bidirectional_traversal_tag
-                : forward_traversal_tag {};
-
-            struct random_access_traversal_tag
-                : bidirectional_traversal_tag {};
-        }}
-
 And optionally from:
 
         namespace boost { namespace fusion
         {
-            struct associative_sequence_tag {};
+            struct associative_tag {};
         }}
 
 [*Semantics]: Establishes the conceptual classification of a particular
@@ -363,7 +344,7 @@ constructor accepting the original type as its argument.
 
 Fusion `pair` type is a half runtime pair. A half runtime pair is similar
 to a __std_pair__, but, unlike __std_pair__, the first type does not have data.
-It is used as elements in __map__s, for example.
+It is used as elements in __map__\ s, for example.
 
 [heading Synopsis]
 
diff --git a/doc/view.qbk b/doc/view.qbk
index 313ff8cc..d4521e4e 100644
--- a/doc/view.qbk
+++ b/doc/view.qbk
@@ -101,6 +101,7 @@ presents only those elements for which its predicate evaluates to
 [heading Model of]
 
 * __forward_sequence__
+* __associative_sequence__ if `Sequence` implements the __associative_sequence__ model.
 
 [variablelist Notation
     [[`F`]              [A `filter_view` type]]
@@ -111,7 +112,7 @@ presents only those elements for which its predicate evaluates to
 [heading Expression Semantics]
 
 Semantics of an expression is defined only where it differs from, or is not
-defined in __forward_sequence__.
+defined in the implemented models.
 
 [table
     [[Expression]           [Semantics]]
@@ -164,6 +165,7 @@ by a pair of iterators.
 * __forward_sequence__, __bidirectional_sequence__ or
 __random_access_sequence__ depending on the traversal characteristics (see
 __traversal_concept__) of its underlying sequence.
+* __associative_sequence__ if `First` and `Last` implement the __associative_iterator__ model.
 
 [variablelist Notation
     [[`IR`]             [An `iterator_range` type]]
@@ -175,7 +177,7 @@ __traversal_concept__) of its underlying sequence.
 [heading Expression Semantics]
 
 Semantics of an expression is defined only where it differs from, or is not
-defined in __forward_sequence__.
+defined in the implemented models.
 
 [table
     [[Expression]           [Semantics]]
@@ -230,6 +232,7 @@ defined in __forward_sequence__.
 [heading Model of]
 
 * __forward_sequence__
+* __associative_sequence__ if `Sequence1` and `Sequence2` implement the __associative_sequence__ model.
 
 [variablelist Notation
     [[`JV`]             [A `joint_view` type]]
@@ -241,7 +244,7 @@ defined in __forward_sequence__.
 [heading Expression Semantics]
 
 Semantics of an expression is defined only where it differs from, or is not
-defined in __forward_sequence__.
+defined in the implemented models.
 
 [table
     [[Expression]           [Semantics]]
@@ -443,7 +446,9 @@ element will be its last and the last element will be its first.
 
 [heading Model of]
 
-* __bidirectional_sequence__
+* A model of __bidirectional_sequence__ if `Sequence` is a __bidirectional_sequence__
+else, __random_access_sequence__ if `Sequence` is a __random_access_sequence__.
+* __associative_sequence__ if `Sequence` implements the __associative_sequence__ model.
 
 [variablelist Notation
     [[`RV`]             [A `reverse_view` type]]
@@ -454,7 +459,7 @@ element will be its last and the last element will be its first.
 [heading Expression Semantics]
 
 Semantics of an expression is defined only where it differs from, or is not
-defined in __bidirectional_sequence__.
+defined in the implemented models.
 
 [table
     [[Expression]           [Semantics]]
diff --git a/example/extension/detail/category_of_impl.hpp b/example/extension/detail/category_of_impl.hpp
index bbc8fe64..8420cbac 100644
--- a/example/extension/detail/category_of_impl.hpp
+++ b/example/extension/detail/category_of_impl.hpp
@@ -25,7 +25,7 @@ namespace boost { namespace fusion {
             template
             struct apply
             {
-                struct type : random_access_traversal_tag, associative_sequence_tag {};
+                struct type : random_access_traversal_tag, associative_tag {};
             };
         };
     }
diff --git a/example/extension/detail/deref_data_impl.hpp b/example/extension/detail/deref_data_impl.hpp
new file mode 100644
index 00000000..c9907d5c
--- /dev/null
+++ b/example/extension/detail/deref_data_impl.hpp
@@ -0,0 +1,30 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_EXAMPLE_EXTENSION_DETAIL_DEREF_DATA_IMPL_HPP
+#define BOOST_FUSION_EXAMPLE_EXTENSION_DETAIL_DEREF_DATA_IMPL_HPP
+
+namespace example
+{
+    struct example_struct_iterator_tag;
+}
+
+namespace boost { namespace fusion {
+
+    namespace extension
+    {
+        template
+        struct deref_data_impl;
+
+        template<>
+        struct deref_data_impl
+          : deref_impl
+        {};
+    }
+}}
+
+#endif
diff --git a/example/extension/detail/key_of_impl.hpp b/example/extension/detail/key_of_impl.hpp
new file mode 100644
index 00000000..6a7a836d
--- /dev/null
+++ b/example/extension/detail/key_of_impl.hpp
@@ -0,0 +1,42 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_EXAMPLE_EXTENSION_DETAIL_KEY_OF_IMPL_HPP
+#define BOOST_FUSION_EXAMPLE_EXTENSION_DETAIL_KEY_OF_IMPL_HPP
+
+#include 
+
+namespace fields
+{
+    struct name;
+    struct age;
+}
+
+namespace example
+{
+    struct example_struct_iterator_tag;
+}
+
+namespace boost { namespace fusion {
+
+    namespace extension
+    {
+        template
+        struct key_of_impl;
+
+        template<>
+        struct key_of_impl
+        {
+            template
+            struct apply
+              : mpl::if_c
+            {};
+        };
+    }
+}}
+
+#endif
diff --git a/example/extension/detail/value_of_data_impl.hpp b/example/extension/detail/value_of_data_impl.hpp
new file mode 100644
index 00000000..94cdcc30
--- /dev/null
+++ b/example/extension/detail/value_of_data_impl.hpp
@@ -0,0 +1,30 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_EXAMPLE_EXTENSION_DETAIL_VALUE_OF_DATA_IMPL_HPP
+#define BOOST_FUSION_EXAMPLE_EXTENSION_DETAIL_VALUE_OF_DATA_IMPL_HPP
+
+namespace example
+{
+    struct example_struct_iterator_tag;
+}
+
+namespace boost { namespace fusion {
+
+    namespace extension
+    {
+        template
+        struct value_of_data_impl;
+
+        template<>
+        struct value_of_data_impl
+          : value_of_impl
+        {};
+    }
+}}
+
+#endif
diff --git a/example/extension/example_struct_iterator.hpp b/example/extension/example_struct_iterator.hpp
index 064c0d74..a6b1e6db 100644
--- a/example/extension/example_struct_iterator.hpp
+++ b/example/extension/example_struct_iterator.hpp
@@ -9,6 +9,7 @@
 #define BOOST_FUSION_EXAMPLE_STRUCT_ITERATOR
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -21,6 +22,9 @@
 #include "./detail/distance_impl.hpp"
 #include "./detail/value_of_impl.hpp"
 #include "./detail/equal_to_impl.hpp"
+#include "./detail/key_of_impl.hpp"
+#include "./detail/value_of_data_impl.hpp"
+#include "./detail/deref_data_impl.hpp"
 
 namespace example
 {
@@ -32,8 +36,6 @@ namespace example
 
 namespace boost { namespace fusion {
 
-    struct random_access_traversal_tag;
-
     namespace traits
     {
         template
@@ -52,7 +54,11 @@ namespace example {
         BOOST_STATIC_ASSERT(Pos >=0 && Pos < 3);
         typedef Struct struct_type;
         typedef boost::mpl::int_ index;
-        typedef boost::fusion::random_access_traversal_tag category;
+
+        struct category
+          : boost::fusion::random_access_traversal_tag
+          , boost::fusion::associative_tag
+        {};
 
         example_struct_iterator(Struct& str)
             : struct_(str) {}
diff --git a/example/extension/test_example.cpp b/example/extension/test_example.cpp
index 264d1854..7d87f21a 100644
--- a/example/extension/test_example.cpp
+++ b/example/extension/test_example.cpp
@@ -56,6 +56,9 @@ int main()
     BOOST_MPL_ASSERT((boost::is_same::type, std::string>));
     BOOST_MPL_ASSERT((boost::is_same::type, int>));
 
+    BOOST_TEST(deref_data(begin(bert)) == "bert");
+    BOOST_TEST(deref_data(next(begin(bert))) == 99);
+
     BOOST_TEST(size(bert) == 2);
 
     return boost::report_errors();
diff --git a/example/performance/accumulate.cpp b/example/performance/accumulate.cpp
index 45aa1a11..849161b0 100644
--- a/example/performance/accumulate.cpp
+++ b/example/performance/accumulate.cpp
@@ -250,14 +250,14 @@ namespace
         template
         struct result
         {
-            typedef Rhs type;
+            typedef Lhs type;
         };
         
         template
         typename result::type
         operator()(const Lhs& lhs, const Rhs& rhs) const
         {
-            return rhs + boost::fusion::at_c<0>(lhs) * boost::fusion::at_c<1>(lhs);
+            return lhs + boost::fusion::at_c<0>(rhs) * boost::fusion::at_c<1>(rhs);
         }
     };
 
diff --git a/example/performance/inner_product2.cpp b/example/performance/inner_product2.cpp
index 3e952c07..f4e920ff 100644
--- a/example/performance/inner_product2.cpp
+++ b/example/performance/inner_product2.cpp
@@ -121,14 +121,14 @@ namespace
 
         template
         struct result
-            : boost::remove_reference
+            : boost::remove_reference
         {};
         
         template
         typename result::type
         operator()(const Lhs& lhs, const Rhs& rhs) const
         {
-            return rhs + boost::fusion::at_c<0>(lhs) * boost::fusion::at_c<1>(lhs);
+            return lhs + boost::fusion::at_c<0>(rhs) * boost::fusion::at_c<1>(rhs);
         }
     };
 
diff --git a/include/boost/fusion/adapted/array/tag_of.hpp b/include/boost/fusion/adapted/array/tag_of.hpp
index 62f81ea0..67a4f116 100644
--- a/include/boost/fusion/adapted/array/tag_of.hpp
+++ b/include/boost/fusion/adapted/array/tag_of.hpp
@@ -21,6 +21,7 @@ namespace boost
 namespace boost { namespace fusion 
 {
     struct array_tag;
+    struct fusion_sequence_tag;
 
     namespace traits
     {
@@ -36,4 +37,22 @@ namespace boost { namespace fusion
     }
 }}
 
+namespace boost { namespace mpl
+{
+    template
+    struct sequence_tag;
+
+    template
+    struct sequence_tag >
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+
+    template
+    struct sequence_tag const>
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+}}
+
 #endif
diff --git a/include/boost/fusion/adapted/boost_tuple/tag_of.hpp b/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
index efae06a2..1183082d 100644
--- a/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
@@ -26,6 +26,7 @@ namespace boost { namespace tuples
 namespace boost { namespace fusion 
 {
     struct boost_tuple_tag;
+    struct fusion_sequence_tag;
 
     namespace traits
     {
@@ -60,4 +61,54 @@ namespace boost { namespace fusion
     }
 }}
 
+namespace boost { namespace mpl
+{
+    template
+    struct sequence_tag;
+
+    template <
+        class T0, class T1, class T2, class T3, class T4,
+        class T5, class T6, class T7, class T8, class T9
+    >
+    struct sequence_tag >
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+
+    template <
+        class T0, class T1, class T2, class T3, class T4,
+        class T5, class T6, class T7, class T8, class T9
+    >
+    struct sequence_tag<
+        tuples::tuple const
+    >
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+
+    template 
+    struct sequence_tag >
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+
+    template 
+    struct sequence_tag const>
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+
+    template <>
+    struct sequence_tag
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+
+    template <>
+    struct sequence_tag
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+}}
+
 #endif
diff --git a/include/boost/fusion/adapted/class/adapt_assoc_class.hpp b/include/boost/fusion/adapted/class/adapt_assoc_class.hpp
deleted file mode 100644
index 11f40ade..00000000
--- a/include/boost/fusion/adapted/class/adapt_assoc_class.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2009 Joel de Guzman
-    Copyright (c) 2007 Dan Marsden
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(BOOST_FUSION_ADAPT_ASSOC_CLASS_OCTOBER_4_2009_840PM)
-#define BOOST_FUSION_ADAPT_ASSOC_CLASS_OCTOBER_4_2009_840PM
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-namespace boost { namespace fusion { namespace extension {
-    template
-    struct class_assoc_member;
-}}}
-
-
-#define BOOST_FUSION_ADAPT_ASSOC_CLASS(name, bseq)                             \
-    BOOST_FUSION_ADAPT_ASSOC_CLASS_I(                                           \
-        name, BOOST_PP_CAT(BOOST_FUSION_ADAPT_ASSOC_CLASS_X bseq, 0))           \
-    /***/
-
-#define BOOST_FUSION_ADAPT_ASSOC_CLASS_X(x, y, z) ((x, y, z)) BOOST_FUSION_ADAPT_ASSOC_CLASS_Y
-#define BOOST_FUSION_ADAPT_ASSOC_CLASS_Y(x, y, z) ((x, y, z)) BOOST_FUSION_ADAPT_ASSOC_CLASS_X
-#define BOOST_FUSION_ADAPT_ASSOC_CLASS_X0
-#define BOOST_FUSION_ADAPT_ASSOC_CLASS_Y0
-
-// BOOST_FUSION_ADAPT_ASSOC_CLASS_I generates the overarching structure and uses
-// SEQ_FOR_EACH_I to generate the "linear" substructures.
-// Thanks to Paul Mensonides for the PP macro help
-
-#define BOOST_FUSION_ADAPT_ASSOC_CLASS_I(name, seq)                             \
-    namespace boost { namespace fusion { namespace traits                       \
-    {                                                                           \
-        template <>                                                             \
-        struct tag_of                                                     \
-        {                                                                       \
-            typedef class_tag type;                                             \
-        };                                                                      \
-    }}}                                                                         \
-    namespace boost { namespace fusion { namespace extension                    \
-    {                                                                           \
-        template <>                                                             \
-        struct class_size : mpl::int_ {};         \
-        BOOST_PP_SEQ_FOR_EACH_I(BOOST_FUSION_ADAPT_ASSOC_CLASS_C, name, seq)    \
-    }}}                                                                         \
-    /***/
-
-#define BOOST_FUSION_ADAPT_ASSOC_CLASS_C(r, name, i, xy)                        \
-    template <>                                                                 \
-    struct class_member                                                \
-    {                                                                           \
-        typedef BOOST_PP_TUPLE_ELEM(3, 0, xy) type;                             \
-        static type& call(name& class_)                                         \
-        {                                                                       \
-            return class_.BOOST_PP_TUPLE_ELEM(3, 1, xy);                        \
-        };                                                                      \
-    };                                                                          \
-    template<>                                                                  \
-    struct class_assoc_member              \
-    {                                                                           \
-        typedef BOOST_PP_TUPLE_ELEM(3, 0, xy) type;                             \
-        static type& call(name& class_)                                         \
-        {                                                                       \
-            return class_.BOOST_PP_TUPLE_ELEM(3, 1, xy);                        \
-        };                                                                      \
-    };
-    /***/
-
-#endif
diff --git a/include/boost/fusion/adapted/class/adapt_class.hpp b/include/boost/fusion/adapted/class/adapt_class.hpp
deleted file mode 100644
index c4e5c29f..00000000
--- a/include/boost/fusion/adapted/class/adapt_class.hpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2009 Joel de Guzman
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(BOOST_FUSION_ADAPT_CLASS_OCTOBER_4_2009_840PM)
-#define BOOST_FUSION_ADAPT_CLASS_OCTOBER_4_2009_840PM
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#define BOOST_FUSION_ADAPT_CLASS(name, bseq)                                    \
-    BOOST_FUSION_ADAPT_CLASS_I(                                                 \
-        name, BOOST_PP_CAT(BOOST_FUSION_ADAPT_CLASS_X bseq, 0))                 \
-    /***/
-
-#define BOOST_FUSION_ADAPT_CLASS_X(w, x, y, z) ((w, x, y, z)) BOOST_FUSION_ADAPT_CLASS_Y
-#define BOOST_FUSION_ADAPT_CLASS_Y(w, x, y, z) ((w, x, y, z)) BOOST_FUSION_ADAPT_CLASS_X
-#define BOOST_FUSION_ADAPT_CLASS_X0
-#define BOOST_FUSION_ADAPT_CLASS_Y0
-
-// BOOST_FUSION_ADAPT_CLASS_I generates the overarching structure and uses
-// SEQ_FOR_EACH_I to generate the "linear" substructures.
-// Thanks to Paul Mensonides for the PP macro help
-
-#define BOOST_FUSION_ADAPT_CLASS_I(name, seq)                                   \
-    namespace boost { namespace fusion { namespace traits                       \
-    {                                                                           \
-        template <>                                                             \
-        struct tag_of                                                     \
-        {                                                                       \
-            typedef class_tag type;                                             \
-        };                                                                      \
-    }}}                                                                         \
-    namespace boost { namespace fusion { namespace extension                    \
-    {                                                                           \
-        template <>                                                             \
-        struct class_size : mpl::int_ {};         \
-        BOOST_PP_SEQ_FOR_EACH_I(BOOST_FUSION_ADAPT_CLASS_C, name, seq)          \
-    }}}                                                                         \
-    /***/
-
-#define BOOST_FUSION_ADAPT_CLASS_C(r, name, i, xy)                              \
-    template <>                                                                 \
-    struct class_member                                                \
-    {                                                                           \
-        typedef BOOST_PP_TUPLE_ELEM(4, 0, xy) type;                             \
-        typedef BOOST_PP_TUPLE_ELEM(4, 1, xy) get_type;                         \
-        struct proxy                                                            \
-        {                                                                       \
-            typedef BOOST_PP_TUPLE_ELEM(4, 0, xy) type;                         \
-            typedef BOOST_PP_TUPLE_ELEM(4, 1, xy) get_type;                     \
-            typedef                                                             \
-                add_reference::type>::type                      \
-            cref_type;                                                          \
-                                                                                \
-            proxy(name& obj) : obj(obj) {}                                      \
-            name& obj;                                                          \
-                                                                                \
-            proxy& operator=(cref_type val)                                     \
-            {                                                                   \
-                BOOST_PP_TUPLE_ELEM(4, 3, xy);                                  \
-                return *this;                                                   \
-            }                                                                   \
-                                                                                \
-            operator get_type()                                                 \
-            {                                                                   \
-                return BOOST_PP_TUPLE_ELEM(4, 2, xy);                           \
-            }                                                                   \
-        };                                                                      \
-                                                                                \
-        static get_type call(name const& obj)                                   \
-        {                                                                       \
-            return BOOST_PP_TUPLE_ELEM(4, 2, xy);                               \
-        };                                                                      \
-                                                                                \
-        static proxy call(name& obj)                                            \
-        {                                                                       \
-            return proxy(obj);                                                  \
-        };                                                                      \
-    };                                                                          \
-    /***/
-
-#endif
diff --git a/include/boost/fusion/adapted/class/class_iterator.hpp b/include/boost/fusion/adapted/class/class_iterator.hpp
deleted file mode 100644
index 639ee927..00000000
--- a/include/boost/fusion/adapted/class/class_iterator.hpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2009 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(FUSION_CLASS_ITERATOR_OCTOBER_4_2009_839M)
-#define FUSION_CLASS_ITERATOR_OCTOBER_4_2009_839M
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-namespace boost { namespace fusion
-{
-    struct random_access_traversal_tag;
-
-    template 
-    struct class_iterator
-        : iterator_facade, random_access_traversal_tag>
-    {
-        BOOST_MPL_ASSERT_RELATION(N_, >=, 0);
-        BOOST_MPL_ASSERT_RELATION(N_, <=, extension::class_size::value);
-
-        typedef mpl::int_ index;
-        typedef Class class_type;
-
-        class_iterator(Class& class_)
-            : class_(class_) {}
-        Class& class_;
-
-        template 
-        struct value_of
-            : extension::class_member
-        {
-        };
-
-        template 
-        struct deref
-        {
-            typedef typename
-                mpl::if_<
-                    is_const
-                  , typename extension::class_member::get_type
-                  , typename extension::class_member::proxy
-                >::type
-            type;
-
-            static type
-            call(Iterator const& iter)
-            {
-                return extension::class_member::
-                    call(iter.class_);
-            }
-        };
-
-        template 
-        struct advance
-        {
-            typedef typename Iterator::index index;
-            typedef typename Iterator::class_type class_type;
-            typedef class_iterator type;
-
-            static type
-            call(Iterator const& iter)
-            {
-                return type(iter.class_);
-            }
-        };
-
-        template 
-        struct next : advance > {};
-
-        template 
-        struct prior : advance > {};
-
-        template 
-        struct distance : mpl::minus
-        {
-            typedef typename
-                mpl::minus<
-                    typename I2::index, typename I1::index
-                >::type
-            type;
-
-            static type
-            call(I1 const&, I2 const&)
-            {
-                return type();
-            }
-        };
-    };
-}}
-
-#endif
-
-
diff --git a/include/boost/fusion/adapted/class/detail/at_impl.hpp b/include/boost/fusion/adapted/class/detail/at_impl.hpp
deleted file mode 100644
index 12b5171f..00000000
--- a/include/boost/fusion/adapted/class/detail/at_impl.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2009 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_OCTOBER_4_2009_920PM)
-#define BOOST_FUSION_AT_IMPL_OCTOBER_4_2009_920PM
-
-#include 
-#include 
-#include 
-
-namespace boost { namespace fusion
-{
-    struct class_tag;
-
-    namespace extension
-    {
-        template
-        struct at_impl;
-
-        template 
-        struct class_member;
-
-        template 
-        struct class_size;
-
-        template <>
-        struct at_impl
-        {
-            template 
-            struct apply
-            {
-                static int const n_value = N::value;
-                BOOST_MPL_ASSERT_RELATION(
-                    n_value, <=, extension::class_size::value);
-
-                typedef typename
-                    extension::class_member
-                element;
-
-                typedef typename
-                    mpl::if_<
-                        is_const
-                      , typename class_member::get_type
-                      , typename class_member::proxy
-                    >::type
-                type;
-
-                static type
-                call(Sequence& seq)
-                {
-                    return extension::
-                        class_member::call(seq);
-                }
-                
-                //~ static typename class_member::get_type
-                //~ call(Sequence const& seq)
-                //~ {
-                    //~ return extension::
-                        //~ class_member::call(seq);
-                //~ }
-            };
-        };
-    }
-}}
-
-#endif
diff --git a/include/boost/fusion/adapted/class/detail/at_key_impl.hpp b/include/boost/fusion/adapted/class/detail/at_key_impl.hpp
deleted file mode 100644
index 9df985bf..00000000
--- a/include/boost/fusion/adapted/class/detail/at_key_impl.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2009 Joel de Guzman
-    Copyright (c) 2005-2007 Dan Marsden
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(BOOST_FUSION_AT_KEY_IMPL_OCTOBER_4_2009_920PM)
-#define BOOST_FUSION_AT_KEY_IMPL_OCTOBER_4_2009_920PM
-
-#include 
-
-namespace boost { namespace fusion
-{
-    struct class_tag;
-
-    namespace extension
-    {
-        template
-        struct at_key_impl;
-
-        template 
-        struct class_assoc_member;
-
-        template <>
-        struct at_key_impl
-        {
-            template 
-            struct apply
-            {
-                typedef typename
-                extension::class_assoc_member
-                element;
-
-                typedef typename
-                    mpl::eval_if<
-                        is_const
-                      , detail::cref_result
-                      , detail::ref_result
-                    >::type
-                type;
-
-                static type
-                call(Sequence& seq)
-                {
-                    return extension::
-                        class_assoc_member::call(seq);
-                }
-            };
-        };
-    }
-}}
-
-#endif
diff --git a/include/boost/fusion/adapted/class/detail/begin_impl.hpp b/include/boost/fusion/adapted/class/detail/begin_impl.hpp
deleted file mode 100644
index 4fadac4e..00000000
--- a/include/boost/fusion/adapted/class/detail/begin_impl.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2009 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_OCTOBER_4_2009_920PM)
-#define BOOST_FUSION_BEGIN_IMPL_OCTOBER_4_2009_920PM
-
-#include 
-
-namespace boost { namespace fusion
-{
-    struct class_tag;
-
-    namespace extension
-    {
-        template
-        struct begin_impl;
-
-        template <>
-        struct begin_impl
-        {
-            template 
-            struct apply
-            {
-                typedef class_iterator type;
-
-                static type
-                call(Sequence& v)
-                {
-                    return type(v);
-                }
-            };
-        };
-    }
-}}
-
-#endif
diff --git a/include/boost/fusion/adapted/class/detail/category_of_impl.hpp b/include/boost/fusion/adapted/class/detail/category_of_impl.hpp
deleted file mode 100644
index 821cf38b..00000000
--- a/include/boost/fusion/adapted/class/detail/category_of_impl.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2009 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_OCTOBER_4_2009_919PM)
-#define BOOST_FUSION_CATEGORY_OF_IMPL_OCTOBER_4_2009_919PM
-
-#include 
-
-namespace boost { namespace fusion
-{
-    struct class_tag;
-    struct random_access_traversal_tag;
-
-    namespace extension
-    {
-        template
-        struct category_of_impl;
-
-        template<>
-        struct category_of_impl
-        {
-            template
-            struct apply
-            {
-                typedef random_access_traversal_tag type;
-            };
-        };
-    }
-}}
-
-#endif
diff --git a/include/boost/fusion/adapted/std_pair.hpp b/include/boost/fusion/adapted/std_pair.hpp
index ffc343bc..0c87084c 100644
--- a/include/boost/fusion/adapted/std_pair.hpp
+++ b/include/boost/fusion/adapted/std_pair.hpp
@@ -16,6 +16,7 @@
 namespace boost { namespace fusion
 {
     struct struct_tag;
+    struct fusion_sequence_tag;
 
     namespace traits
     {
@@ -29,42 +30,60 @@ namespace boost { namespace fusion
             typedef struct_tag type;
         };
     }
-
-    namespace extension
-    {
-        template 
-        struct struct_member;
-
-        template 
-        struct struct_size;
-
-        template 
-        struct struct_member, 0>
-        {
-            typedef T1 type;
-
-            static type& call(std::pair& pair)
-            {
-                return pair.first;
-            }
-        };
-
-        template 
-        struct struct_member, 1>
-        {
-            typedef T2 type;
-
-            static type& call(std::pair& pair)
-            {
-                return pair.second;
-            }
-        };
-
-        template 
-        struct struct_size > : mpl::int_<2>
-        {
-        };
-    }
 }}
 
+namespace boost { namespace mpl
+{
+    template
+    struct sequence_tag;
+
+    template
+    struct sequence_tag >
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+
+    template
+    struct sequence_tag const>
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+}}
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct struct_member;
+
+    template 
+    struct struct_size;
+
+    template 
+    struct struct_member, 0>
+    {
+        typedef T1 type;
+
+        static type& call(std::pair& pair)
+        {
+            return pair.first;
+        }
+    };
+
+    template 
+    struct struct_member, 1>
+    {
+        typedef T2 type;
+
+        static type& call(std::pair& pair)
+        {
+            return pair.second;
+        }
+    };
+
+    template 
+    struct struct_size > : mpl::int_<2>
+    {
+    };
+}}}
+
 #endif
diff --git a/include/boost/fusion/adapted/std_pair/tag_of.hpp b/include/boost/fusion/adapted/std_pair/tag_of.hpp
index 7b63d287..2d4faaa5 100644
--- a/include/boost/fusion/adapted/std_pair/tag_of.hpp
+++ b/include/boost/fusion/adapted/std_pair/tag_of.hpp
@@ -15,6 +15,7 @@
 namespace boost { namespace fusion {
 
     struct std_pair_tag;
+    struct fusion_sequence_tag;
 
     namespace traits
     {
@@ -26,4 +27,22 @@ namespace boost { namespace fusion {
     }
 }}
 
+namespace boost { namespace mpl
+{
+    template
+    struct sequence_tag;
+
+    template
+    struct sequence_tag >
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+
+    template
+    struct sequence_tag const>
+    {
+        typedef fusion::fusion_sequence_tag type;
+    };
+}}
+
 #endif
diff --git a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
index e8ee31b9..5061fe36 100644
--- a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
@@ -62,6 +62,25 @@ namespace boost { namespace fusion { namespace extension {
             typedef struct_tag type;                                            \
         };                                                                      \
     }}}                                                                         \
+                                                                                \
+    namespace boost { namespace mpl                                             \
+    {                                                                           \
+        template                                                      \
+        struct sequence_tag;                                                    \
+                                                                                \
+        template<>                                                              \
+        struct sequence_tag                                               \
+        {                                                                       \
+            typedef fusion::fusion_sequence_tag type;                           \
+        };                                                                      \
+                                                                                \
+        template<>                                                              \
+        struct sequence_tag                                         \
+        {                                                                       \
+            typedef fusion::fusion_sequence_tag type;                           \
+        };                                                                      \
+    }}                                                                          \
+                                                                                \
     namespace boost { namespace fusion { namespace extension                    \
     {                                                                           \
         template <>                                                             \
diff --git a/include/boost/fusion/adapted/struct/adapt_struct.hpp b/include/boost/fusion/adapted/struct/adapt_struct.hpp
index 41de5b1e..88122aff 100644
--- a/include/boost/fusion/adapted/struct/adapt_struct.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_struct.hpp
@@ -52,6 +52,25 @@
             typedef struct_tag type;                                            \
         };                                                                      \
     }}}                                                                         \
+                                                                                \
+    namespace boost { namespace mpl                                             \
+    {                                                                           \
+        template                                                      \
+        struct sequence_tag;                                                    \
+                                                                                \
+        template<>                                                              \
+        struct sequence_tag                                               \
+        {                                                                       \
+            typedef fusion::fusion_sequence_tag type;                           \
+        };                                                                      \
+                                                                                \
+        template<>                                                              \
+        struct sequence_tag                                         \
+        {                                                                       \
+            typedef fusion::fusion_sequence_tag type;                           \
+        };                                                                      \
+    }}                                                                          \
+                                                                                \
     namespace boost { namespace fusion { namespace extension                    \
     {                                                                           \
         template <>                                                             \
diff --git a/include/boost/fusion/adapted/struct/extension.hpp b/include/boost/fusion/adapted/struct/extension.hpp
index 071b11e9..6f5de9ea 100644
--- a/include/boost/fusion/adapted/struct/extension.hpp
+++ b/include/boost/fusion/adapted/struct/extension.hpp
@@ -10,58 +10,63 @@
 
 #include 
 
-namespace boost { namespace fusion { namespace extension
+namespace boost { namespace fusion
 {
-    template 
-    struct struct_member;
+    struct fusion_sequence_tag;
 
-    template 
-    struct struct_size;
-
-    template 
-    struct struct_member
+    namespace extension
     {
-        typedef typename
-            add_const::type>::type
-        type;
+        template 
+        struct struct_member;
 
-        static type&
-        call(Struct const& struct_)
+        template 
+        struct struct_size;
+
+        template 
+        struct struct_member
         {
-            return struct_member::call(
-                const_cast(struct_));
-        }
-    };
+            typedef typename
+                add_const::type>::type
+            type;
 
-    template 
-    struct struct_size
-        : struct_size
-    {};
+            static type&
+            call(Struct const& struct_)
+            {
+                return struct_member::call(
+                    const_cast(struct_));
+            }
+        };
 
-    struct no_such_member;
+        template 
+        struct struct_size
+            : struct_size
+        {};
 
-    template
-    struct struct_assoc_member
-    {
-        typedef no_such_member type;
-    };
+        struct no_such_member;
 
-    template
-    struct struct_assoc_member
-    {
-        typedef typename
-            add_const::type>::type
-        type;
-
-        static type&
-        call(Struct const& struct_)
+        template
+        struct struct_assoc_member
         {
-            return struct_assoc_member::call(
-                const_cast(struct_));
-        }
-    };
+            typedef no_such_member type;
+        };
 
-}}}
+        template
+        struct struct_assoc_member
+        {
+            typedef typename
+                add_const::type>::type
+            type;
+
+            static type&
+            call(Struct const& struct_)
+            {
+                return struct_assoc_member::call(
+                    const_cast(struct_));
+            }
+        };
+
+    }
+}}
 
 #endif
 
diff --git a/include/boost/fusion/algorithm/iteration/detail/fold.hpp b/include/boost/fusion/algorithm/iteration/detail/fold.hpp
index 390b188c..62a677de 100644
--- a/include/boost/fusion/algorithm/iteration/detail/fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/fold.hpp
@@ -34,18 +34,18 @@ namespace detail
     template 
     struct apply_fold_result
     {
-        template 
+        template 
         struct apply
-            : boost::result_of
+            : boost::result_of
         {};
     };
 
-    template 
+    template 
     struct fold_apply
     {
         typedef typename result_of::deref::type dereferenced;
         typedef typename add_reference::type>::type lvalue_state;
-        typedef typename boost::result_of::type type;
+        typedef typename boost::result_of::type type;
     };
 
     template 
@@ -56,9 +56,9 @@ namespace detail
     {
         typedef typename
         static_fold<
-            typename result_of::next::type
+              typename result_of::next::type
             , Last
-            , typename fold_apply::type
+            , typename fold_apply::type
             , F
             >::type
         type;
@@ -78,15 +78,15 @@ namespace detail
         typedef typename result::type type;
     };
 
-    template
+    template
     struct result_of_unrolled_fold;
 
     template
     struct unrolled_fold
     {
-        template
-        static typename result_of_unrolled_fold::type
-        call(I0 const& i0, State const& state, F f)
+        template
+        static typename result_of_unrolled_fold::type
+        call(State const& state, I0 const& i0, F f)
         {
             typedef typename result_of::next::type I1;
             I1 i1 = fusion::next(i0);
@@ -97,54 +97,54 @@ namespace detail
             typedef typename result_of::next::type I4;
             I4 i4 = fusion::next(i3);
 
-            return unrolled_fold::call(i4, f(*i3, f(*i2, f(*i1, f(*i0, state)))), f);
+            return unrolled_fold::call(f(f(f(f(state, *i0), *i1), *i2), *i3), i4, f);
         }
     };
 
     template<>
     struct unrolled_fold<3>
     {
-        template
-        static typename result_of_unrolled_fold::type
-        call(I0 const& i0, State const& state, F f)
+        template
+        static typename result_of_unrolled_fold::type
+        call(State const& state, I0 const& i0, F f)
         {
             typedef typename result_of::next::type I1;
             I1 i1 = fusion::next(i0);
             typedef typename result_of::next::type I2;
             I2 i2 = fusion::next(i1);
-            return f(*i2, f(*i1, f(*i0, state)));
+            return f(f(f(state, *i0), *i1), *i2);
         }
     };
 
     template<>
     struct unrolled_fold<2>
     {
-        template
-        static typename result_of_unrolled_fold::type
-        call(I0 const& i0, State const& state, F f)
+        template
+        static typename result_of_unrolled_fold::type
+        call(State const& state, I0 const& i0, F f)
         {
             typedef typename result_of::next::type I1;
             I1 i1 = fusion::next(i0);
-            return f(*i1, f(*i0, state));
+            return f(f(state, *i0), *i1);
         }
     };
 
     template<>
     struct unrolled_fold<1>
     {
-        template
-        static typename result_of_unrolled_fold::type
-        call(I0 const& i0, State const& state, F f)
+        template
+        static typename result_of_unrolled_fold::type
+        call(State const& state, I0 const& i0, F f)
         {
-            return f(*i0, state);
+            return f(state, *i0);
         }
     };
 
     template<>
     struct unrolled_fold<0>
     {
-        template
-        static State call(I0 const&, State const& state, F)
+        template
+        static State call(State const& state, I0 const&, F)
         {
             return state;
         }
@@ -171,53 +171,53 @@ namespace detail
         return detail::linear_fold(
             fusion::next(first)
           , last
-          , f(*first, state)
+          , f(state, *first)
           , f
           , result_of::equal_to::type, Last>()
         );
     }
 
-    template
+    template
     struct result_of_unrolled_fold
     {
         typedef typename result_of::next::type I1;
         typedef typename result_of::next::type I2;
         typedef typename result_of::next::type I3;
         typedef typename result_of::next::type I4;
-        typedef typename fold_apply::type Rest1;
-        typedef typename fold_apply::type Rest2;
-        typedef typename fold_apply::type Rest3;
-        typedef typename fold_apply::type Rest4;
+        typedef typename fold_apply::type Rest1;
+        typedef typename fold_apply::type Rest2;
+        typedef typename fold_apply::type Rest3;
+        typedef typename fold_apply::type Rest4;
 
-        typedef typename result_of_unrolled_fold::type type;
+        typedef typename result_of_unrolled_fold::type type;
     };
 
-    template
-    struct result_of_unrolled_fold
+    template
+    struct result_of_unrolled_fold
     {
         typedef typename result_of::next::type I1;
         typedef typename result_of::next::type I2;
-        typedef typename fold_apply::type Rest;
-        typedef typename fold_apply::type Rest2;
-        typedef typename fold_apply::type type;
+        typedef typename fold_apply::type Rest;
+        typedef typename fold_apply::type Rest2;
+        typedef typename fold_apply::type type;
     };
 
-    template
-    struct result_of_unrolled_fold
+    template
+    struct result_of_unrolled_fold
     {
         typedef typename result_of::next::type I1;
-        typedef typename fold_apply::type Rest;
-        typedef typename fold_apply::type type;
+        typedef typename fold_apply::type Rest;
+        typedef typename fold_apply::type type;
     };
 
-    template
-    struct result_of_unrolled_fold
+    template
+    struct result_of_unrolled_fold
     {
-        typedef typename fold_apply::type type;
+        typedef typename fold_apply::type type;
     };
 
-    template
-    struct result_of_unrolled_fold
+    template
+    struct result_of_unrolled_fold
     {
         typedef State type;
     };
@@ -231,7 +231,7 @@ namespace detail
         typedef typename result_of::begin::type begin;
         typedef typename result_of::end::type end;
         typedef typename result_of_unrolled_fold<
-            begin, State, F, result_of::distance::type::value>::type type;
+            State, begin, F, result_of::distance::type::value>::type type;
     };
 
     template
@@ -269,8 +269,8 @@ namespace detail
         typedef typename result_of::begin::type begin;
         typedef typename result_of::end::type end;
         return unrolled_fold::type::value>::call(
-            fusion::begin(seq)
-            , state
+              state
+            , fusion::begin(seq)
             , f);
     }
 }}}
diff --git a/include/boost/fusion/algorithm/query/detail/assoc_find.hpp b/include/boost/fusion/algorithm/query/detail/assoc_find.hpp
deleted file mode 100644
index 7591405f..00000000
--- a/include/boost/fusion/algorithm/query/detail/assoc_find.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(FUSION_ASSOC_FIND_09242005_1133)
-#define FUSION_ASSOC_FIND_09242005_1133
-
-#include 
-#include 
-#include 
-
-namespace boost { namespace fusion { namespace detail
-{
-    template 
-    struct assoc_find
-    {
-        typedef typename 
-            mpl::if_<
-                is_const
-              , typename Sequence::template meta_find_impl_const::type
-              , typename Sequence::template meta_find_impl::type
-            >::type 
-        type;
-
-        static type
-        call(Sequence& s)
-        {
-            return s.find_impl(mpl::identity());
-        }
-    };
-}}}
-
-#endif
diff --git a/include/boost/fusion/algorithm/query/detail/find_if.hpp b/include/boost/fusion/algorithm/query/detail/find_if.hpp
index cf0cc6b7..5d2a7419 100644
--- a/include/boost/fusion/algorithm/query/detail/find_if.hpp
+++ b/include/boost/fusion/algorithm/query/detail/find_if.hpp
@@ -1,6 +1,7 @@
 /*=============================================================================
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2007 Dan Marsden
+    Copyright (c) 2009 Christopher Schmidt
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -13,7 +14,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -31,7 +31,7 @@ namespace detail
     struct apply_filter
     {
         typedef typename mpl::apply1<
-            Pred, typename result_of::value_of::type>::type type;
+            Pred, Iterator>::type type;
         BOOST_STATIC_CONSTANT(int, value = type::value);
     };
 
@@ -85,7 +85,7 @@ namespace detail
         typedef typename
             mpl::apply1<
                 Pred
-              , typename result_of::value_of::type
+              , Shifted
             >::type
         type;
         BOOST_STATIC_CONSTANT(int, value = type::value);
@@ -227,26 +227,6 @@ namespace detail
             return choose_call(iter, typename traits::category_of::type());
         }
     };
-
-    template 
-    struct static_seq_find_if : static_find_if
-    {
-        typedef typename static_find_if::type type;
-
-        template 
-        static type
-        call(Sequence const& seq)
-        {
-            return static_find_if::call(fusion::begin(seq));
-        }
-
-        template 
-        static type
-        call(Sequence& seq)
-        {
-            return static_find_if::call(fusion::begin(seq));
-        }
-    };
 }}}
 
 #endif
diff --git a/include/boost/fusion/algorithm/query/find.hpp b/include/boost/fusion/algorithm/query/find.hpp
index ece8cdd6..6beb9005 100644
--- a/include/boost/fusion/algorithm/query/find.hpp
+++ b/include/boost/fusion/algorithm/query/find.hpp
@@ -8,46 +8,43 @@
 #define FUSION_FIND_05052005_1107
 
 #include 
-#include 
 #include 
 #include 
+#include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
 
 namespace boost { namespace fusion
 {
-    struct associative_sequence_tag;
-
     namespace result_of
     {
         template <
             typename Sequence
           , typename T
-          , bool is_associative_sequence = traits::is_associative::value >
-        struct find;
-
-        template 
-        struct find
+        >
+        struct find
         {
             typedef
-                detail::static_seq_find_if<
+                detail::static_find_if<
                     typename result_of::begin::type
                   , typename result_of::end::type
-                  , is_same
+                  , is_same<
+                        typename mpl::if_<
+                            traits::is_associative
+                          , key_of
+                          , value_of
+                        >::type
+                      , T
+                    >
                 >
             filter;
 
             typedef typename filter::type type;
         };
-
-        template 
-        struct find
-        {
-            typedef detail::assoc_find filter;
-            typedef typename filter::type type;
-        };
     }
 
     template 
@@ -59,7 +56,7 @@ namespace boost { namespace fusion
     find(Sequence& seq)
     {
         typedef typename result_of::find::filter filter;
-        return filter::call(seq);
+        return filter::call(fusion::begin(seq));
     }
 
     template 
@@ -67,7 +64,7 @@ namespace boost { namespace fusion
     find(Sequence const& seq)
     {
         typedef typename result_of::find::filter filter;
-        return filter::call(seq);
+        return filter::call(fusion::begin(seq));
     }
 }}
 
diff --git a/include/boost/fusion/algorithm/query/find_if.hpp b/include/boost/fusion/algorithm/query/find_if.hpp
index 4340d688..3950958c 100644
--- a/include/boost/fusion/algorithm/query/find_if.hpp
+++ b/include/boost/fusion/algorithm/query/find_if.hpp
@@ -10,6 +10,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -20,13 +24,18 @@ namespace boost { namespace fusion
         template 
         struct find_if
         {
-            typedef typename
+            typedef
                 detail::static_find_if<
                     typename result_of::begin::type
                   , typename result_of::end::type
-                  , Pred
-                >::type
-            type;
+                  , mpl::bind1<
+                        typename mpl::lambda::type
+                      , mpl::bind1,mpl::_1>
+                    >
+                >
+            filter;
+
+            typedef typename filter::type type;
         };
     }
 
@@ -38,14 +47,7 @@ namespace boost { namespace fusion
         >::type
     find_if(Sequence& seq)
     {
-        typedef
-            detail::static_find_if<
-                typename result_of::begin::type
-              , typename result_of::end::type
-              , Pred
-            >
-        filter;
-
+        typedef typename result_of::find_if::filter filter;
         return filter::call(fusion::begin(seq));
     }
 
@@ -53,14 +55,7 @@ namespace boost { namespace fusion
     inline typename result_of::find_if::type const
     find_if(Sequence const& seq)
     {
-        typedef
-            detail::static_find_if<
-                typename result_of::begin::type
-              , typename result_of::end::type
-              , Pred
-            >
-        filter;
-
+        typedef typename result_of::find_if::filter filter;
         return filter::call(fusion::begin(seq));
     }
 }}
diff --git a/include/boost/fusion/algorithm/transformation/erase_key.hpp b/include/boost/fusion/algorithm/transformation/erase_key.hpp
index dcdc6f09..03128695 100644
--- a/include/boost/fusion/algorithm/transformation/erase_key.hpp
+++ b/include/boost/fusion/algorithm/transformation/erase_key.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_ERASE_KEY_10022005_1851)
 #define FUSION_ERASE_KEY_10022005_1851
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -18,18 +18,15 @@ namespace boost { namespace fusion
     {
         template 
         struct erase_key
-        {
-            typedef detail::assoc_find filter;
-            typedef typename erase::type type;
-        };
+          : erase::type>
+        {};
     }
 
     template 
     inline typename result_of::erase_key::type
     erase_key(Sequence const& seq)
     {
-        typedef typename result_of::erase_key::filter filter;
-        return erase(seq, filter::call(seq));
+        return erase(seq, find(seq));
     }
 }}
 
diff --git a/include/boost/fusion/container/deque/deque.hpp b/include/boost/fusion/container/deque/deque.hpp
index 27d9ce78..01f017e9 100644
--- a/include/boost/fusion/container/deque/deque.hpp
+++ b/include/boost/fusion/container/deque/deque.hpp
@@ -45,6 +45,7 @@ namespace boost { namespace fusion {
         sequence_base >
     {
         typedef deque_tag fusion_tag;
+        typedef bidirectional_traversal_tag category;
         typedef typename detail::deque_keyed_values::type base;
         typedef typename detail::deque_initial_size::type size;
         typedef mpl::int_ next_up;
diff --git a/include/boost/fusion/container/map/detail/at_key_impl.hpp b/include/boost/fusion/container/map/detail/at_key_impl.hpp
deleted file mode 100644
index 8b0d70aa..00000000
--- a/include/boost/fusion/container/map/detail/at_key_impl.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(FUSION_AT_KEY_IMPL_05222005_0254)
-#define FUSION_AT_KEY_IMPL_05222005_0254
-
-#include 
-#include 
-#include 
-
-namespace boost { namespace fusion
-{
-    struct map_tag;
-
-    namespace extension
-    {
-        template 
-        struct at_key_impl;
-
-        template <>
-        struct at_key_impl
-        {
-            template 
-            struct apply 
-            {
-                typedef typename Sequence::template meta_at_impl element;
-                
-                typedef typename
-                    mpl::eval_if<
-                        is_const
-                      , detail::cref_result
-                      , detail::ref_result
-                    >::type
-                type;
-    
-                static type
-                call(Sequence& m)
-                {
-                    return m.at_impl(mpl::identity());
-                }
-            };
-        };
-    }
-}}
-
-#endif
diff --git a/include/boost/fusion/container/map/detail/begin_impl.hpp b/include/boost/fusion/container/map/detail/begin_impl.hpp
index 5fe25caf..063932a8 100644
--- a/include/boost/fusion/container/map/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/map/detail/begin_impl.hpp
@@ -1,56 +1,43 @@
 /*=============================================================================
     Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2009 Christopher Schmidt
 
-    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_BEGIN_IMPL_05222005_1108)
-#define FUSION_BEGIN_IMPL_05222005_1108
 
-#include 
-#include 
-#include 
-#include 
+#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_BEGIN_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_BEGIN_IMPL_HPP
 
-namespace boost { namespace fusion
+#include 
+
+namespace boost { namespace fusion { namespace extension
 {
-    struct map_tag;
+    template 
+    struct begin_impl;
 
-    namespace extension
+    template <>
+    struct begin_impl
     {
-        template 
-        struct begin_impl;
-
-        template <>
-        struct begin_impl
+        template 
+        struct apply
         {
-            template 
-            struct apply 
+            typedef
+                basic_iterator<
+                    map_iterator_tag
+                  , typename Seq::category
+                  , Seq
+                  , 0
+                >
+            type;
+
+            static type
+            call(Seq& seq)
             {
-                typedef typename 
-                    result_of::begin::type
-                iterator_type;
-
-                typedef typename 
-                    result_of::begin::type
-                const_iterator_type;
-
-                typedef typename 
-                    mpl::eval_if<
-                        is_const
-                      , mpl::identity
-                      , mpl::identity
-                    >::type
-                type;
-    
-                static type
-                call(Sequence& m)
-                {
-                    return fusion::begin(m.get_data());
-                }
-            };
+                return type(seq,0);
+            }
         };
-    }
-}}
+    };
+}}}
 
 #endif
diff --git a/include/boost/fusion/container/map/detail/deref_data_impl.hpp b/include/boost/fusion/container/map/detail/deref_data_impl.hpp
new file mode 100644
index 00000000..9943171a
--- /dev/null
+++ b/include/boost/fusion/container/map/detail/deref_data_impl.hpp
@@ -0,0 +1,48 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_DEREF_DATA_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_DEREF_DATA_IMPL_HPP
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct deref_data_impl;
+
+    template <>
+    struct deref_data_impl
+    {
+        template 
+        struct apply
+        {
+            typedef typename result_of::value_of::type::second_type data;
+
+            typedef typename
+                mpl::eval_if<
+                    is_const
+                  , detail::cref_result >
+                  , detail::ref_result >
+                >::type
+            type;
+
+            static type
+            call(It const& it)
+            {
+                return deref(it).second;
+            }
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/container/map/detail/deref_impl.hpp b/include/boost/fusion/container/map/detail/deref_impl.hpp
new file mode 100644
index 00000000..359a5dc0
--- /dev/null
+++ b/include/boost/fusion/container/map/detail/deref_impl.hpp
@@ -0,0 +1,45 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_DEREF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_DEREF_IMPL_HPP
+
+#include 
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct deref_impl;
+
+    template <>
+    struct deref_impl
+    {
+        template 
+        struct apply
+        {
+            typedef typename
+                result_of::at<
+                    typename mpl::if_<
+                        is_const
+                      , typename It::seq_type::storage_type const
+                      , typename It::seq_type::storage_type
+                    >::type
+                  , typename It::index
+                >::type
+            type;
+
+            static type
+            call(It const& it)
+            {
+                return at(it.seq->get_data());
+            }
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/container/map/detail/end_impl.hpp b/include/boost/fusion/container/map/detail/end_impl.hpp
index 0cafc92c..0e30de8c 100644
--- a/include/boost/fusion/container/map/detail/end_impl.hpp
+++ b/include/boost/fusion/container/map/detail/end_impl.hpp
@@ -1,53 +1,43 @@
 /*=============================================================================
     Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2009 Christopher Schmidt
 
-    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_END_IMPL_05222005_1108)
-#define FUSION_END_IMPL_05222005_1108
 
-#include 
+#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_END_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_END_IMPL_HPP
 
-namespace boost { namespace fusion
+#include 
+
+namespace boost { namespace fusion { namespace extension
 {
-    struct map_tag;
+    template 
+    struct end_impl;
 
-    namespace extension
+    template <>
+    struct end_impl
     {
-        template 
-        struct end_impl;
-
-        template <>
-        struct end_impl
+        template 
+        struct apply
         {
-            template 
-            struct apply 
+            typedef
+                basic_iterator<
+                    map_iterator_tag
+                  , typename Seq::category
+                  , Seq
+                  , Seq::size::value
+                >
+            type;
+
+            static type
+            call(Seq& seq)
             {
-                typedef typename 
-                    result_of::end::type
-                iterator_type;
-
-                typedef typename 
-                    result_of::end::type
-                const_iterator_type;
-
-                typedef typename 
-                    mpl::eval_if<
-                        is_const
-                      , mpl::identity
-                      , mpl::identity
-                    >::type
-                type;
-    
-                static type
-                call(Sequence& m)
-                {
-                    return fusion::end(m.get_data());
-                }
-            };
+                return type(seq,0);
+            }
         };
-    }
-}}
+    };
+}}}
 
 #endif
diff --git a/include/boost/fusion/container/map/detail/key_of_impl.hpp b/include/boost/fusion/container/map/detail/key_of_impl.hpp
new file mode 100644
index 00000000..5a90c037
--- /dev/null
+++ b/include/boost/fusion/container/map/detail/key_of_impl.hpp
@@ -0,0 +1,32 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_KEY_OF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_KEY_OF_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct key_of_impl;
+
+    template <>
+    struct key_of_impl
+    {
+        template 
+        struct apply
+        {
+            typedef typename
+                value_of_impl::
+                    template apply::type::first_type
+            type;
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/container/map/detail/lookup_key.hpp b/include/boost/fusion/container/map/detail/lookup_key.hpp
deleted file mode 100644
index 17774362..00000000
--- a/include/boost/fusion/container/map/detail/lookup_key.hpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(FUSION_LOOKUP_KEY_07222005_1248)
-#define FUSION_LOOKUP_KEY_07222005_1248
-
-#include 
-#include 
-#include 
-#include 
-
-namespace boost { namespace fusion 
-{
-    struct void_;    
-}}
-
-namespace boost { namespace fusion { namespace detail 
-{
-    template 
-    struct map_data_type
-    {
-        typedef typename 
-            add_reference<
-                typename T::second_type
-            >::type 
-        type;
-    };
-
-    template <>
-    struct map_data_type
-    {
-        typedef void_& type;
-    };
-
-    template 
-    struct map_const_data_type
-    {
-        typedef typename 
-            add_reference<
-                typename add_const<
-                    typename T::second_type
-                >::type
-            >::type 
-        type;
-    };
-
-    template <>
-    struct map_const_data_type
-    {
-        typedef void_ const& type;
-    };
-
-    template 
-    struct map_value_type
-    {
-        typedef typename T::second_type type;
-    };
-
-    template <>
-    struct map_value_type
-    {
-        typedef void_ type;
-    };
-
-    template 
-    struct map_key_type
-    {
-        typedef typename T::first_type type;
-    };
-
-    template 
-    struct map_key_type
-    {
-        typedef unknown_key type;
-    };
-
-    template 
-    struct map_lookup_key
-    {
-        static RT
-        call(Vector& vec)
-        {
-            return vec.at_impl(mpl::int_()).second;
-        }
-    };
-
-    template 
-    struct map_lookup_key, Vector>
-    {
-        static void_&
-        call(Vector& vec); // intentionally undefined
-    };
-}}} 
-
-#endif
-
diff --git a/include/boost/fusion/container/map/detail/map_lookup.hpp b/include/boost/fusion/container/map/detail/map_lookup.hpp
deleted file mode 100644
index 2f792cbd..00000000
--- a/include/boost/fusion/container/map/detail/map_lookup.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_MAP_LOOKUP_07212005_1118)
-#define FUSION_MAP_LOOKUP_07212005_1118
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
-#pragma warning (push)
-#pragma warning(disable: 4348)  // redefinition of default parameter
-#endif
-
-    template 
-    struct meta_at_impl
-    {
-        typedef void_ type;
-    };
-
-    template 
-    struct meta_find_impl
-    {
-        typedef vector_iterator type;
-    };
-
-    template 
-    struct meta_find_impl_const
-    {
-        typedef vector_iterator type;
-    };
-
-    template 
-    vector_iterator
-    find_impl(mpl::identity) const
-    {
-        return vector_iterator(data);
-    }
-
-    template 
-    vector_iterator
-    find_impl(mpl::identity)
-    {
-        return vector_iterator(data);
-    }
-
-#define BOOST_PP_FILENAME_1 \
-    
-#define BOOST_PP_ITERATION_LIMITS (0, BOOST_PP_DEC(FUSION_MAX_MAP_SIZE))
-#include BOOST_PP_ITERATE()
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
-#pragma warning (pop)
-#endif
-
-#endif
-#else // defined(BOOST_PP_IS_ITERATING)
-///////////////////////////////////////////////////////////////////////////////
-//
-//  Preprocessor vertical repetition code
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#define N BOOST_PP_ITERATION()
-
-    template 
-    struct meta_at_impl<
-        typename detail::map_key_type::type, dummy>
-    {
-        typedef typename detail::map_value_type::type type;
-    };
-
-    typename detail::map_data_type::type
-    at_impl(mpl::identity::type>)
-    {
-        return detail::map_lookup_key<
-            N
-          , typename detail::map_data_type::type
-          , typename detail::map_key_type::type
-          , storage_type>::call(data);
-    }
-
-    typename detail::map_const_data_type::type
-    at_impl(mpl::identity::type>) const
-    {
-        return detail::map_lookup_key<
-            N
-          , typename detail::map_const_data_type::type
-          , typename detail::map_key_type::type
-          , storage_type const>::call(data);
-    }
-
-    template 
-    struct meta_find_impl<
-        typename detail::map_key_type::type, dummy>
-    {
-        typedef vector_iterator type;
-    };
-
-    template 
-    struct meta_find_impl_const<
-        typename detail::map_key_type::type, dummy>
-    {
-        typedef vector_iterator type;
-    };
-
-    vector_iterator
-    find_impl(mpl::identity::type>)
-    {
-        return vector_iterator(data);
-    }
-
-    vector_iterator
-    find_impl(mpl::identity::type>) const
-    {
-        return vector_iterator(data);
-    }
-
-#undef N
-#endif // defined(BOOST_PP_IS_ITERATING)
-
diff --git a/include/boost/fusion/container/map/detail/value_at_key_impl.hpp b/include/boost/fusion/container/map/detail/value_at_key_impl.hpp
deleted file mode 100644
index 6c516462..00000000
--- a/include/boost/fusion/container/map/detail/value_at_key_impl.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-    Copyright (c) 2006 Dan Marsden
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(FUSION_VALUE_AT_KEY_IMPL_05222005_0325)
-#define FUSION_VALUE_AT_KEY_IMPL_05222005_0325
-
-namespace boost { namespace fusion
-{
-    struct map_tag;
-
-    namespace extension
-    {
-        template 
-        struct value_at_key_impl;
-
-        template <>
-        struct value_at_key_impl
-        {
-            template 
-            struct apply 
-            {
-                typedef typename Sequence::
-                    template meta_at_impl::type type;
-            };
-        };
-    }
-}}
-
-#endif
diff --git a/include/boost/fusion/container/map/detail/value_of_data_impl.hpp b/include/boost/fusion/container/map/detail/value_of_data_impl.hpp
new file mode 100644
index 00000000..28d21678
--- /dev/null
+++ b/include/boost/fusion/container/map/detail/value_of_data_impl.hpp
@@ -0,0 +1,32 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_VALUE_OF_DATA_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_VALUE_OF_DATA_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct value_of_data_impl;
+
+    template <>
+    struct value_of_data_impl
+    {
+        template 
+        struct apply
+        {
+            typedef typename
+                value_of_impl::
+                    template apply::type::second_type
+            type;
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/container/map/detail/value_of_impl.hpp b/include/boost/fusion/container/map/detail/value_of_impl.hpp
new file mode 100644
index 00000000..26b19f20
--- /dev/null
+++ b/include/boost/fusion/container/map/detail/value_of_impl.hpp
@@ -0,0 +1,39 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_VALUE_OF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_VALUE_OF_IMPL_HPP
+
+#include 
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct value_of_impl;
+
+    template <>
+    struct value_of_impl
+    {
+        template 
+        struct apply
+        {
+            typedef typename
+                result_of::value_at<
+                    typename mpl::if_<
+                        is_const
+                      , typename It::seq_type::storage_type const
+                      , typename It::seq_type::storage_type
+                    >::type
+                  , typename It::index
+                >::type
+            type;
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/container/map/map.hpp b/include/boost/fusion/container/map/map.hpp
index 5f5fb1cc..77fe2920 100644
--- a/include/boost/fusion/container/map/map.hpp
+++ b/include/boost/fusion/container/map/map.hpp
@@ -11,11 +11,13 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -23,13 +25,12 @@
 namespace boost { namespace fusion
 {
     struct void_;
-    struct map_tag;
     struct fusion_sequence_tag;
 
     template 
     struct map : sequence_base >
     {
-        struct category : forward_traversal_tag, associative_sequence_tag {};
+        struct category : forward_traversal_tag, associative_tag {};
         
         typedef map_tag fusion_tag;
         typedef fusion_sequence_tag tag; // this gets picked up by MPL
@@ -49,7 +50,6 @@ namespace boost { namespace fusion
             : data(rhs) {}
 
         #include 
-        #include 
 
         template 
         map&
diff --git a/include/boost/fusion/container/map/map_fwd.hpp b/include/boost/fusion/container/map/map_fwd.hpp
index 660466bd..d8a9c1b7 100644
--- a/include/boost/fusion/container/map/map_fwd.hpp
+++ b/include/boost/fusion/container/map/map_fwd.hpp
@@ -13,6 +13,8 @@
 namespace boost { namespace fusion
 {
     struct void_;
+    struct map_tag;
+    struct map_iterator_tag;
 
     template <
         BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(
diff --git a/include/boost/fusion/container/set/detail/at_key_impl.hpp b/include/boost/fusion/container/set/detail/at_key_impl.hpp
deleted file mode 100644
index d0c1de00..00000000
--- a/include/boost/fusion/container/set/detail/at_key_impl.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(FUSION_AT_KEY_IMPL_09162005_1118)
-#define FUSION_AT_KEY_IMPL_09162005_1118
-
-#include 
-#include 
-#include 
-
-namespace boost { namespace fusion
-{
-    struct set_tag;
-
-    namespace extension
-    {
-        template 
-        struct at_key_impl;
-
-        template <>
-        struct at_key_impl
-        {
-            template 
-            struct apply 
-            {
-                typedef typename Sequence::template meta_at_impl element;
-                
-                typedef typename
-                    mpl::eval_if<
-                        is_const
-                      , detail::cref_result
-                      , detail::ref_result
-                    >::type
-                type;
-    
-                static type
-                call(Sequence& s)
-                {
-                    return s.at_impl(mpl::identity());
-                }
-            };
-        };
-    }
-}}
-
-#endif
diff --git a/include/boost/fusion/container/set/detail/begin_impl.hpp b/include/boost/fusion/container/set/detail/begin_impl.hpp
index 9b42df72..8047743d 100644
--- a/include/boost/fusion/container/set/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/set/detail/begin_impl.hpp
@@ -1,56 +1,43 @@
 /*=============================================================================
     Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2009 Christopher Schmidt
 
-    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_BEGIN_IMPL_09162005_1120)
-#define FUSION_BEGIN_IMPL_09162005_1120
 
-#include 
-#include 
-#include 
-#include 
+#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_BEGIN_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_BEGIN_IMPL_HPP
 
-namespace boost { namespace fusion
+#include 
+
+namespace boost { namespace fusion { namespace extension
 {
-    struct set_tag;
+    template 
+    struct begin_impl;
 
-    namespace extension
+    template <>
+    struct begin_impl
     {
-        template 
-        struct begin_impl;
-
-        template <>
-        struct begin_impl
+        template 
+        struct apply
         {
-            template 
-            struct apply 
+            typedef
+                basic_iterator<
+                    set_iterator_tag
+                  , typename Seq::category
+                  , Seq
+                  , 0
+                >
+            type;
+
+            static type
+            call(Seq& seq)
             {
-                typedef typename 
-                    result_of::begin::type
-                iterator_type;
-
-                typedef typename 
-                    result_of::begin::type
-                const_iterator_type;
-
-                typedef typename 
-                    mpl::eval_if<
-                        is_const
-                      , mpl::identity
-                      , mpl::identity
-                    >::type
-                type;
-    
-                static type
-                call(Sequence& s)
-                {
-                    return fusion::begin(s.get_data());
-                }
-            };
+                return type(seq,0);
+            }
         };
-    }
-}}
+    };
+}}}
 
 #endif
diff --git a/include/boost/fusion/container/set/detail/deref_data_impl.hpp b/include/boost/fusion/container/set/detail/deref_data_impl.hpp
new file mode 100644
index 00000000..7238cc6f
--- /dev/null
+++ b/include/boost/fusion/container/set/detail/deref_data_impl.hpp
@@ -0,0 +1,24 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_DEREF_DATA_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_DEREF_DATA_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct deref_data_impl;
+
+    template <>
+    struct deref_data_impl
+      : deref_impl
+    {};
+}}}
+
+#endif
diff --git a/include/boost/fusion/container/set/detail/deref_impl.hpp b/include/boost/fusion/container/set/detail/deref_impl.hpp
new file mode 100644
index 00000000..12824e61
--- /dev/null
+++ b/include/boost/fusion/container/set/detail/deref_impl.hpp
@@ -0,0 +1,45 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_DEREF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_DEREF_IMPL_HPP
+
+#include 
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct deref_impl;
+
+    template <>
+    struct deref_impl
+    {
+        template 
+        struct apply
+        {
+            typedef typename
+                result_of::at<
+                    typename mpl::if_<
+                        is_const
+                      , typename It::seq_type::storage_type const
+                      , typename It::seq_type::storage_type
+                    >::type
+                  , typename It::index
+                >::type
+            type;
+
+            static type
+            call(It const& it)
+            {
+                return at(it.seq->get_data());
+            }
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/container/set/detail/end_impl.hpp b/include/boost/fusion/container/set/detail/end_impl.hpp
index 4df78a3f..a981585b 100644
--- a/include/boost/fusion/container/set/detail/end_impl.hpp
+++ b/include/boost/fusion/container/set/detail/end_impl.hpp
@@ -1,53 +1,43 @@
 /*=============================================================================
     Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2009 Christopher Schmidt
 
-    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_END_IMPL_09162005_1121)
-#define FUSION_END_IMPL_09162005_1121
 
-#include 
+#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_END_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_END_IMPL_HPP
 
-namespace boost { namespace fusion
+#include 
+
+namespace boost { namespace fusion { namespace extension
 {
-    struct set_tag;
+    template 
+    struct end_impl;
 
-    namespace extension
+    template <>
+    struct end_impl
     {
-        template 
-        struct end_impl;
-
-        template <>
-        struct end_impl
+        template 
+        struct apply
         {
-            template 
-            struct apply 
+            typedef
+                basic_iterator<
+                    set_iterator_tag
+                  , typename Seq::category
+                  , Seq
+                  , Seq::size::value
+                >
+            type;
+
+            static type
+            call(Seq& seq)
             {
-                typedef typename 
-                    result_of::end::type
-                iterator_type;
-
-                typedef typename 
-                    result_of::end::type
-                const_iterator_type;
-
-                typedef typename 
-                    mpl::eval_if<
-                        is_const
-                      , mpl::identity
-                      , mpl::identity
-                    >::type
-                type;
-    
-                static type
-                call(Sequence& s)
-                {
-                    return fusion::end(s.get_data());
-                }
-            };
+                return type(seq,0);
+            }
         };
-    }
-}}
+    };
+}}}
 
 #endif
diff --git a/include/boost/fusion/container/set/detail/key_of_impl.hpp b/include/boost/fusion/container/set/detail/key_of_impl.hpp
new file mode 100644
index 00000000..9c56aaf5
--- /dev/null
+++ b/include/boost/fusion/container/set/detail/key_of_impl.hpp
@@ -0,0 +1,24 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_KEY_OF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_KEY_OF_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct key_of_impl;
+
+    template <>
+    struct key_of_impl
+      : value_of_impl
+    {};
+}}}
+
+#endif
diff --git a/include/boost/fusion/container/set/detail/lookup_key.hpp b/include/boost/fusion/container/set/detail/lookup_key.hpp
deleted file mode 100644
index a1b9e8b9..00000000
--- a/include/boost/fusion/container/set/detail/lookup_key.hpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(FUSION_LOOKUP_KEY_09162005_1111)
-#define FUSION_LOOKUP_KEY_09162005_1111
-
-#include 
-#include 
-#include 
-#include 
-
-namespace boost { namespace fusion 
-{
-    struct void_;    
-}}
-
-namespace boost { namespace fusion { namespace detail 
-{
-    template 
-    struct set_data_type
-    {
-        typedef typename add_reference::type type;
-    };
-
-    template <>
-    struct set_data_type
-    {
-        typedef void_& type;
-    };
-
-    template 
-    struct set_const_data_type
-    {
-        typedef typename 
-            add_reference<
-                typename add_const::type
-            >::type 
-        type;
-    };
-
-    template <>
-    struct set_const_data_type
-    {
-        typedef void_ const& type;
-    };
-
-    template 
-    struct set_value_type
-    {
-        typedef T type;
-    };
-
-    template <>
-    struct set_value_type
-    {
-        typedef void_ type;
-    };
-
-    template 
-    struct set_key_type
-    {
-        typedef T type;
-    };
-
-    template 
-    struct set_key_type
-    {
-        typedef unknown_key type;
-    };
-
-    template 
-    struct set_lookup_key
-    {
-        static RT
-        call(Vector& vec)
-        {
-            return vec.at_impl(mpl::int_());
-        }
-    };
-
-    template 
-    struct set_lookup_key, Vector>
-    {
-        static void_&
-        call(Vector& vec); // intentionally undefined
-    };
-}}} 
-
-#endif
-
diff --git a/include/boost/fusion/container/set/detail/set_lookup.hpp b/include/boost/fusion/container/set/detail/set_lookup.hpp
deleted file mode 100644
index 6df4b401..00000000
--- a/include/boost/fusion/container/set/detail/set_lookup.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_SET_LOOKUP_09162005_1116)
-#define FUSION_SET_LOOKUP_09162005_1116
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
-#pragma warning (push)
-#pragma warning(disable: 4348)  // redefinition of default parameter
-#endif
-
-    template 
-    struct meta_at_impl
-    {
-        typedef void_ type;
-    };
-
-    template 
-    struct meta_find_impl
-    {
-        typedef vector_iterator type;
-    };
-
-    template 
-    struct meta_find_impl_const
-    {
-        typedef vector_iterator type;
-    };
-
-    template 
-    vector_iterator
-    find_impl(mpl::identity) const
-    {
-        return vector_iterator(data);
-    }
-
-    template 
-    vector_iterator
-    find_impl(mpl::identity)
-    {
-        return vector_iterator(data);
-    }
-
-#define BOOST_PP_FILENAME_1 \
-    
-#define BOOST_PP_ITERATION_LIMITS (0, BOOST_PP_DEC(FUSION_MAX_SET_SIZE))
-#include BOOST_PP_ITERATE()
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
-#pragma warning (pop)
-#endif
-
-#endif
-#else // defined(BOOST_PP_IS_ITERATING)
-///////////////////////////////////////////////////////////////////////////////
-//
-//  Preprocessor vertical repetition code
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#define N BOOST_PP_ITERATION()
-
-    template 
-    struct meta_at_impl<
-        typename detail::set_key_type::type, dummy>
-    {
-        typedef typename detail::set_value_type::type type;
-    };
-
-    typename detail::set_data_type::type
-    at_impl(mpl::identity::type>)
-    {
-        return detail::set_lookup_key<
-            N
-          , typename detail::set_data_type::type
-          , typename detail::set_key_type::type
-          , storage_type>::call(data);
-    }
-
-    typename detail::set_const_data_type::type
-    at_impl(mpl::identity::type>) const
-    {
-        return detail::set_lookup_key<
-            N
-          , typename detail::set_const_data_type::type
-          , typename detail::set_key_type::type
-          , storage_type const>::call(data);
-    }
-
-    template 
-    struct meta_find_impl<
-        typename detail::set_key_type::type, dummy>
-    {
-        typedef vector_iterator type;
-    };
-
-    template 
-    struct meta_find_impl_const<
-        typename detail::set_key_type::type, dummy>
-    {
-        typedef vector_iterator type;
-    };
-
-    vector_iterator
-    find_impl(mpl::identity::type>)
-    {
-        return vector_iterator(data);
-    }
-
-    vector_iterator
-    find_impl(mpl::identity::type>) const
-    {
-        return vector_iterator(data);
-    }
-
-#undef N
-#endif // defined(BOOST_PP_IS_ITERATING)
-
diff --git a/include/boost/fusion/container/set/detail/value_at_key_impl.hpp b/include/boost/fusion/container/set/detail/value_at_key_impl.hpp
deleted file mode 100644
index 40f68ba0..00000000
--- a/include/boost/fusion/container/set/detail/value_at_key_impl.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-    Copyright (c) 2006 Dan Marsden
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#if !defined(FUSION_VALUE_AT_KEY_IMPL_09162005_1123)
-#define FUSION_VALUE_AT_KEY_IMPL_09162005_1123
-
-#include 
-
-namespace boost { namespace fusion
-{
-    struct set_tag;
-
-    namespace extension
-    {
-        template 
-        struct value_at_key_impl;
-
-        template <>
-        struct value_at_key_impl
-        {
-            template 
-            struct apply 
-            {
-                typedef typename Sequence::
-                    template meta_at_impl::type type;
-            };
-        };
-    }
-}}
-
-#endif
diff --git a/include/boost/fusion/container/set/detail/value_of_data_impl.hpp b/include/boost/fusion/container/set/detail/value_of_data_impl.hpp
new file mode 100644
index 00000000..c98e5b9f
--- /dev/null
+++ b/include/boost/fusion/container/set/detail/value_of_data_impl.hpp
@@ -0,0 +1,24 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_VALUE_OF_DATA_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_VALUE_OF_DATA_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct value_of_data_impl;
+
+    template <>
+    struct value_of_data_impl
+      : value_of_impl
+    {};
+}}}
+
+#endif
diff --git a/include/boost/fusion/container/set/detail/value_of_impl.hpp b/include/boost/fusion/container/set/detail/value_of_impl.hpp
new file mode 100644
index 00000000..02218310
--- /dev/null
+++ b/include/boost/fusion/container/set/detail/value_of_impl.hpp
@@ -0,0 +1,34 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_VALUE_OF_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_VALUE_OF_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct value_of_impl;
+
+    template <>
+    struct value_of_impl
+    {
+        template 
+        struct apply
+        {
+            typedef typename
+                result_of::value_at<
+                    typename It::seq_type::storage_type
+                  , typename It::index
+                >::type
+            type;
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/container/set/set.hpp b/include/boost/fusion/container/set/set.hpp
index 07580bb6..62b91402 100644
--- a/include/boost/fusion/container/set/set.hpp
+++ b/include/boost/fusion/container/set/set.hpp
@@ -11,11 +11,13 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -23,13 +25,12 @@
 namespace boost { namespace fusion
 {
     struct void_;
-    struct set_tag;
     struct fusion_sequence_tag;
 
     template 
     struct set : sequence_base >
     {
-        struct category : forward_traversal_tag, associative_sequence_tag {};
+        struct category : forward_traversal_tag, associative_tag {};
 
         typedef set_tag fusion_tag;
         typedef fusion_sequence_tag tag; // this gets picked up by MPL
@@ -49,7 +50,6 @@ namespace boost { namespace fusion
             : data(rhs) {}
 
         #include 
-        #include 
 
         template 
         set&
diff --git a/include/boost/fusion/container/set/set_fwd.hpp b/include/boost/fusion/container/set/set_fwd.hpp
index 7facb513..082422f1 100644
--- a/include/boost/fusion/container/set/set_fwd.hpp
+++ b/include/boost/fusion/container/set/set_fwd.hpp
@@ -13,6 +13,8 @@
 namespace boost { namespace fusion
 {
     struct void_;
+    struct set_tag;
+    struct set_iterator_tag;
 
     template <
         BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(
diff --git a/include/boost/fusion/include/deref_data.hpp b/include/boost/fusion/include/deref_data.hpp
new file mode 100644
index 00000000..24d4e7cf
--- /dev/null
+++ b/include/boost/fusion/include/deref_data.hpp
@@ -0,0 +1,13 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_INCLUDE_DEREF_DATA_HPP
+#define BOOST_FUSION_INCLUDE_DEREF_DATA_HPP
+
+#include 
+
+#endif
diff --git a/include/boost/fusion/include/key_of.hpp b/include/boost/fusion/include/key_of.hpp
new file mode 100644
index 00000000..cb29f571
--- /dev/null
+++ b/include/boost/fusion/include/key_of.hpp
@@ -0,0 +1,13 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_INCLUDE_KEY_OF_HPP
+#define BOOST_FUSION_INCLUDE_KEY_OF_HPP
+
+#include 
+
+#endif
diff --git a/include/boost/fusion/include/value_of_data.hpp b/include/boost/fusion/include/value_of_data.hpp
new file mode 100644
index 00000000..6884185f
--- /dev/null
+++ b/include/boost/fusion/include/value_of_data.hpp
@@ -0,0 +1,13 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_INCLUDE_VALUE_OF_DATA_HPP
+#define BOOST_FUSION_INCLUDE_VALUE_OF_DATA_HPP
+
+#include 
+
+#endif
diff --git a/include/boost/fusion/iterator/basic_iterator.hpp b/include/boost/fusion/iterator/basic_iterator.hpp
new file mode 100644
index 00000000..80c7f646
--- /dev/null
+++ b/include/boost/fusion/iterator/basic_iterator.hpp
@@ -0,0 +1,136 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_ITERATOR_BASIC_ITERATOR_HPP
+#define BOOST_FUSION_ITERATOR_BASIC_ITERATOR_HPP
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+namespace boost { namespace fusion
+{
+    namespace extension
+    {
+        template 
+        struct value_of_impl;
+
+        template 
+        struct deref_impl;
+
+        template 
+        struct value_of_data_impl;
+
+        template 
+        struct key_of_impl;
+
+        template 
+        struct deref_data_impl;
+    }
+
+    template
+    struct basic_iterator
+      : iterator_facade, Category>
+    {
+        typedef mpl::int_ index;
+        typedef Seq seq_type;
+
+        template 
+        struct value_of
+          : extension::value_of_impl::template apply
+        {};
+
+        template 
+        struct deref
+          : extension::deref_impl::template apply
+        {};
+
+        template 
+        struct value_of_data
+          : extension::value_of_data_impl::template apply
+        {};
+
+        template 
+        struct key_of
+          : extension::key_of_impl::template apply
+        {};
+
+        template 
+        struct deref_data
+          : extension::deref_data_impl::template apply
+        {};
+
+        template 
+        struct advance
+        {
+            typedef
+                basic_iterator
+            type;
+
+            static type
+            call(It const& it)
+            {
+                return type(*it.seq,0);
+            }
+        };
+
+        template 
+        struct next
+          : advance >
+        {};
+
+        template 
+        struct prior
+          : advance >
+        {};
+
+        template 
+        struct distance
+          : mpl::minus<
+                typename It2::index
+              , typename It1::index
+            >
+        {};
+
+        template 
+        struct equal_to
+          : mpl::and_<
+                is_same<
+                    typename remove_const::type
+                  , typename remove_const::type
+                >
+              , mpl::equal_to
+            >
+        {};
+
+        template
+        basic_iterator(basic_iterator const& it)
+          : seq(it.seq)
+        {}
+
+        basic_iterator(Seq& seq, int)
+          : seq(&seq)
+        {}
+
+        template
+        basic_iterator&
+        operator=(basic_iterator const& it)
+        {
+            seq=it.seq;
+            return *this;
+        }
+
+        Seq* seq;
+    };
+}}
+
+#endif
diff --git a/include/boost/fusion/iterator/deref_data.hpp b/include/boost/fusion/iterator/deref_data.hpp
new file mode 100644
index 00000000..09ba4392
--- /dev/null
+++ b/include/boost/fusion/iterator/deref_data.hpp
@@ -0,0 +1,49 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_ITERATOR_DEREF_DATA_HPP
+#define BOOST_FUSION_ITERATOR_DEREF_DATA_HPP
+
+#include 
+
+namespace boost { namespace fusion
+{
+    struct iterator_facade_tag;
+
+    namespace extension
+    {
+        template 
+        struct deref_data_impl;
+
+        template <>
+        struct deref_data_impl
+        {
+            template 
+            struct apply
+              : It::template deref_data
+            {};
+       };
+    }
+
+    namespace result_of
+    {
+        template 
+        struct deref_data
+          : extension::deref_data_impl::type>::
+                template apply
+        {};
+    }
+
+    template 
+    typename result_of::deref_data::type
+    deref_data(It const& it)
+    {
+        return result_of::deref_data::call(it);
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/iterator/iterator_facade.hpp b/include/boost/fusion/iterator/iterator_facade.hpp
index 3e0a926f..fa74f8dc 100644
--- a/include/boost/fusion/iterator/iterator_facade.hpp
+++ b/include/boost/fusion/iterator/iterator_facade.hpp
@@ -50,8 +50,7 @@ namespace boost { namespace fusion
         template 
         struct distance :
             distance_detail::linear_distance
-        {
-        };
+        {};
     };
 }}
 
diff --git a/include/boost/fusion/iterator/key_of.hpp b/include/boost/fusion/iterator/key_of.hpp
new file mode 100644
index 00000000..64c2f86a
--- /dev/null
+++ b/include/boost/fusion/iterator/key_of.hpp
@@ -0,0 +1,42 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_ITERATOR_KEY_OF_HPP
+#define BOOST_FUSION_ITERATOR_KEY_OF_HPP
+
+#include 
+
+namespace boost { namespace fusion
+{
+    struct iterator_facade_tag;
+
+    namespace extension
+    {
+        template 
+        struct key_of_impl;
+
+        template <>
+        struct key_of_impl
+        {
+            template 
+            struct apply
+              : It::template key_of
+            {};
+        };
+    }
+
+    namespace result_of
+    {
+        template 
+        struct key_of
+          : extension::key_of_impl::type>::
+                template apply
+        {};
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/iterator/value_of_data.hpp b/include/boost/fusion/iterator/value_of_data.hpp
new file mode 100644
index 00000000..4a8316de
--- /dev/null
+++ b/include/boost/fusion/iterator/value_of_data.hpp
@@ -0,0 +1,42 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_ITERATOR_VALUE_OF_DATA_HPP
+#define BOOST_FUSION_ITERATOR_VALUE_OF_DATA_HPP
+
+#include 
+
+namespace boost { namespace fusion
+{
+    struct iterator_facade_tag;
+
+    namespace extension
+    {
+        template 
+        struct value_of_data_impl;
+
+        template <>
+        struct value_of_data_impl
+        {
+            template 
+            struct apply
+              : It::template value_of_data
+            {};
+        };
+    }
+
+    namespace result_of
+    {
+        template 
+        struct value_of_data
+          : extension::value_of_data_impl::type>::
+                template apply
+        {};
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/sequence/intrinsic/at_key.hpp b/include/boost/fusion/sequence/intrinsic/at_key.hpp
index 849ff294..4c860bc1 100644
--- a/include/boost/fusion/sequence/intrinsic/at_key.hpp
+++ b/include/boost/fusion/sequence/intrinsic/at_key.hpp
@@ -9,6 +9,8 @@
 #define BOOST_FUSION_AT_KEY_20060304_1755
 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -25,15 +27,28 @@ namespace boost { namespace fusion
         template 
         struct at_key_impl
         {
-            template 
-            struct apply;
+            template 
+            struct apply
+            {
+                typedef typename
+                    result_of::deref_data<
+                        typename result_of::find::type
+                    >::type
+                type;
+
+                static type
+                call(Seq& seq)
+                {
+                    return fusion::deref_data(fusion::find(seq));
+                }
+            };
         };
 
         template <>
         struct at_key_impl
         {
             template 
-            struct apply : Sequence::template at_key {};
+            struct apply : Sequence::template at_key_impl {};
         };
 
         template <>
diff --git a/include/boost/fusion/sequence/intrinsic/ext_/size_s.hpp b/include/boost/fusion/sequence/intrinsic/ext_/size_s.hpp
old mode 100755
new mode 100644
index d3c31ccc..8b61746a
--- a/include/boost/fusion/sequence/intrinsic/ext_/size_s.hpp
+++ b/include/boost/fusion/sequence/intrinsic/ext_/size_s.hpp
@@ -28,8 +28,8 @@ namespace boost { namespace fusion
             template
             struct result;
 
-            template
-            struct result
+            template
+            struct result
               : mpl::plus<
                     segmented_size::type>
                   , typename remove_reference::type
diff --git a/include/boost/fusion/sequence/intrinsic/has_key.hpp b/include/boost/fusion/sequence/intrinsic/has_key.hpp
index 4c6a3e07..68582059 100644
--- a/include/boost/fusion/sequence/intrinsic/has_key.hpp
+++ b/include/boost/fusion/sequence/intrinsic/has_key.hpp
@@ -7,9 +7,11 @@
 #if !defined(FUSION_HAS_KEY_09232005_1454)
 #define FUSION_HAS_KEY_09232005_1454
 
-#include 
 #include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 namespace boost { namespace fusion
 {
@@ -26,10 +28,14 @@ namespace boost { namespace fusion
         template 
         struct has_key_impl
         {
-            template 
+            template 
             struct apply
-                : mpl::not_::type, void_> >
+              : mpl::not_<
+                    typename result_of::equal_to<
+                        typename result_of::find::type
+                      , typename result_of::end::type
+                    >::type
+                >::type
             {};
         };
 
diff --git a/include/boost/fusion/sequence/intrinsic/value_at_key.hpp b/include/boost/fusion/sequence/intrinsic/value_at_key.hpp
index dbef3e89..406d7ae2 100644
--- a/include/boost/fusion/sequence/intrinsic/value_at_key.hpp
+++ b/include/boost/fusion/sequence/intrinsic/value_at_key.hpp
@@ -9,6 +9,8 @@
 #define FUSION_VALUE_AT_KEY_05052005_0229
 
 #include 
+#include 
+#include 
 #include 
 
 namespace boost { namespace fusion
@@ -24,8 +26,12 @@ namespace boost { namespace fusion
         template 
         struct value_at_key_impl
         {
-            template 
-            struct apply;
+            template 
+            struct apply
+              : result_of::value_of_data<
+                    typename result_of::find::type
+                >
+            {};
         };
 
         template <>
diff --git a/include/boost/fusion/support/category_of.hpp b/include/boost/fusion/support/category_of.hpp
index 4d38fb64..8877b347 100644
--- a/include/boost/fusion/support/category_of.hpp
+++ b/include/boost/fusion/support/category_of.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion
     struct random_access_traversal_tag
         : bidirectional_traversal_tag {};
 
-    struct associative_sequence_tag {};
+    struct associative_tag {};
 
     namespace extension
     {
@@ -68,7 +68,7 @@ namespace boost { namespace fusion
         template 
         struct is_associative
             : is_base_of<
-                associative_sequence_tag
+                associative_tag
               , typename category_of::type>
         {};
 
diff --git a/include/boost/fusion/view/detail/strictest_traversal.hpp b/include/boost/fusion/view/detail/strictest_traversal.hpp
index e74ffbfc..0ba5d8a1 100644
--- a/include/boost/fusion/view/detail/strictest_traversal.hpp
+++ b/include/boost/fusion/view/detail/strictest_traversal.hpp
@@ -42,8 +42,8 @@ namespace boost { namespace fusion
             template
             struct result;
 
-            template
-            struct result
+            template
+            struct result
             {
                 typedef typename remove_reference::type next_value;
                 typedef typename remove_reference::type strictest_so_far;
diff --git a/include/boost/fusion/view/ext_/segmented_iterator.hpp b/include/boost/fusion/view/ext_/segmented_iterator.hpp
index b28182a4..79bc707e 100644
--- a/include/boost/fusion/view/ext_/segmented_iterator.hpp
+++ b/include/boost/fusion/view/ext_/segmented_iterator.hpp
@@ -9,8 +9,10 @@
 #define FUSION_SEGMENTED_ITERATOR_EAN_05032006_1027
 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -20,6 +22,7 @@
 #include 
 #include  // for nil
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -59,16 +62,15 @@ namespace boost { namespace fusion
         struct segmented_range_tag;
 
         ////////////////////////////////////////////////////////////////////////////
-        template
+        template
         struct segmented_range
-          : sequence_base >
+          : sequence_base >
         {
             BOOST_MPL_ASSERT_NOT((is_reference));
             typedef mpl::bool_ is_segmented;
             typedef segmented_range_tag fusion_tag;
             typedef fusion_sequence_tag tag; // this gets picked up by MPL
             typedef mpl::true_ is_view;
-            typedef Iterator iterator_type;
 
             // If this is a range of segments, skip over the empty ones
             typedef typename mpl::if_<
@@ -83,20 +85,34 @@ namespace boost { namespace fusion
               , sequence_non_ref_type &
             >::type sequence_type;
 
+            typedef
+                typename fusion::result_of::advance<
+                    typename fusion::result_of::begin::type
+                  , Index
+                >::type
+            iterator_type;
+
             typedef typename traits::category_of::type category;
 
             explicit segmented_range(Sequence &sequence_)
               : sequence(sequence_type(sequence_))
-              , where_(fusion::begin(sequence))
             {}
 
-            segmented_range(sequence_type sequence_, iterator_type const &wh)
+            segmented_range(sequence_type sequence_, int)
               : sequence(sequence_)
-              , where_(wh)
             {}
 
+            iterator_type where_() const
+            {
+                return fusion::advance(
+                    fusion::begin(const_cast(this->sequence))
+                );
+            }
+
             sequence_type sequence;
-            iterator_type where_;
+
+        private:
+            segmented_range &operator =(segmented_range const &);
         };
     }
 
@@ -148,7 +164,7 @@ namespace boost { namespace fusion
                 typedef typename Sequence::iterator_type type;
                 static type call(Sequence &seq)
                 {
-                    return seq.where_;
+                    return seq.where_();
                 }
             };
         };
@@ -176,15 +192,15 @@ namespace boost { namespace fusion
         template
         struct range_next;
 
-        template
-        struct range_next >
+        template
+        struct range_next >
         {
-            typedef typename result_of::next::type iterator_type;
-            typedef segmented_range type;
+            typedef typename mpl::next::type index_type;
+            typedef segmented_range type;
 
-            static type call(segmented_range const &rng)
+            static type call(segmented_range const &rng)
             {
-                return type(rng.sequence, fusion::next(rng.where_));
+                return type(rng.sequence, 0);
             }
         };
 
@@ -205,8 +221,7 @@ namespace boost { namespace fusion
         {
             typedef typename result_of::segments::type segments;
             typedef typename remove_reference::type sequence;
-            typedef typename result_of::begin >::type begin;
-            typedef segmented_range type;
+            typedef segmented_range, true> type;
 
             static type call(Sequence &seq)
             {
@@ -219,8 +234,7 @@ namespace boost { namespace fusion
         struct as_segmented_range
         {
             typedef typename remove_reference::type sequence;
-            typedef typename result_of::begin::type begin;
-            typedef segmented_range type;
+            typedef segmented_range, false> type;
 
             static type call(Sequence &seq)
             {
@@ -228,10 +242,10 @@ namespace boost { namespace fusion
             }
         };
 
-        template
-        struct as_segmented_range, IsSegmented>
+        template
+        struct as_segmented_range, IsSegmented>
         {
-            typedef segmented_range type;
+            typedef segmented_range type;
             static type &call(type &seq)
             {
                 return seq;
diff --git a/include/boost/fusion/view/filter_view/detail/begin_impl.hpp b/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
index 2ffe7bd0..7d94261d 100644
--- a/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
@@ -11,7 +11,7 @@ namespace boost { namespace fusion
 {
     struct filter_view_tag;
 
-    template 
+    template 
     struct filter_iterator;
 
     namespace extension
@@ -28,7 +28,8 @@ namespace boost { namespace fusion
                 typedef typename Sequence::first_type first_type;
                 typedef typename Sequence::last_type last_type;
                 typedef typename Sequence::pred_type pred_type;
-                typedef filter_iterator type;
+                typedef typename Sequence::category category;
+                typedef filter_iterator type;
 
                 static type
                 call(Sequence& s)
diff --git a/include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp b/include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp
new file mode 100644
index 00000000..bf721b5a
--- /dev/null
+++ b/include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp
@@ -0,0 +1,37 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_FILTER_VIEW_DETAIL_DEREF_DATA_IMPL_HPP
+#define BOOST_FUSION_VIEW_FILTER_VIEW_DETAIL_DEREF_DATA_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct deref_data_impl;
+
+    template <>
+    struct deref_data_impl
+    {
+        template 
+        struct apply
+        {
+            typedef typename
+                result_of::deref_data::type
+            type;
+
+            static type
+            call(It const& it)
+            {
+                return fusion::deref_data(it.first);
+            }
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/filter_view/detail/end_impl.hpp b/include/boost/fusion/view/filter_view/detail/end_impl.hpp
index 677004d4..baabbd45 100644
--- a/include/boost/fusion/view/filter_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/end_impl.hpp
@@ -11,7 +11,7 @@ namespace boost { namespace fusion
 {
     struct filter_view_tag;
 
-    template 
+    template 
     struct filter_iterator;
 
     namespace extension
@@ -27,7 +27,8 @@ namespace boost { namespace fusion
             {
                 typedef typename Sequence::last_type last_type;
                 typedef typename Sequence::pred_type pred_type;
-                typedef filter_iterator type;
+                typedef typename Sequence::category category;
+                typedef filter_iterator type;
 
                 static type
                 call(Sequence& s)
diff --git a/include/boost/fusion/view/filter_view/detail/key_of_impl.hpp b/include/boost/fusion/view/filter_view/detail/key_of_impl.hpp
new file mode 100644
index 00000000..09d9112b
--- /dev/null
+++ b/include/boost/fusion/view/filter_view/detail/key_of_impl.hpp
@@ -0,0 +1,28 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_FILTER_VIEW_DETAIL_KEY_OF_IMPL_HPP
+#define BOOST_FUSION_VIEW_FILTER_VIEW_DETAIL_KEY_OF_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct key_of_impl;
+
+    template <>
+    struct key_of_impl
+    {
+        template 
+        struct apply
+          : result_of::key_of
+        {};
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/filter_view/detail/next_impl.hpp b/include/boost/fusion/view/filter_view/detail/next_impl.hpp
index 8423dfe1..a436bfc2 100644
--- a/include/boost/fusion/view/filter_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/next_impl.hpp
@@ -8,14 +8,19 @@
 #define FUSION_NEXT_IMPL_06052005_0900
 
 #include 
+#include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 
 namespace boost { namespace fusion
 {
     struct filter_view_iterator_tag;
 
-    template 
+    template 
     struct filter_iterator;
 
     namespace extension
@@ -32,6 +37,7 @@ namespace boost { namespace fusion
                 typedef typename Iterator::first_type first_type;
                 typedef typename Iterator::last_type last_type;
                 typedef typename Iterator::pred_type pred_type;
+                typedef typename Iterator::category category;
 
                 typedef typename
                     mpl::eval_if<
@@ -41,12 +47,19 @@ namespace boost { namespace fusion
                     >::type
                 next_type;
 
-                typedef typename detail::static_find_if<
-                    next_type, last_type, pred_type>
+                typedef typename
+                    detail::static_find_if<
+                        next_type
+                      , last_type
+                      , mpl::bind1<
+                            typename mpl::lambda::type
+                          , mpl::bind1,mpl::_1>
+                        >
+                    >
                 filter;
 
                 typedef filter_iterator<
-                    typename filter::type, last_type, pred_type>
+                    category, typename filter::type, last_type, pred_type>
                 type;
 
                 static type
diff --git a/include/boost/fusion/view/filter_view/detail/value_of_data_impl.hpp b/include/boost/fusion/view/filter_view/detail/value_of_data_impl.hpp
new file mode 100644
index 00000000..38d1bdc0
--- /dev/null
+++ b/include/boost/fusion/view/filter_view/detail/value_of_data_impl.hpp
@@ -0,0 +1,28 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_FILTER_VIEW_DETAIL_VALUE_OF_DATA_IMPL_HPP
+#define BOOST_FUSION_VIEW_FILTER_VIEW_DETAIL_VALUE_OF_DATA_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct value_of_data_impl;
+
+    template <>
+    struct value_of_data_impl
+    {
+        template 
+        struct apply
+          : result_of::value_of_data
+        {};
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/filter_view/filter_view.hpp b/include/boost/fusion/view/filter_view/filter_view.hpp
index c3e63fdb..69f17329 100644
--- a/include/boost/fusion/view/filter_view/filter_view.hpp
+++ b/include/boost/fusion/view/filter_view/filter_view.hpp
@@ -17,6 +17,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+
 
 namespace boost { namespace fusion
 {
@@ -29,7 +33,13 @@ namespace boost { namespace fusion
     {
         typedef filter_view_tag fusion_tag;
         typedef fusion_sequence_tag tag; // this gets picked up by MPL
-        typedef forward_traversal_tag category;
+        typedef typename
+            mpl::eval_if<
+                traits::is_associative
+              , mpl::inherit2
+              , mpl::identity
+            >::type
+        category;
         typedef mpl::true_ is_view;
 
         typedef typename result_of::begin::type first_type;
diff --git a/include/boost/fusion/view/filter_view/filter_view_iterator.hpp b/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
index be93c657..5d1efc87 100644
--- a/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
+++ b/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
@@ -9,20 +9,29 @@
 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
+#include 
+#include 
 
 namespace boost { namespace fusion
 {
     struct filter_view_iterator_tag;
     struct forward_traversal_tag;
 
-    template 
-    struct filter_iterator : iterator_base >
+    template 
+    struct filter_iterator : iterator_base >
     {
         typedef convert_iterator first_converter;
         typedef typename first_converter::type first_iter;
@@ -30,8 +39,17 @@ namespace boost { namespace fusion
         typedef typename last_converter::type last_iter;
 
         typedef filter_view_iterator_tag fusion_tag;
-        typedef forward_traversal_tag category;
-        typedef detail::static_find_if filter;
+        typedef Category category;
+        typedef
+            detail::static_find_if<
+                first_iter
+              , last_iter
+              , mpl::bind1<
+                    typename mpl::lambda::type
+                  , mpl::bind1,mpl::_1>
+                >
+            >
+        filter;
         typedef typename filter::type first_type;
         typedef last_iter last_type;
         typedef Pred pred_type;
diff --git a/include/boost/fusion/view/iterator_range/iterator_range.hpp b/include/boost/fusion/view/iterator_range/iterator_range.hpp
index 0036f0ae..14bb2457 100644
--- a/include/boost/fusion/view/iterator_range/iterator_range.hpp
+++ b/include/boost/fusion/view/iterator_range/iterator_range.hpp
@@ -17,7 +17,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/view/joint_view/detail/begin_impl.hpp b/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
index e2b0281e..140d3756 100644
--- a/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
@@ -14,7 +14,7 @@ namespace boost { namespace fusion
 {
     struct joint_view_tag;
 
-    template 
+    template 
     struct joint_view_iterator;
 
     namespace extension
@@ -31,13 +31,14 @@ namespace boost { namespace fusion
                 typedef typename Sequence::first_type first_type;
                 typedef typename Sequence::last_type last_type;
                 typedef typename Sequence::concat_type concat_type;
+                typedef typename Sequence::category category;
                 typedef result_of::equal_to equal_to;
 
                 typedef typename
                     mpl::if_<
                         equal_to
                       , concat_type
-                      , joint_view_iterator
+                      , joint_view_iterator
                     >::type
                 type;
 
diff --git a/include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp b/include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp
new file mode 100644
index 00000000..a60a125f
--- /dev/null
+++ b/include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp
@@ -0,0 +1,37 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_DEREF_DATA_IMPL_HPP
+#define BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_DEREF_DATA_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct deref_data_impl;
+
+    template <>
+    struct deref_data_impl
+    {
+        template 
+        struct apply
+        {
+            typedef typename
+                result_of::deref_data::type
+            type;
+
+            static type
+            call(It const& it)
+            {
+                return fusion::deref_data(it.first);
+            }
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/joint_view/detail/key_of_impl.hpp b/include/boost/fusion/view/joint_view/detail/key_of_impl.hpp
new file mode 100644
index 00000000..e413c3d4
--- /dev/null
+++ b/include/boost/fusion/view/joint_view/detail/key_of_impl.hpp
@@ -0,0 +1,28 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_KEY_OF_IMPL_HPP
+#define BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_KEY_OF_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct key_of_impl;
+
+    template <>
+    struct key_of_impl
+    {
+        template 
+        struct apply
+          : result_of::key_of
+        {};
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/joint_view/detail/next_impl.hpp b/include/boost/fusion/view/joint_view/detail/next_impl.hpp
index 80d3580d..2313faa0 100644
--- a/include/boost/fusion/view/joint_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/next_impl.hpp
@@ -15,7 +15,7 @@ namespace boost { namespace fusion
 {
     struct joint_view_iterator_tag;
 
-    template 
+    template 
     struct joint_view_iterator;
 
     namespace extension
@@ -32,6 +32,7 @@ namespace boost { namespace fusion
                 typedef typename Iterator::first_type first_type;
                 typedef typename Iterator::last_type last_type;
                 typedef typename Iterator::concat_type concat_type;
+                typedef typename Iterator::category category;
                 typedef typename result_of::next::type next_type;
                 typedef result_of::equal_to equal_to;
 
@@ -39,7 +40,7 @@ namespace boost { namespace fusion
                     mpl::if_<
                         equal_to
                       , concat_type
-                      , joint_view_iterator
+                      , joint_view_iterator
                     >::type
                 type;
 
diff --git a/include/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp b/include/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp
new file mode 100644
index 00000000..cc883d70
--- /dev/null
+++ b/include/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp
@@ -0,0 +1,28 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_VALUE_OF_DATA_IMPL_HPP
+#define BOOST_FUSION_VIEW_JOINT_VIEW_DETAIL_VALUE_OF_DATA_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct value_of_data_impl;
+
+    template <>
+    struct value_of_data_impl
+    {
+        template 
+        struct apply
+          : result_of::value_of_data
+        {};
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/joint_view/joint_view.hpp b/include/boost/fusion/view/joint_view/joint_view.hpp
index 9cc798d3..48d912cd 100644
--- a/include/boost/fusion/view/joint_view/joint_view.hpp
+++ b/include/boost/fusion/view/joint_view/joint_view.hpp
@@ -19,6 +19,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 namespace boost { namespace fusion
 {
@@ -31,7 +34,16 @@ namespace boost { namespace fusion
     {
         typedef joint_view_tag fusion_tag;
         typedef fusion_sequence_tag tag; // this gets picked up by MPL
-        typedef forward_traversal_tag category;
+        typedef typename
+            mpl::eval_if<
+                mpl::and_<
+                    traits::is_associative
+                  , traits::is_associative
+                >
+              , mpl::inherit2
+              , mpl::identity
+            >::type
+        category;
         typedef mpl::true_ is_view;
 
         typedef typename result_of::begin::type first_type;
diff --git a/include/boost/fusion/view/joint_view/joint_view_iterator.hpp b/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
index 18696d7e..0fd4c636 100644
--- a/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
+++ b/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
@@ -14,6 +14,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 
 namespace boost { namespace fusion
@@ -21,9 +24,9 @@ namespace boost { namespace fusion
     struct joint_view_iterator_tag;
     struct forward_traversal_tag;
 
-    template 
+    template 
     struct joint_view_iterator
-        : iterator_base >
+        : iterator_base >
     {
         typedef convert_iterator first_converter;
         typedef convert_iterator last_converter;
@@ -34,7 +37,7 @@ namespace boost { namespace fusion
         typedef typename concat_converter::type concat_type;
 
         typedef joint_view_iterator_tag fusion_tag;
-        typedef forward_traversal_tag category;
+        typedef Category category;
         BOOST_STATIC_ASSERT((!result_of::equal_to::value));
 
         joint_view_iterator(First const& first, Concat const& concat)
diff --git a/include/boost/fusion/view/reverse_view/detail/at_impl.hpp b/include/boost/fusion/view/reverse_view/detail/at_impl.hpp
new file mode 100644
index 00000000..2e842596
--- /dev/null
+++ b/include/boost/fusion/view/reverse_view/detail/at_impl.hpp
@@ -0,0 +1,41 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_REVERSE_VIEW_DETAIL_AT_IMPL_HPP
+#define BOOST_FUSION_VIEW_REVERSE_VIEW_DETAIL_AT_IMPL_HPP
+
+#include 
+#include 
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct at_impl;
+
+    template <>
+    struct at_impl
+    {
+        template 
+        struct apply
+        {
+            typedef mpl::minus, N> real_n;
+
+            typedef typename
+                result_of::at::type
+            type;
+
+            static type
+            call(Seq& seq)
+            {
+                return fusion::at(seq.seq);
+            }
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp b/include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp
new file mode 100644
index 00000000..2f52bdd8
--- /dev/null
+++ b/include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp
@@ -0,0 +1,37 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_REVERSE_VIEW_DETAIL_DEREF_DATA_IMPL_HPP
+#define BOOST_FUSION_VIEW_REVERSE_VIEW_DETAIL_DEREF_DATA_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct deref_data_impl;
+
+    template <>
+    struct deref_data_impl
+    {
+        template 
+        struct apply
+        {
+            typedef typename
+                result_of::deref_data::type
+            type;
+
+            static type
+            call(It const& it)
+            {
+                return fusion::deref_data(it.first);
+            }
+        };
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/reverse_view/detail/key_of_impl.hpp b/include/boost/fusion/view/reverse_view/detail/key_of_impl.hpp
new file mode 100644
index 00000000..3d760fd2
--- /dev/null
+++ b/include/boost/fusion/view/reverse_view/detail/key_of_impl.hpp
@@ -0,0 +1,28 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_REVERSE_VIEW_DETAIL_KEY_OF_IMPL_HPP
+#define BOOST_FUSION_VIEW_REVERSE_VIEW_DETAIL_KEY_OF_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct key_of_impl;
+
+    template <>
+    struct key_of_impl
+    {
+        template 
+        struct apply
+          : result_of::key_of
+        {};
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/reverse_view/detail/value_at_impl.hpp b/include/boost/fusion/view/reverse_view/detail/value_at_impl.hpp
new file mode 100644
index 00000000..90f5129b
--- /dev/null
+++ b/include/boost/fusion/view/reverse_view/detail/value_at_impl.hpp
@@ -0,0 +1,33 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_REVERSE_VIEW_DETAIL_VALUE_AT_IMPL_HPP
+#define BOOST_FUSION_VIEW_REVERSE_VIEW_DETAIL_VALUE_AT_IMPL_HPP
+
+#include 
+#include 
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct value_at_impl;
+
+    template <>
+    struct value_at_impl
+    {
+        template 
+        struct apply
+          : result_of::value_at<
+                typename Seq::seq_type
+              , mpl::minus, N>
+            >
+        {};
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/reverse_view/detail/value_of_data_impl.hpp b/include/boost/fusion/view/reverse_view/detail/value_of_data_impl.hpp
new file mode 100644
index 00000000..69d310ff
--- /dev/null
+++ b/include/boost/fusion/view/reverse_view/detail/value_of_data_impl.hpp
@@ -0,0 +1,28 @@
+/*=============================================================================
+    Copyright (c) 2009 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_VIEW_REVERSE_VIEW_DETAIL_VALUE_OF_DATA_IMPL_HPP
+#define BOOST_FUSION_VIEW_REVERSE_VIEW_DETAIL_VALUE_OF_DATA_IMPL_HPP
+
+#include 
+
+namespace boost { namespace fusion { namespace extension
+{
+    template 
+    struct value_of_data_impl;
+
+    template <>
+    struct value_of_data_impl
+    {
+        template 
+        struct apply
+          : result_of::value_of_data
+        {};
+    };
+}}}
+
+#endif
diff --git a/include/boost/fusion/view/reverse_view/reverse_view.hpp b/include/boost/fusion/view/reverse_view/reverse_view.hpp
index c939f7ce..19b51d13 100644
--- a/include/boost/fusion/view/reverse_view/reverse_view.hpp
+++ b/include/boost/fusion/view/reverse_view/reverse_view.hpp
@@ -13,6 +13,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -20,6 +22,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 namespace boost { namespace fusion
 {
@@ -33,6 +38,7 @@ namespace boost { namespace fusion
         typedef fusion_sequence_tag tag; // this gets picked up by MPL
         typedef mpl::true_ is_view;
 
+        typedef Sequence seq_type;
         typedef typename traits::category_of::type category;
         typedef typename result_of::begin::type first_type;
         typedef typename result_of::end::type last_type;
diff --git a/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp b/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
index 0a890437..af2267e3 100644
--- a/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
+++ b/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
@@ -17,6 +17,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 
diff --git a/test/algorithm/erase_key.cpp b/test/algorithm/erase_key.cpp
index 56c64780..418b5d77 100644
--- a/test/algorithm/erase_key.cpp
+++ b/test/algorithm/erase_key.cpp
@@ -66,8 +66,8 @@ main()
     std::cout << tuple_close(']');
     std::cout << tuple_delimiter(", ");
 
-    test_set(as_set(erase_key(make_set(1, 'x', 1.5, std::string("hello")))));
-    test_map(as_map(erase_key<_2>(make_map<_1, _2, _3, _4>(1, 'x', 1.5, "hello"))));
+    test_set(erase_key(make_set(1, 'x', 1.5, std::string("hello"))));
+    test_map(erase_key<_2>(make_map<_1, _2, _3, _4>(1, 'x', 1.5, "hello")));
 
     return boost::report_errors();
 }
diff --git a/test/algorithm/fold.cpp b/test/algorithm/fold.cpp
index a890da67..ec51b406 100644
--- a/test/algorithm/fold.cpp
+++ b/test/algorithm/fold.cpp
@@ -34,22 +34,22 @@ struct add_ints_only
     template
     struct result;
 
-    template 
-    struct result
+    template 
+    struct result
     {
         typedef typename boost::remove_const<
             typename boost::remove_reference::type>::type type;
     };
 
-    template 
-    State const&
-    operator()(T const& x, State const& state) const
+    template 
+    State
+    operator()(State const& state, T const& x) const
     {
         return state;
     }
 
     int
-    operator()(int x, int state) const
+    operator()(int state, int x) const
     {
         return x + state;
     }
@@ -60,13 +60,13 @@ struct count_ints
     template
     struct result;
 
-    template 
-    struct result
+    template 
+    struct result
     {
-        typedef typename boost::remove_const<
-            typename boost::remove_reference::type>::type elem;
         typedef typename boost::remove_const<
             typename boost::remove_reference::type>::type state;
+        typedef typename boost::remove_const<
+            typename boost::remove_reference::type>::type elem;
 
         typedef typename
             if_<
@@ -77,11 +77,11 @@ struct count_ints
         type;
     };
 
-    template 
-    typename result::type
-    operator()(T const&, CountT const&) const
+    template 
+    typename result::type
+    operator()(CountT const&, T const&) const
     {
-        typedef typename result::type result;
+        typedef typename result::type result;
         return result();
     }
 };
@@ -90,7 +90,7 @@ struct appender
 {
     typedef std::string result_type;
 
-    std::string operator()(char c, std::string const& str) const
+    std::string operator()(std::string const& str, char c) const
     {
         return str + c;
     }
@@ -102,14 +102,14 @@ struct lvalue_adder
     struct result;
 
     template
-    struct result
+    struct result
     {
         // Second argument still needs to support rvalues - see definition of fusion::fold
-        typedef T0 type; 
+        typedef T1 type;
     };
 
     template
-    T0 operator()(T0& lhs, T1 const& rhs) const
+    T1 operator()(T0 const& lhs, T1& rhs) const
     {
         return lhs + rhs;
     }
diff --git a/test/compile_time/fold.cpp b/test/compile_time/fold.cpp
index fa2e8f6c..5fb618dd 100644
--- a/test/compile_time/fold.cpp
+++ b/test/compile_time/fold.cpp
@@ -22,7 +22,7 @@ namespace
     typedef int result_type;
 
     template
-    int operator()(distinct const& d, int state) const
+    int operator()(int state, distinct const& d) const
     {
       return state + n;
     }
diff --git a/test/functional/make_unfused.cpp b/test/functional/make_unfused.cpp
index a6462eb1..ff52e54f 100644
--- a/test/functional/make_unfused.cpp
+++ b/test/functional/make_unfused.cpp
@@ -67,7 +67,7 @@ struct test_func
         typedef long result_type;
 
         template 
-        long operator()(T & elem, long value) const
+        long operator()(long value, T & elem) const
         {
           elem += sizeof(T);
           return value + elem;
diff --git a/test/functional/unfused.cpp b/test/functional/unfused.cpp
index 0f69be9c..27a242a6 100644
--- a/test/functional/unfused.cpp
+++ b/test/functional/unfused.cpp
@@ -57,7 +57,7 @@ struct test_func
         typedef long result_type;
 
         template 
-        long operator()(T & elem, long value) const
+        long operator()(long value, T & elem) const
         {
           elem += sizeof(T);
           return value + elem;
diff --git a/test/functional/unfused_typed.cpp b/test/functional/unfused_typed.cpp
index 7c5fa856..2d49f77f 100644
--- a/test/functional/unfused_typed.cpp
+++ b/test/functional/unfused_typed.cpp
@@ -63,13 +63,13 @@ struct test_func
         typedef long result_type;
 
         template 
-        long operator()(T const & elem, long value) const
+        long operator()(long value, T const & elem) const
         {
           return value + sizeof(T) * elem;
         }
 
         template 
-        long operator()(T & elem, long value) const
+        long operator()(long value, T & elem) const
         {
           elem += sizeof(T);
           return value;
diff --git a/test/sequence/adapt_assoc_struct.cpp b/test/sequence/adapt_assoc_struct.cpp
index acab2b97..7fe5e35b 100644
--- a/test/sequence/adapt_assoc_struct.cpp
+++ b/test/sequence/adapt_assoc_struct.cpp
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -26,7 +27,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -126,6 +130,13 @@ main()
         BOOST_TEST(at_key(p) == 3);
     }
 
+    {
+        BOOST_MPL_ASSERT((mpl::is_sequence));
+        BOOST_MPL_ASSERT((boost::is_same<
+            fusion::result_of::value_at_c::type
+          , mpl::front::type>));
+    }
+
     return boost::report_errors();
 }
 
diff --git a/test/sequence/adapt_struct.cpp b/test/sequence/adapt_struct.cpp
index 2d208b57..981b9c13 100644
--- a/test/sequence/adapt_struct.cpp
+++ b/test/sequence/adapt_struct.cpp
@@ -11,6 +11,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -22,7 +23,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -114,6 +118,14 @@ main()
         BOOST_MPL_ASSERT((is_same::type, e>));
     }
 
+
+    {
+        BOOST_MPL_ASSERT((mpl::is_sequence));
+        BOOST_MPL_ASSERT((boost::is_same<
+            fusion::result_of::value_at_c::type
+          , mpl::front::type>));
+    }
+
     return boost::report_errors();
 }
 
diff --git a/test/sequence/array.cpp b/test/sequence/array.cpp
index 0ca5255d..07b5f48e 100644
--- a/test/sequence/array.cpp
+++ b/test/sequence/array.cpp
@@ -15,8 +15,12 @@
 #include 
 #include 
 #include 
+#include 
 
+#include 
+#include 
 #include 
+#include 
 
 int main()
 {
@@ -37,5 +41,8 @@ int main()
     BOOST_TEST(size(arr) == 3);
     BOOST_TEST(distance(begin(arr), end(arr)) == 3);
 
+    BOOST_MPL_ASSERT((boost::mpl::is_sequence));
+    BOOST_MPL_ASSERT((boost::is_same::type>));
+
     return boost::report_errors();
 }
diff --git a/test/sequence/as_set.cpp b/test/sequence/as_set.cpp
index d13d0959..935da42d 100644
--- a/test/sequence/as_set.cpp
+++ b/test/sequence/as_set.cpp
@@ -33,7 +33,7 @@ main()
         std::cout << as_set(make_list(1, 1.23, "harru")) << std::endl;
         std::cout << as_set(push_back(empty, 999)) << std::endl;
         
-        BOOST_TEST(as_list(as_set(make_list(1, 1.23, "harru"))) 
+        BOOST_TEST(as_list(as_set(make_list(1, 1.23, "harru")))
             == make_list(1, 1.23, std::string("harru")));
         BOOST_TEST(as_list(as_set(push_back(empty, 999)))
             == push_back(empty, 999));
diff --git a/test/sequence/boost_tuple.cpp b/test/sequence/boost_tuple.cpp
index c3949cbf..ef5dfa3b 100644
--- a/test/sequence/boost_tuple.cpp
+++ b/test/sequence/boost_tuple.cpp
@@ -23,8 +23,11 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -96,6 +99,12 @@ main()
         BOOST_TEST(2u == fusion::distance(fusion::begin(t), fusion::end(t))); 
     } 
 
+    {
+        typedef boost::tuple tuple_type;
+        BOOST_MPL_ASSERT((mpl::is_sequence));
+        BOOST_MPL_ASSERT((boost::is_same::type>));
+    }
+
     return boost::report_errors();
 }
 
diff --git a/test/sequence/filter_view.cpp b/test/sequence/filter_view.cpp
index a89abec2..5c4c1a0c 100644
--- a/test/sequence/filter_view.cpp
+++ b/test/sequence/filter_view.cpp
@@ -13,6 +13,12 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -62,22 +68,6 @@ main()
     std::cout << tuple_close(']');
     std::cout << tuple_delimiter(", ");
 
-    { // Testing the static find_if (internal function)
-
-        typedef vector vector_type;
-
-        vector_type v(1, 'x', 987654, X());
-        typedef vector_iterator begin;
-        typedef vector_iterator end;
-        typedef detail::static_find_if > filter;
-        typedef filter::type type;
-
-        BOOST_TEST(*type(v) == 987654);
-        std::cout << *type(v) << std::endl;
-        std::cout << *filter::call(begin(v)) << std::endl;
-        BOOST_TEST(*type(v) == *filter::call(begin(v)));
-    }
-
     {
         typedef vector vector_type;
 
@@ -115,6 +105,23 @@ main()
         BOOST_MPL_ASSERT((result_of::equal_to::type, result_of::end::type>));
     }
 
+    {
+        typedef map, pair > map_type;
+        map_type m(make_pair(0), make_pair("Bond"));
+
+        typedef filter_view > > filter_view_type;
+        filter_view_type f(m);
+
+        BOOST_MPL_ASSERT((result_of::has_key::type));
+        BOOST_MPL_ASSERT_NOT((result_of::has_key::type));
+
+        BOOST_MPL_ASSERT((is_same::type>::type, double>));
+        BOOST_MPL_ASSERT((is_same::type>::type, std::string>));
+
+        std::cout << deref_data(begin(f)) << std::endl;
+        BOOST_TEST((deref_data(begin(f)) == "Bond"));
+    }
+
     return boost::report_errors();
 }
 
diff --git a/test/sequence/iterator_range.cpp b/test/sequence/iterator_range.cpp
index af42cadd..d4062840 100644
--- a/test/sequence/iterator_range.cpp
+++ b/test/sequence/iterator_range.cpp
@@ -5,15 +5,23 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 int
@@ -76,6 +84,31 @@ main()
         BOOST_STATIC_ASSERT(result_of::size::value == 2);
     }
 
+    {
+        typedef map, pair,pair > map_type;
+        map_type m(make_pair("foo"), make_pair('x'), make_pair(2));
+
+        typedef iterator_range<
+            result_of::begin::type
+          , result_of::advance_c::type,2>::type
+        > range_type;
+        range_type r(begin(m), advance_c<2>(begin(m)));
+
+        BOOST_MPL_ASSERT((result_of::has_key::type));
+        BOOST_MPL_ASSERT((result_of::has_key::type));
+
+        BOOST_MPL_ASSERT((boost::is_same::type>::type, void>));
+        BOOST_MPL_ASSERT((boost::is_same::type>::type>::type, double>));
+
+        BOOST_MPL_ASSERT((boost::is_same::type>::type, std::string>));
+        BOOST_MPL_ASSERT((boost::is_same::type>::type>::type, char>));
+
+        std::cout << deref_data(begin(r)) << std::endl;
+        std::cout << deref_data(next(begin(r))) << std::endl;
+        BOOST_TEST((deref_data(begin(r)) == "foo"));
+        BOOST_TEST((deref_data(next(begin(r))) == 'x'));
+    }
+
     return boost::report_errors();
 }
 
diff --git a/test/sequence/joint_view.cpp b/test/sequence/joint_view.cpp
index 8dc4eb3c..e53d333c 100644
--- a/test/sequence/joint_view.cpp
+++ b/test/sequence/joint_view.cpp
@@ -5,13 +5,22 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 struct X
 {
@@ -139,6 +148,40 @@ main()
         }
     }
 
+    {
+        typedef map > map_type;
+        map_type m(make_pair(0));
+
+        typedef set set_type;
+        set_type s("foo", 1.3f);
+
+        typedef joint_view joint_view_type;
+        joint_view_type j(m,s);
+
+        BOOST_MPL_ASSERT((result_of::has_key::type));
+        BOOST_MPL_ASSERT((result_of::has_key::type));
+        BOOST_MPL_ASSERT((result_of::has_key::type));
+
+        BOOST_MPL_ASSERT((boost::is_same::type>::type, void>));
+        BOOST_MPL_ASSERT((boost::is_same::type>::type>::type, std::string>));
+        BOOST_MPL_ASSERT((boost::is_same<
+                result_of::key_of::type>::type>::type>::type
+              , float>));
+
+        BOOST_MPL_ASSERT((boost::is_same::type>::type, int>));
+        BOOST_MPL_ASSERT((boost::is_same::type>::type>::type, std::string>));
+        BOOST_MPL_ASSERT((boost::is_same<
+                result_of::value_of_data::type>::type>::type>::type
+              , float>));
+
+        std::cout << deref_data(begin(j)) << std::endl;
+        std::cout << deref_data(boost::fusion::next(begin(j))) << std::endl;
+        std::cout << deref_data(next(boost::fusion::next(begin(j)))) << std::endl;
+        BOOST_TEST((deref_data(begin(j)) == 0));
+        BOOST_TEST((deref_data(boost::fusion::next(begin(j))) == "foo"));
+        BOOST_TEST((deref_data(next(boost::fusion::next(begin(j)))) == 1.3f));
+    }
+
     return boost::report_errors();
 }
 
diff --git a/test/sequence/map.cpp b/test/sequence/map.cpp
index 5f58b9dc..d4e1cfa3 100644
--- a/test/sequence/map.cpp
+++ b/test/sequence/map.cpp
@@ -10,7 +10,12 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -59,6 +64,17 @@ main()
         BOOST_STATIC_ASSERT((result_of::has_key::value));
         BOOST_STATIC_ASSERT((result_of::has_key::value));
         BOOST_STATIC_ASSERT((!result_of::has_key::value));
+
+        std::cout << deref_data(begin(m)) << std::endl;
+        std::cout << deref_data(next(begin(m))) << std::endl;
+
+        BOOST_TEST(deref_data(begin(m)) == 'X');
+        BOOST_TEST(deref_data(next(begin(m))) == "Men");
+
+        BOOST_STATIC_ASSERT((is_same::type>::type, int>::value));
+        BOOST_STATIC_ASSERT((is_same::type>::type>::type, double>::value));
+        BOOST_STATIC_ASSERT((is_same::type>::type, char>::value));
+        BOOST_STATIC_ASSERT((is_same::type>::type>::type, std::string>::value));
     }
     
     {
diff --git a/test/sequence/reverse_view.cpp b/test/sequence/reverse_view.cpp
index 3fb20e55..980bdc78 100644
--- a/test/sequence/reverse_view.cpp
+++ b/test/sequence/reverse_view.cpp
@@ -12,12 +12,17 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
+
 
 int
 main()
@@ -57,6 +62,24 @@ main()
         BOOST_TEST((*prior(second_it) == s));
         BOOST_TEST((*advance_c<2>(first_it) == 'x'));
         BOOST_TEST((distance(first_it, second_it) == 1));
+
+        BOOST_TEST((at_c<0>(rev)==s));
+        BOOST_TEST((at_c<1>(rev)==123456789));
+        BOOST_TEST((at_c<2>(rev)=='x'));
+        BOOST_TEST((at_c<3>(rev)==123));
+
+        BOOST_MPL_ASSERT((
+            boost::is_same::type,char const*>
+        ));
+        BOOST_MPL_ASSERT((
+            boost::is_same::type,long>
+        ));
+        BOOST_MPL_ASSERT((
+            boost::is_same::type,char>
+        ));
+        BOOST_MPL_ASSERT((
+            boost::is_same::type,int>
+        ));
     }
 
     return boost::report_errors();
diff --git a/test/sequence/set.cpp b/test/sequence/set.cpp
index 95c5b40d..7be0b078 100644
--- a/test/sequence/set.cpp
+++ b/test/sequence/set.cpp
@@ -10,7 +10,12 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -48,12 +53,23 @@ main()
             boost::is_same::type, int>::value));
         BOOST_STATIC_ASSERT((
             boost::is_same::type, std::string>::value));
-        
+
         std::cout << m << std::endl;
 
         BOOST_STATIC_ASSERT((result_of::has_key::value));
         BOOST_STATIC_ASSERT((result_of::has_key::value));
         BOOST_STATIC_ASSERT((!result_of::has_key::value));
+
+        std::cout << deref_data(begin(m)) << std::endl;
+        std::cout << deref_data(next(begin(m))) << std::endl;
+
+        BOOST_TEST(deref_data(begin(m)) == 123);
+        BOOST_TEST(deref_data(next(begin(m))) == "Hola");
+
+        BOOST_STATIC_ASSERT((is_same::type>::type, int>::value));
+        BOOST_STATIC_ASSERT((is_same::type>::type>::type, std::string>::value));
+        BOOST_STATIC_ASSERT((is_same::type>::type, int>::value));
+        BOOST_STATIC_ASSERT((is_same::type>::type>::type, std::string>::value));
     }
     
     {
diff --git a/test/sequence/std_pair.cpp b/test/sequence/std_pair.cpp
index b5c18d17..0a704753 100644
--- a/test/sequence/std_pair.cpp
+++ b/test/sequence/std_pair.cpp
@@ -22,7 +22,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -86,6 +89,12 @@ main()
         l = std::make_pair(123, "Hola!!!");
     }
 
+    {
+        typedef std::pair pair_type;
+        BOOST_MPL_ASSERT((mpl::is_sequence));
+        BOOST_MPL_ASSERT((boost::is_same::type>));
+    }
+
     return boost::report_errors();
 }