Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r58618 - in branches/release: boost/fusion boost/fusion/adapted boost/fusion/adapted/array boost/fusion/adapted/boost_tuple boost/fusion/adapted/class boost/fusion/adapted/std_pair boost/fusion/adapted/struct boost/fusion/algorithm/iteration/detail boost/fusion/algorithm/query boost/fusion/algorithm/query/detail boost/fusion/algorithm/transformation boost/fusion/container/deque boost/fusion/container/map boost/fusion/container/map/detail boost/fusion/container/set boost/fusion/container/set/detail boost/fusion/include boost/fusion/iterator boost/fusion/sequence/intrinsic boost/fusion/sequence/intrinsic/ext_ boost/fusion/support boost/fusion/view/detail boost/fusion/view/ext_ boost/fusion/view/filter_view boost/fusion/view/filter_view/detail boost/fusion/view/iterator_range boost/fusion/view/joint_view boost/fusion/view/joint_view/detail boost/fusion/view/reverse_view boost/fusion/view/reverse_view/detail libs/fusion libs/fusion/doc libs/fusion/doc/html libs/fusion/doc/html/fusion libs/fusion/doc/html/fusion/adapted libs/fusion/doc/html/fusion/algorithm libs/fusion/doc/html/fusion/algorithm/iteration libs/fusion/doc/html/fusion/algorithm/iteration/functions libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions libs/fusion/doc/html/fusion/algorithm/query libs/fusion/doc/html/fusion/algorithm/query/functions libs/fusion/doc/html/fusion/algorithm/query/metafunctions libs/fusion/doc/html/fusion/algorithm/transformation libs/fusion/doc/html/fusion/algorithm/transformation/functions libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions libs/fusion/doc/html/fusion/container libs/fusion/doc/html/fusion/container/conversion libs/fusion/doc/html/fusion/container/conversion/functions libs/fusion/doc/html/fusion/container/conversion/metafunctions libs/fusion/doc/html/fusion/container/generation libs/fusion/doc/html/fusion/container/generation/functions libs/fusion/doc/html/fusion/container/generation/metafunctions libs/fusion/doc/html/fusion/extension libs/fusion/doc/html/fusion/functional libs/fusion/doc/html/fusion/functional/adapters libs/fusion/doc/html/fusion/functional/concepts libs/fusion/doc/html/fusion/functional/generation libs/fusion/doc/html/fusion/functional/generation/functions libs/fusion/doc/html/fusion/functional/generation/metafunctions libs/fusion/doc/html/fusion/functional/invocation libs/fusion/doc/html/fusion/functional/invocation/functions libs/fusion/doc/html/fusion/functional/invocation/metafunctions libs/fusion/doc/html/fusion/iterator libs/fusion/doc/html/fusion/iterator/concepts libs/fusion/doc/html/fusion/iterator/functions libs/fusion/doc/html/fusion/iterator/metafunctions libs/fusion/doc/html/fusion/iterator/operator libs/fusion/doc/html/fusion/sequence libs/fusion/doc/html/fusion/sequence/concepts libs/fusion/doc/html/fusion/sequence/intrinsic libs/fusion/doc/html/fusion/sequence/intrinsic/functions libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions libs/fusion/doc/html/fusion/sequence/operator libs/fusion/doc/html/fusion/sequence/operator/comparison libs/fusion/doc/html/fusion/sequence/operator/i_o libs/fusion/doc/html/fusion/support libs/fusion/doc/html/fusion/tuple libs/fusion/doc/html/fusion/tuple/class_template_tuple libs/fusion/doc/html/fusion/view libs/fusion/example/extension libs/fusion/example/extension/detail libs/fusion/example/performance libs/fusion/test/algorithm libs/fusion/test/compile_time libs/fusion/test/functional libs/fusion/test/sequence
From: mr.chr.schmidt_at_[hidden]
Date: 2010-01-01 17:00:54


Author: cschmidt
Date: 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
New Revision: 58618
URL: http://svn.boost.org/trac/boost/changeset/58618

Log:
fusion: merge of associative iterators/views and the new fold interface
Added:
   branches/release/boost/fusion/container/map/detail/deref_data_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/container/map/detail/deref_data_impl.hpp
   branches/release/boost/fusion/container/map/detail/deref_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/container/map/detail/deref_impl.hpp
   branches/release/boost/fusion/container/map/detail/key_of_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/container/map/detail/key_of_impl.hpp
   branches/release/boost/fusion/container/map/detail/value_of_data_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/container/map/detail/value_of_data_impl.hpp
   branches/release/boost/fusion/container/map/detail/value_of_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/container/map/detail/value_of_impl.hpp
   branches/release/boost/fusion/container/set/detail/deref_data_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/container/set/detail/deref_data_impl.hpp
   branches/release/boost/fusion/container/set/detail/deref_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/container/set/detail/deref_impl.hpp
   branches/release/boost/fusion/container/set/detail/key_of_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/container/set/detail/key_of_impl.hpp
   branches/release/boost/fusion/container/set/detail/value_of_data_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/container/set/detail/value_of_data_impl.hpp
   branches/release/boost/fusion/container/set/detail/value_of_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/container/set/detail/value_of_impl.hpp
   branches/release/boost/fusion/include/deref_data.hpp
      - copied unchanged from r57242, /trunk/boost/fusion/include/deref_data.hpp
   branches/release/boost/fusion/include/key_of.hpp
      - copied unchanged from r57242, /trunk/boost/fusion/include/key_of.hpp
   branches/release/boost/fusion/include/value_of_data.hpp
      - copied unchanged from r57242, /trunk/boost/fusion/include/value_of_data.hpp
   branches/release/boost/fusion/iterator/basic_iterator.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/iterator/basic_iterator.hpp
   branches/release/boost/fusion/iterator/deref_data.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/iterator/deref_data.hpp
   branches/release/boost/fusion/iterator/key_of.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/iterator/key_of.hpp
   branches/release/boost/fusion/iterator/value_of_data.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/iterator/value_of_data.hpp
   branches/release/boost/fusion/view/filter_view/detail/deref_data_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/view/filter_view/detail/deref_data_impl.hpp
   branches/release/boost/fusion/view/filter_view/detail/key_of_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/view/filter_view/detail/key_of_impl.hpp
   branches/release/boost/fusion/view/filter_view/detail/value_of_data_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/view/filter_view/detail/value_of_data_impl.hpp
   branches/release/boost/fusion/view/joint_view/detail/deref_data_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/view/joint_view/detail/deref_data_impl.hpp
   branches/release/boost/fusion/view/joint_view/detail/key_of_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/view/joint_view/detail/key_of_impl.hpp
   branches/release/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/view/joint_view/detail/value_of_data_impl.hpp
   branches/release/boost/fusion/view/reverse_view/detail/at_impl.hpp
      - copied unchanged from r58299, /trunk/boost/fusion/view/reverse_view/detail/at_impl.hpp
   branches/release/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp
   branches/release/boost/fusion/view/reverse_view/detail/key_of_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/view/reverse_view/detail/key_of_impl.hpp
   branches/release/boost/fusion/view/reverse_view/detail/value_at_impl.hpp
      - copied unchanged from r58299, /trunk/boost/fusion/view/reverse_view/detail/value_at_impl.hpp
   branches/release/boost/fusion/view/reverse_view/detail/value_of_data_impl.hpp
      - copied unchanged from r57156, /trunk/boost/fusion/view/reverse_view/detail/value_of_data_impl.hpp
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/associative_iterator.html
      - copied, changed from r57242, /trunk/libs/fusion/doc/html/fusion/iterator/concepts/associative_iterator.html
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref_data.html
      - copied, changed from r57242, /trunk/libs/fusion/doc/html/fusion/iterator/functions/deref_data.html
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref_data.html
      - copied, changed from r57242, /trunk/libs/fusion/doc/html/fusion/iterator/metafunctions/deref_data.html
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/key_of.html
      - copied, changed from r57242, /trunk/libs/fusion/doc/html/fusion/iterator/metafunctions/key_of.html
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of_data.html
      - copied, changed from r57242, /trunk/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of_data.html
   branches/release/libs/fusion/example/extension/detail/deref_data_impl.hpp
      - copied unchanged from r58549, /trunk/libs/fusion/example/extension/detail/deref_data_impl.hpp
   branches/release/libs/fusion/example/extension/detail/key_of_impl.hpp
      - copied unchanged from r58549, /trunk/libs/fusion/example/extension/detail/key_of_impl.hpp
   branches/release/libs/fusion/example/extension/detail/value_of_data_impl.hpp
      - copied unchanged from r58549, /trunk/libs/fusion/example/extension/detail/value_of_data_impl.hpp
Removed:
   branches/release/boost/fusion/adapted/class/
   branches/release/boost/fusion/algorithm/query/detail/assoc_find.hpp
   branches/release/boost/fusion/container/map/detail/at_key_impl.hpp
   branches/release/boost/fusion/container/map/detail/lookup_key.hpp
   branches/release/boost/fusion/container/map/detail/map_lookup.hpp
   branches/release/boost/fusion/container/map/detail/value_at_key_impl.hpp
   branches/release/boost/fusion/container/set/detail/at_key_impl.hpp
   branches/release/boost/fusion/container/set/detail/lookup_key.hpp
   branches/release/boost/fusion/container/set/detail/set_lookup.hpp
   branches/release/boost/fusion/container/set/detail/value_at_key_impl.hpp
Properties modified:
   branches/release/boost/fusion/ (props changed)
   branches/release/libs/fusion/ (props changed)
Text files modified:
   branches/release/boost/fusion/adapted/array/tag_of.hpp | 19 +++
   branches/release/boost/fusion/adapted/boost_tuple/tag_of.hpp | 51 ++++++++
   branches/release/boost/fusion/adapted/std_pair.hpp | 73 +++++++----
   branches/release/boost/fusion/adapted/std_pair/tag_of.hpp | 19 +++
   branches/release/boost/fusion/adapted/struct/adapt_assoc_struct.hpp | 19 +++
   branches/release/boost/fusion/adapted/struct/adapt_struct.hpp | 19 +++
   branches/release/boost/fusion/adapted/struct/extension.hpp | 89 ++++++++-------
   branches/release/boost/fusion/algorithm/iteration/detail/fold.hpp | 98 ++++++++--------
   branches/release/boost/fusion/algorithm/query/detail/find_if.hpp | 26 ---
   branches/release/boost/fusion/algorithm/query/find.hpp | 35 ++---
   branches/release/boost/fusion/algorithm/query/find_if.hpp | 35 ++---
   branches/release/boost/fusion/algorithm/transformation/erase_key.hpp | 11 -
   branches/release/boost/fusion/container/deque/deque.hpp | 1
   branches/release/boost/fusion/container/map/detail/begin_impl.hpp | 69 ++++-------
   branches/release/boost/fusion/container/map/detail/end_impl.hpp | 66 ++++------
   branches/release/boost/fusion/container/map/map.hpp | 12 +-
   branches/release/boost/fusion/container/map/map_fwd.hpp | 2
   branches/release/boost/fusion/container/set/detail/begin_impl.hpp | 69 ++++-------
   branches/release/boost/fusion/container/set/detail/end_impl.hpp | 66 ++++------
   branches/release/boost/fusion/container/set/set.hpp | 12 +-
   branches/release/boost/fusion/container/set/set_fwd.hpp | 2
   branches/release/boost/fusion/iterator/iterator_facade.hpp | 3
   branches/release/boost/fusion/sequence/intrinsic/at_key.hpp | 21 +++
   branches/release/boost/fusion/sequence/intrinsic/ext_/size_s.hpp | 4
   branches/release/boost/fusion/sequence/intrinsic/has_key.hpp | 16 +
   branches/release/boost/fusion/sequence/intrinsic/value_at_key.hpp | 10 +
   branches/release/boost/fusion/support/category_of.hpp | 4
   branches/release/boost/fusion/view/detail/strictest_traversal.hpp | 4
   branches/release/boost/fusion/view/ext_/segmented_iterator.hpp | 56 +++++---
   branches/release/boost/fusion/view/filter_view/detail/begin_impl.hpp | 5
   branches/release/boost/fusion/view/filter_view/detail/end_impl.hpp | 5
   branches/release/boost/fusion/view/filter_view/detail/next_impl.hpp | 21 ++
   branches/release/boost/fusion/view/filter_view/filter_view.hpp | 12 +
   branches/release/boost/fusion/view/filter_view/filter_view_iterator.hpp | 28 +++
   branches/release/boost/fusion/view/iterator_range/iterator_range.hpp | 1
   branches/release/boost/fusion/view/joint_view/detail/begin_impl.hpp | 5
   branches/release/boost/fusion/view/joint_view/detail/next_impl.hpp | 5
   branches/release/boost/fusion/view/joint_view/joint_view.hpp | 14 ++
   branches/release/boost/fusion/view/joint_view/joint_view_iterator.hpp | 9 +
   branches/release/boost/fusion/view/reverse_view/reverse_view.hpp | 6 +
   branches/release/boost/fusion/view/reverse_view/reverse_view_iterator.hpp | 3
   branches/release/libs/fusion/changelist.txt | 7
   branches/release/libs/fusion/doc/algorithm.qbk | 211 ++++++++++++++++++++++++++---------
   branches/release/libs/fusion/doc/changelog.qbk | 6
   branches/release/libs/fusion/doc/extension.qbk | 36 +++--
   branches/release/libs/fusion/doc/fusion.qbk | 6
   branches/release/libs/fusion/doc/html/fusion/acknowledgements.html | 4
   branches/release/libs/fusion/doc/html/fusion/adapted.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/adapted/adapt_assoc.html | 43 +++++++
   branches/release/libs/fusion/doc/html/fusion/adapted/adapt_struct.html | 43 +++++++
   branches/release/libs/fusion/doc/html/fusion/adapted/boost__array.html | 33 +++++
   branches/release/libs/fusion/doc/html/fusion/adapted/boost__tuple.html | 30 +++++
   branches/release/libs/fusion/doc/html/fusion/adapted/mpl_sequence.html | 35 +++++
   branches/release/libs/fusion/doc/html/fusion/adapted/std__pair.html | 33 +++++
   branches/release/libs/fusion/doc/html/fusion/algorithm.html | 25 ++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions.html | 4
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/accumulate.html | 225 +++++++++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/fold.html | 222 +++++++++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/for_each.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions.html | 4
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/fold.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html | 143 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions.html | 4
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/all.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/any.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count_if.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find_if.html | 154 +++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/none.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions.html | 4
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/all.html | 143 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/any.html | 143 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count.html | 143 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count_if.html | 143 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find.html | 148 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find_if.html | 148 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/none.html | 143 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions.html | 4
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/clear.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase.html | 200 +++++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase_key.html | 192 ++++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter.html | 184 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter_if.html | 184 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert_range.html | 184 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/join.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_back.html | 184 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_front.html | 184 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_back.html | 184 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_front.html | 184 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove.html | 184 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove_if.html | 184 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace_if.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/reverse.html | 189 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/transform.html | 218 ++++++++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/zip.html | 168 ++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions.html | 4
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/clear.html | 143 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase.html | 159 ++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html | 160 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter.html | 159 ++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html | 159 ++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert.html | 159 ++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html | 159 ++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/join.html | 154 +++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html | 161 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html | 144 +++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html | 144 +++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html | 144 +++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove.html | 159 ++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html | 159 ++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace.html | 143 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html | 143 ++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html | 164 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/transform.html | 234 +++++++++++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/zip.html | 137 +++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/change_log.html | 4
   branches/release/libs/fusion/doc/html/fusion/container.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/container/cons.html | 61 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/conversion.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions.html | 4
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_list.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_map.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_set.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_vector.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions.html | 4
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_list.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_map.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_set.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_vector.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions.html | 4
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/list_tie.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_cons.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_list.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_map.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_set.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_vector.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/map_tie.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/tiers.html | 69 +++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/vector_tie.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions.html | 4
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/list_tie.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_cons.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_list.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_map.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_set.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_vector.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/map_tie.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/vector_tie.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/list.html | 61 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/map.html | 59 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/set.html | 59 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/container/vector.html | 58 +++++++++
   branches/release/libs/fusion/doc/html/fusion/extension.html | 4
   branches/release/libs/fusion/doc/html/fusion/extension/ext_full.html | 98 ++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/extension/iterator_facade.html | 152 +++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/extension/sequence_facade.html | 82 +++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional.html | 29 ++++
   branches/release/libs/fusion/doc/html/fusion/functional/adapters.html | 4
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused.html | 72 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_function_object.html | 60 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_procedure.html | 60 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/limits.html | 22 +++
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused.html | 67 +++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_typed.html | 67 +++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/concepts.html | 4
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/callable.html | 31 +++++
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/def_callable.html | 41 +++++++
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/poly.html | 40 ++++++
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/reg_callable.html | 40 ++++++
   branches/release/libs/fusion/doc/html/fusion/functional/generation.html | 4
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions.html | 4
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_proc.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions.html | 4
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused.html | 112 ++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html | 112 ++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html | 112 ++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html | 112 ++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/invocation.html | 4
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions.html | 4
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_fobj.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_proc.html | 187 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/limits.html | 22 +++
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions.html | 4
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke.html | 87 ++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html | 87 ++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html | 87 ++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/introduction.html | 61 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator.html | 17 ++
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts.html | 12 +
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/associative_iterator.html | 16 +-
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/bidirectional_iterator.html | 53 +++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/forward_iterator.html | 47 ++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/random_access_iterator.html | 46 +++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/functions.html | 13 +
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance.html | 76 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance_c.html | 82 +++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref.html | 76 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref_data.html | 18 +-
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/distance.html | 76 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/next.html | 76 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/prior.html | 76 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions.html | 7 +
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance.html | 79 +++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance_c.html | 85 +++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref.html | 76 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref_data.html | 18 +-
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/distance.html | 80 +++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/equal_to.html | 80 +++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/key_of.html | 18 +-
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/next.html | 77 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/prior.html | 77 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of.html | 79 +++++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of_data.html | 18 +-
   branches/release/libs/fusion/doc/html/fusion/iterator/operator.html | 13 +
   branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_equality.html | 65 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_inequality.html | 65 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_unary_star.html | 73 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/notes.html | 106 +++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/organization.html | 65 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/preface.html | 67 +++++++++++
   branches/release/libs/fusion/doc/html/fusion/quick_start.html | 100 ++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/references.html | 4
   branches/release/libs/fusion/doc/html/fusion/sequence.html | 19 ++
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts.html | 18 +++
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/associative_sequence.html | 50 +++++++-
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/bidirectional_sequence.html | 50 ++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/forward_sequence.html | 59 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/random_access_sequence.html | 53 +++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic.html | 50 ++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions.html | 4
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_c.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_key.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/back.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/begin.html | 186 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/empty.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/end.html | 186 +++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/front.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/has_key.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/size.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/swap.html | 137 +++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions.html | 4
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at.html | 161 ++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html | 161 ++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html | 161 ++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/back.html | 128 +++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html | 152 +++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html | 128 +++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/end.html | 152 +++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/front.html | 128 +++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html | 128 +++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/size.html | 128 +++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html | 103 ++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html | 128 +++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html | 128 +++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html | 128 +++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/operator.html | 4
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/equal.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than.html | 137 +++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html | 137 +++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than.html | 137 +++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than_equal.html | 137 +++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/not_equal.html | 137 +++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/in.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/out.html | 162 +++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/html/fusion/support.html | 4
   branches/release/libs/fusion/doc/html/fusion/support/category_of.html | 73 ++++++++---
   branches/release/libs/fusion/doc/html/fusion/support/deduce.html | 44 +++++++
   branches/release/libs/fusion/doc/html/fusion/support/deduce_sequence.html | 44 +++++++
   branches/release/libs/fusion/doc/html/fusion/support/is_sequence.html | 49 ++++++++
   branches/release/libs/fusion/doc/html/fusion/support/is_view.html | 50 ++++++++
   branches/release/libs/fusion/doc/html/fusion/support/pair.html | 53 ++++++++
   branches/release/libs/fusion/doc/html/fusion/support/tag_of.html | 54 +++++++++
   branches/release/libs/fusion/doc/html/fusion/tuple.html | 4
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/construction.html | 23 +++
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/element_access.html | 19 +++
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/relational_operators.html | 20 +++
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html | 19 +++
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html | 19 +++
   branches/release/libs/fusion/doc/html/fusion/tuple/pairs.html | 22 +++
   branches/release/libs/fusion/doc/html/fusion/view.html | 11 +
   branches/release/libs/fusion/doc/html/fusion/view/filter_view.html | 71 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/view/iterator_range.html | 75 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/view/joint_view.html | 74 ++++++++++++
   branches/release/libs/fusion/doc/html/fusion/view/nview.html | 61 ++++++++++
   branches/release/libs/fusion/doc/html/fusion/view/reverse_view.html | 70 +++++++++++
   branches/release/libs/fusion/doc/html/fusion/view/single_view.html | 48 ++++++++
   branches/release/libs/fusion/doc/html/fusion/view/transform_view.html | 49 ++++++++
   branches/release/libs/fusion/doc/html/fusion/view/zip_view.html | 63 ++++++++++
   branches/release/libs/fusion/doc/html/index.html | 56 ++++++++
   branches/release/libs/fusion/doc/iterator.qbk | 198 +++++++++++++++++++++++++++++++++
   branches/release/libs/fusion/doc/sequence.qbk | 110 ++++++++++++++----
   branches/release/libs/fusion/doc/support.qbk | 25 ---
   branches/release/libs/fusion/doc/view.qbk | 15 +
   branches/release/libs/fusion/example/extension/detail/category_of_impl.hpp | 2
   branches/release/libs/fusion/example/extension/example_struct_iterator.hpp | 12 +
   branches/release/libs/fusion/example/extension/test_example.cpp | 3
   branches/release/libs/fusion/example/performance/accumulate.cpp | 4
   branches/release/libs/fusion/example/performance/inner_product2.cpp | 4
   branches/release/libs/fusion/test/algorithm/erase_key.cpp | 4
   branches/release/libs/fusion/test/algorithm/fold.cpp | 36 +++---
   branches/release/libs/fusion/test/compile_time/fold.cpp | 2
   branches/release/libs/fusion/test/functional/make_unfused.cpp | 2
   branches/release/libs/fusion/test/functional/unfused.cpp | 2
   branches/release/libs/fusion/test/functional/unfused_typed.cpp | 4
   branches/release/libs/fusion/test/sequence/adapt_assoc_struct.cpp | 11 +
   branches/release/libs/fusion/test/sequence/adapt_struct.cpp | 12 ++
   branches/release/libs/fusion/test/sequence/array.cpp | 7 +
   branches/release/libs/fusion/test/sequence/as_set.cpp | 2
   branches/release/libs/fusion/test/sequence/boost_tuple.cpp | 9 +
   branches/release/libs/fusion/test/sequence/filter_view.cpp | 39 +++--
   branches/release/libs/fusion/test/sequence/iterator_range.cpp | 33 +++++
   branches/release/libs/fusion/test/sequence/joint_view.cpp | 45 +++++++
   branches/release/libs/fusion/test/sequence/map.cpp | 16 ++
   branches/release/libs/fusion/test/sequence/reverse_view.cpp | 23 +++
   branches/release/libs/fusion/test/sequence/set.cpp | 18 ++
   branches/release/libs/fusion/test/sequence/std_pair.cpp | 9 +
   332 files changed, 26623 insertions(+), 1070 deletions(-)

Modified: branches/release/boost/fusion/adapted/array/tag_of.hpp
==============================================================================
--- branches/release/boost/fusion/adapted/array/tag_of.hpp (original)
+++ branches/release/boost/fusion/adapted/array/tag_of.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -21,6 +21,7 @@
 namespace boost { namespace fusion
 {
     struct array_tag;
+ struct fusion_sequence_tag;
 
     namespace traits
     {
@@ -36,4 +37,22 @@
     }
 }}
 
+namespace boost { namespace mpl
+{
+ template<typename>
+ struct sequence_tag;
+
+ template<typename T, std::size_t N>
+ struct sequence_tag<array<T,N> >
+ {
+ typedef fusion::fusion_sequence_tag type;
+ };
+
+ template<typename T, std::size_t N>
+ struct sequence_tag<array<T,N> const>
+ {
+ typedef fusion::fusion_sequence_tag type;
+ };
+}}
+
 #endif

Modified: branches/release/boost/fusion/adapted/boost_tuple/tag_of.hpp
==============================================================================
--- branches/release/boost/fusion/adapted/boost_tuple/tag_of.hpp (original)
+++ branches/release/boost/fusion/adapted/boost_tuple/tag_of.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -26,6 +26,7 @@
 namespace boost { namespace fusion
 {
     struct boost_tuple_tag;
+ struct fusion_sequence_tag;
 
     namespace traits
     {
@@ -60,4 +61,54 @@
     }
 }}
 
+namespace boost { namespace mpl
+{
+ template<typename>
+ 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<tuples::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
+ {
+ 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<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> const
+ >
+ {
+ typedef fusion::fusion_sequence_tag type;
+ };
+
+ template <class Head, class Tail>
+ struct sequence_tag<tuples::cons<Head, Tail> >
+ {
+ typedef fusion::fusion_sequence_tag type;
+ };
+
+ template <class Head, class Tail>
+ struct sequence_tag<tuples::cons<Head, Tail> const>
+ {
+ typedef fusion::fusion_sequence_tag type;
+ };
+
+ template <>
+ struct sequence_tag<tuples::null_type>
+ {
+ typedef fusion::fusion_sequence_tag type;
+ };
+
+ template <>
+ struct sequence_tag<tuples::null_type const>
+ {
+ typedef fusion::fusion_sequence_tag type;
+ };
+}}
+
 #endif

Modified: branches/release/boost/fusion/adapted/std_pair.hpp
==============================================================================
--- branches/release/boost/fusion/adapted/std_pair.hpp (original)
+++ branches/release/boost/fusion/adapted/std_pair.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -16,6 +16,7 @@
 namespace boost { namespace fusion
 {
     struct struct_tag;
+ struct fusion_sequence_tag;
 
     namespace traits
     {
@@ -29,42 +30,60 @@
             typedef struct_tag type;
         };
     }
+}}
+
+namespace boost { namespace mpl
+{
+ template<typename>
+ struct sequence_tag;
 
- namespace extension
+ template<typename T1, typename T2>
+ struct sequence_tag<std::pair<T1, T2> >
     {
- template <typename Struct, int N>
- struct struct_member;
+ typedef fusion::fusion_sequence_tag type;
+ };
 
- template <typename Struct>
- struct struct_size;
+ template<typename T1, typename T2>
+ struct sequence_tag<std::pair<T1, T2> const>
+ {
+ typedef fusion::fusion_sequence_tag type;
+ };
+}}
 
- template <typename T1, typename T2>
- struct struct_member<std::pair<T1, T2>, 0>
- {
- typedef T1 type;
+namespace boost { namespace fusion { namespace extension
+{
+ template <typename Struct, int N>
+ struct struct_member;
 
- static type& call(std::pair<T1, T2>& pair)
- {
- return pair.first;
- }
- };
+ template <typename Struct>
+ struct struct_size;
 
- template <typename T1, typename T2>
- struct struct_member<std::pair<T1, T2>, 1>
+ template <typename T1, typename T2>
+ struct struct_member<std::pair<T1, T2>, 0>
+ {
+ typedef T1 type;
+
+ static type& call(std::pair<T1, T2>& pair)
         {
- typedef T2 type;
+ return pair.first;
+ }
+ };
 
- static type& call(std::pair<T1, T2>& pair)
- {
- return pair.second;
- }
- };
+ template <typename T1, typename T2>
+ struct struct_member<std::pair<T1, T2>, 1>
+ {
+ typedef T2 type;
 
- template <typename T1, typename T2>
- struct struct_size<std::pair<T1, T2> > : mpl::int_<2>
+ static type& call(std::pair<T1, T2>& pair)
         {
- };
- }
-}}
+ return pair.second;
+ }
+ };
+
+ template <typename T1, typename T2>
+ struct struct_size<std::pair<T1, T2> > : mpl::int_<2>
+ {
+ };
+}}}
 
 #endif

Modified: branches/release/boost/fusion/adapted/std_pair/tag_of.hpp
==============================================================================
--- branches/release/boost/fusion/adapted/std_pair/tag_of.hpp (original)
+++ branches/release/boost/fusion/adapted/std_pair/tag_of.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -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 mpl
+{
+ template<typename>
+ struct sequence_tag;
+
+ template<typename T1, typename T2>
+ struct sequence_tag<std::pair<T1, T2> >
+ {
+ typedef fusion::fusion_sequence_tag type;
+ };
+
+ template<typename T1, typename T2>
+ struct sequence_tag<std::pair<T1, T2> const>
+ {
+ typedef fusion::fusion_sequence_tag type;
+ };
+}}
+
 #endif

Modified: branches/release/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
==============================================================================
--- branches/release/boost/fusion/adapted/struct/adapt_assoc_struct.hpp (original)
+++ branches/release/boost/fusion/adapted/struct/adapt_assoc_struct.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -62,6 +62,25 @@
             typedef struct_tag type; \
         }; \
     }}} \
+ \
+ namespace boost { namespace mpl \
+ { \
+ template<typename> \
+ struct sequence_tag; \
+ \
+ template<> \
+ struct sequence_tag<name> \
+ { \
+ typedef fusion::fusion_sequence_tag type; \
+ }; \
+ \
+ template<> \
+ struct sequence_tag<name const> \
+ { \
+ typedef fusion::fusion_sequence_tag type; \
+ }; \
+ }} \
+ \
     namespace boost { namespace fusion { namespace extension \
     { \
         template <> \

Modified: branches/release/boost/fusion/adapted/struct/adapt_struct.hpp
==============================================================================
--- branches/release/boost/fusion/adapted/struct/adapt_struct.hpp (original)
+++ branches/release/boost/fusion/adapted/struct/adapt_struct.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -52,6 +52,25 @@
             typedef struct_tag type; \
         }; \
     }}} \
+ \
+ namespace boost { namespace mpl \
+ { \
+ template<typename> \
+ struct sequence_tag; \
+ \
+ template<> \
+ struct sequence_tag<name> \
+ { \
+ typedef fusion::fusion_sequence_tag type; \
+ }; \
+ \
+ template<> \
+ struct sequence_tag<name const> \
+ { \
+ typedef fusion::fusion_sequence_tag type; \
+ }; \
+ }} \
+ \
     namespace boost { namespace fusion { namespace extension \
     { \
         template <> \

Modified: branches/release/boost/fusion/adapted/struct/extension.hpp
==============================================================================
--- branches/release/boost/fusion/adapted/struct/extension.hpp (original)
+++ branches/release/boost/fusion/adapted/struct/extension.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -10,58 +10,63 @@
 
 #include <boost/type_traits/add_const.hpp>
 
-namespace boost { namespace fusion { namespace extension
+namespace boost { namespace fusion
 {
- template <typename Struct, int N>
- struct struct_member;
+ struct fusion_sequence_tag;
 
- template <typename Struct>
- struct struct_size;
-
- template <typename Struct, int N>
- struct struct_member<Struct const, N>
+ namespace extension
     {
- typedef typename
- add_const<typename struct_member<Struct, N>::type>::type
- type;
+ template <typename Struct, int N>
+ struct struct_member;
 
- static type&
- call(Struct const& struct_)
- {
- return struct_member<Struct, N>::call(
- const_cast<Struct&>(struct_));
- }
- };
-
- template <typename Struct>
- struct struct_size<Struct const>
- : struct_size<Struct>
- {};
+ template <typename Struct>
+ struct struct_size;
 
- struct no_such_member;
+ template <typename Struct, int N>
+ struct struct_member<Struct const, N>
+ {
+ typedef typename
+ add_const<typename struct_member<Struct, N>::type>::type
+ type;
+
+ static type&
+ call(Struct const& struct_)
+ {
+ return struct_member<Struct, N>::call(
+ const_cast<Struct&>(struct_));
+ }
+ };
+
+ template <typename Struct>
+ struct struct_size<Struct const>
+ : struct_size<Struct>
+ {};
 
- template<typename Struct, typename Key>
- struct struct_assoc_member
- {
- typedef no_such_member type;
- };
+ struct no_such_member;
 
- template<typename Struct, typename Key>
- struct struct_assoc_member<Struct const, Key>
- {
- typedef typename
- add_const<typename struct_assoc_member<Struct, Key>::type>::type
- type;
+ template<typename Struct, typename Key>
+ struct struct_assoc_member
+ {
+ typedef no_such_member type;
+ };
 
- static type&
- call(Struct const& struct_)
+ template<typename Struct, typename Key>
+ struct struct_assoc_member<Struct const, Key>
         {
- return struct_assoc_member<Struct, Key>::call(
- const_cast<Struct&>(struct_));
- }
- };
+ typedef typename
+ add_const<typename struct_assoc_member<Struct, Key>::type>::type
+ type;
+
+ static type&
+ call(Struct const& struct_)
+ {
+ return struct_assoc_member<Struct, Key>::call(
+ const_cast<Struct&>(struct_));
+ }
+ };
 
-}}}
+ }
+}}
 
 #endif
 

Modified: branches/release/boost/fusion/algorithm/iteration/detail/fold.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/iteration/detail/fold.hpp (original)
+++ branches/release/boost/fusion/algorithm/iteration/detail/fold.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -34,18 +34,18 @@
     template <typename F>
     struct apply_fold_result
     {
- template <typename Value, typename State>
+ template <typename State, typename Value>
         struct apply
- : boost::result_of<F(Value,State)>
+ : boost::result_of<F(State, Value)>
         {};
     };
 
- template <typename Iterator, typename State, typename F>
+ template <typename State, typename Iterator, typename F>
     struct fold_apply
     {
         typedef typename result_of::deref<Iterator>::type dereferenced;
         typedef typename add_reference<typename add_const<State>::type>::type lvalue_state;
- typedef typename boost::result_of<F(dereferenced, lvalue_state)>::type type;
+ typedef typename boost::result_of<F(lvalue_state, dereferenced)>::type type;
     };
 
     template <typename First, typename Last, typename State, typename F>
@@ -56,9 +56,9 @@
     {
         typedef typename
         static_fold<
- typename result_of::next<First>::type
+ typename result_of::next<First>::type
             , Last
- , typename fold_apply<First, State, F>::type
+ , typename fold_apply<State, First, F>::type
             , F
>::type
         type;
@@ -78,15 +78,15 @@
         typedef typename result::type type;
     };
 
- template<typename I0, typename State, typename F, int N>
+ template<typename State, typename I0, typename F, int N>
     struct result_of_unrolled_fold;
 
     template<int N>
     struct unrolled_fold
     {
- template<typename I0, typename State, typename F>
- static typename result_of_unrolled_fold<I0, State, F, N>::type
- call(I0 const& i0, State const& state, F f)
+ template<typename State, typename I0, typename F>
+ static typename result_of_unrolled_fold<State, I0, F, N>::type
+ call(State const& state, I0 const& i0, F f)
         {
             typedef typename result_of::next<I0>::type I1;
             I1 i1 = fusion::next(i0);
@@ -97,54 +97,54 @@
             typedef typename result_of::next<I3>::type I4;
             I4 i4 = fusion::next(i3);
 
- return unrolled_fold<N-4>::call(i4, f(*i3, f(*i2, f(*i1, f(*i0, state)))), f);
+ return unrolled_fold<N-4>::call(f(f(f(f(state, *i0), *i1), *i2), *i3), i4, f);
         }
     };
 
     template<>
     struct unrolled_fold<3>
     {
- template<typename I0, typename State, typename F>
- static typename result_of_unrolled_fold<I0, State, F, 3>::type
- call(I0 const& i0, State const& state, F f)
+ template<typename State, typename I0, typename F>
+ static typename result_of_unrolled_fold<State, I0, F, 3>::type
+ call(State const& state, I0 const& i0, F f)
         {
             typedef typename result_of::next<I0>::type I1;
             I1 i1 = fusion::next(i0);
             typedef typename result_of::next<I1>::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<typename I0, typename State, typename F>
- static typename result_of_unrolled_fold<I0, State, F, 2>::type
- call(I0 const& i0, State const& state, F f)
+ template<typename State, typename I0, typename F>
+ static typename result_of_unrolled_fold<State, I0, F, 2>::type
+ call(State const& state, I0 const& i0, F f)
         {
             typedef typename result_of::next<I0>::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<typename I0, typename State, typename F>
- static typename result_of_unrolled_fold<I0, State, F, 1>::type
- call(I0 const& i0, State const& state, F f)
+ template<typename State, typename I0, typename F>
+ static typename result_of_unrolled_fold<State, I0, F, 1>::type
+ call(State const& state, I0 const& i0, F f)
         {
- return f(*i0, state);
+ return f(state, *i0);
         }
     };
 
     template<>
     struct unrolled_fold<0>
     {
- template<typename I0, typename State, typename F>
- static State call(I0 const&, State const& state, F)
+ template<typename State, typename I0, typename F>
+ static State call(State const& state, I0 const&, F)
         {
             return state;
         }
@@ -171,53 +171,53 @@
         return detail::linear_fold(
             fusion::next(first)
           , last
- , f(*first, state)
+ , f(state, *first)
           , f
           , result_of::equal_to<typename result_of::next<First>::type, Last>()
         );
     }
 
- template<typename I0, typename State, typename F, int N>
+ template<typename State, typename I0, typename F, int N>
     struct result_of_unrolled_fold
     {
         typedef typename result_of::next<I0>::type I1;
         typedef typename result_of::next<I1>::type I2;
         typedef typename result_of::next<I2>::type I3;
         typedef typename result_of::next<I3>::type I4;
- typedef typename fold_apply<I0, State, F>::type Rest1;
- typedef typename fold_apply<I1, Rest1, F>::type Rest2;
- typedef typename fold_apply<I2, Rest2, F>::type Rest3;
- typedef typename fold_apply<I3, Rest3, F>::type Rest4;
+ typedef typename fold_apply<State, I0, F>::type Rest1;
+ typedef typename fold_apply<Rest1, I1, F>::type Rest2;
+ typedef typename fold_apply<Rest2, I2, F>::type Rest3;
+ typedef typename fold_apply<Rest3, I3, F>::type Rest4;
 
- typedef typename result_of_unrolled_fold<I4, Rest4, F, N-4>::type type;
+ typedef typename result_of_unrolled_fold<Rest4, I4, F, N-4>::type type;
     };
 
- template<typename I0, typename State, typename F>
- struct result_of_unrolled_fold<I0, State, F, 3>
+ template<typename State, typename I0, typename F>
+ struct result_of_unrolled_fold<State, I0, F, 3>
     {
         typedef typename result_of::next<I0>::type I1;
         typedef typename result_of::next<I1>::type I2;
- typedef typename fold_apply<I0, State, F>::type Rest;
- typedef typename fold_apply<I1, Rest, F>::type Rest2;
- typedef typename fold_apply<I2, Rest2, F>::type type;
+ typedef typename fold_apply<State, I0, F>::type Rest;
+ typedef typename fold_apply<Rest, I1, F>::type Rest2;
+ typedef typename fold_apply<Rest2, I2, F>::type type;
     };
 
- template<typename I0, typename State, typename F>
- struct result_of_unrolled_fold<I0, State, F, 2>
+ template<typename State, typename I0, typename F>
+ struct result_of_unrolled_fold<State, I0, F, 2>
     {
         typedef typename result_of::next<I0>::type I1;
- typedef typename fold_apply<I0, State, F>::type Rest;
- typedef typename fold_apply<I1, Rest, F>::type type;
+ typedef typename fold_apply<State, I0, F>::type Rest;
+ typedef typename fold_apply<Rest, I1, F>::type type;
     };
 
- template<typename I0, typename State, typename F>
- struct result_of_unrolled_fold<I0, State, F, 1>
+ template<typename State, typename I0, typename F>
+ struct result_of_unrolled_fold<State, I0, F, 1>
     {
- typedef typename fold_apply<I0, State, F>::type type;
+ typedef typename fold_apply<State, I0, F>::type type;
     };
 
- template<typename I0, typename State, typename F>
- struct result_of_unrolled_fold<I0, State, F, 0>
+ template<typename State, typename I0, typename F>
+ struct result_of_unrolled_fold<State, I0, F, 0>
     {
         typedef State type;
     };
@@ -231,7 +231,7 @@
         typedef typename result_of::begin<Sequence>::type begin;
         typedef typename result_of::end<Sequence>::type end;
         typedef typename result_of_unrolled_fold<
- begin, State, F, result_of::distance<begin, end>::type::value>::type type;
+ State, begin, F, result_of::distance<begin, end>::type::value>::type type;
     };
 
     template<typename Sequence, typename State, typename F>
@@ -269,8 +269,8 @@
         typedef typename result_of::begin<Sequence>::type begin;
         typedef typename result_of::end<Sequence>::type end;
         return unrolled_fold<result_of::distance<begin, end>::type::value>::call(
- fusion::begin(seq)
- , state
+ state
+ , fusion::begin(seq)
             , f);
     }
 }}}

Deleted: branches/release/boost/fusion/algorithm/query/detail/assoc_find.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/query/detail/assoc_find.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
+++ (empty file)
@@ -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 <boost/mpl/identity.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/type_traits/is_const.hpp>
-
-namespace boost { namespace fusion { namespace detail
-{
- template <typename Sequence, typename Key>
- struct assoc_find
- {
- typedef typename
- mpl::if_<
- is_const<Sequence>
- , typename Sequence::template meta_find_impl_const<Key>::type
- , typename Sequence::template meta_find_impl<Key>::type
- >::type
- type;
-
- static type
- call(Sequence& s)
- {
- return s.find_impl(mpl::identity<Key>());
- }
- };
-}}}
-
-#endif

Modified: branches/release/boost/fusion/algorithm/query/detail/find_if.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/query/detail/find_if.hpp (original)
+++ branches/release/boost/fusion/algorithm/query/detail/find_if.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -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 <boost/mpl/lambda.hpp>
 #include <boost/mpl/apply.hpp>
 #include <boost/mpl/identity.hpp>
-#include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
@@ -31,7 +31,7 @@
     struct apply_filter
     {
         typedef typename mpl::apply1<
- Pred, typename result_of::value_of<Iterator>::type>::type type;
+ Pred, Iterator>::type type;
         BOOST_STATIC_CONSTANT(int, value = type::value);
     };
 
@@ -85,7 +85,7 @@
         typedef typename
             mpl::apply1<
                 Pred
- , typename result_of::value_of<Shifted>::type
+ , Shifted
>::type
         type;
         BOOST_STATIC_CONSTANT(int, value = type::value);
@@ -227,26 +227,6 @@
             return choose_call(iter, typename traits::category_of<Iterator>::type());
         }
     };
-
- template <typename First, typename Last, typename Pred>
- struct static_seq_find_if : static_find_if<First, Last, Pred>
- {
- typedef typename static_find_if<First, Last, Pred>::type type;
-
- template <typename Sequence>
- static type
- call(Sequence const& seq)
- {
- return static_find_if<First, Last, Pred>::call(fusion::begin(seq));
- }
-
- template <typename Sequence>
- static type
- call(Sequence& seq)
- {
- return static_find_if<First, Last, Pred>::call(fusion::begin(seq));
- }
- };
 }}}
 
 #endif

Modified: branches/release/boost/fusion/algorithm/query/find.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/query/find.hpp (original)
+++ branches/release/boost/fusion/algorithm/query/find.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -8,46 +8,43 @@
 #define FUSION_FIND_05052005_1107
 
 #include <boost/fusion/algorithm/query/detail/find_if.hpp>
-#include <boost/fusion/algorithm/query/detail/assoc_find.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/iterator/key_of.hpp>
+#include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/support/category_of.hpp>
+#include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/utility/enable_if.hpp>
 
 namespace boost { namespace fusion
 {
- struct associative_sequence_tag;
-
     namespace result_of
     {
         template <
             typename Sequence
           , typename T
- , bool is_associative_sequence = traits::is_associative<Sequence>::value >
- struct find;
-
- template <typename Sequence, typename T>
- struct find<Sequence, T, false>
+ >
+ struct find
         {
             typedef
- detail::static_seq_find_if<
+ detail::static_find_if<
                     typename result_of::begin<Sequence>::type
                   , typename result_of::end<Sequence>::type
- , is_same<mpl::_, T>
+ , is_same<
+ typename mpl::if_<
+ traits::is_associative<Sequence>
+ , key_of<mpl::_1>
+ , value_of<mpl::_1>
+ >::type
+ , T
+ >
>
             filter;
 
             typedef typename filter::type type;
         };
-
- template <typename Sequence, typename T>
- struct find<Sequence, T, true>
- {
- typedef detail::assoc_find<Sequence, T> filter;
- typedef typename filter::type type;
- };
     }
 
     template <typename T, typename Sequence>
@@ -59,7 +56,7 @@
     find(Sequence& seq)
     {
         typedef typename result_of::find<Sequence, T>::filter filter;
- return filter::call(seq);
+ return filter::call(fusion::begin(seq));
     }
 
     template <typename T, typename Sequence>
@@ -67,7 +64,7 @@
     find(Sequence const& seq)
     {
         typedef typename result_of::find<Sequence const, T>::filter filter;
- return filter::call(seq);
+ return filter::call(fusion::begin(seq));
     }
 }}
 

Modified: branches/release/boost/fusion/algorithm/query/find_if.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/query/find_if.hpp (original)
+++ branches/release/boost/fusion/algorithm/query/find_if.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -10,6 +10,10 @@
 #include <boost/fusion/algorithm/query/detail/find_if.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/iterator/value_of.hpp>
+#include <boost/mpl/bind.hpp>
+#include <boost/mpl/lambda.hpp>
+#include <boost/mpl/quote.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_const.hpp>
 
@@ -20,13 +24,18 @@
         template <typename Sequence, typename Pred>
         struct find_if
         {
- typedef typename
+ typedef
                 detail::static_find_if<
                     typename result_of::begin<Sequence>::type
                   , typename result_of::end<Sequence>::type
- , Pred
- >::type
- type;
+ , mpl::bind1<
+ typename mpl::lambda<Pred>::type
+ , mpl::bind1<mpl::quote1<value_of>,mpl::_1>
+ >
+ >
+ filter;
+
+ typedef typename filter::type type;
         };
     }
 
@@ -38,14 +47,7 @@
>::type
     find_if(Sequence& seq)
     {
- typedef
- detail::static_find_if<
- typename result_of::begin<Sequence>::type
- , typename result_of::end<Sequence>::type
- , Pred
- >
- filter;
-
+ typedef typename result_of::find_if<Sequence, Pred>::filter filter;
         return filter::call(fusion::begin(seq));
     }
 
@@ -53,14 +55,7 @@
     inline typename result_of::find_if<Sequence const, Pred>::type const
     find_if(Sequence const& seq)
     {
- typedef
- detail::static_find_if<
- typename result_of::begin<Sequence const>::type
- , typename result_of::end<Sequence const>::type
- , Pred
- >
- filter;
-
+ typedef typename result_of::find_if<Sequence const, Pred>::filter filter;
         return filter::call(fusion::begin(seq));
     }
 }}

Modified: branches/release/boost/fusion/algorithm/transformation/erase_key.hpp
==============================================================================
--- branches/release/boost/fusion/algorithm/transformation/erase_key.hpp (original)
+++ branches/release/boost/fusion/algorithm/transformation/erase_key.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -7,7 +7,7 @@
 #if !defined(FUSION_ERASE_KEY_10022005_1851)
 #define FUSION_ERASE_KEY_10022005_1851
 
-#include <boost/fusion/algorithm/query/detail/assoc_find.hpp>
+#include <boost/fusion/algorithm/query/find.hpp>
 #include <boost/fusion/algorithm/transformation/erase.hpp>
 #include <boost/mpl/not.hpp>
 #include <boost/type_traits/is_same.hpp>
@@ -18,18 +18,15 @@
     {
         template <typename Sequence, typename Key>
         struct erase_key
- {
- typedef detail::assoc_find<Sequence, Key> filter;
- typedef typename erase<Sequence, typename filter::type>::type type;
- };
+ : erase<Sequence, typename find<Sequence, Key>::type>
+ {};
     }
 
     template <typename Key, typename Sequence>
     inline typename result_of::erase_key<Sequence const, Key>::type
     erase_key(Sequence const& seq)
     {
- typedef typename result_of::erase_key<Sequence const, Key>::filter filter;
- return erase(seq, filter::call(seq));
+ return erase(seq, find<Key>(seq));
     }
 }}
 

Modified: branches/release/boost/fusion/container/deque/deque.hpp
==============================================================================
--- branches/release/boost/fusion/container/deque/deque.hpp (original)
+++ branches/release/boost/fusion/container/deque/deque.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -45,6 +45,7 @@
         sequence_base<deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, T)> >
     {
         typedef deque_tag fusion_tag;
+ typedef bidirectional_traversal_tag category;
         typedef typename detail::deque_keyed_values<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, T)>::type base;
         typedef typename detail::deque_initial_size<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, T)>::type size;
         typedef mpl::int_<size::value> next_up;

Deleted: branches/release/boost/fusion/container/map/detail/at_key_impl.hpp
==============================================================================
--- branches/release/boost/fusion/container/map/detail/at_key_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
+++ (empty file)
@@ -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 <boost/fusion/support/detail/access.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/mpl/identity.hpp>
-
-namespace boost { namespace fusion
-{
- struct map_tag;
-
- namespace extension
- {
- template <typename Tag>
- struct at_key_impl;
-
- template <>
- struct at_key_impl<map_tag>
- {
- template <typename Sequence, typename Key>
- struct apply
- {
- typedef typename Sequence::template meta_at_impl<Key> element;
-
- typedef typename
- mpl::eval_if<
- is_const<Sequence>
- , detail::cref_result<element>
- , detail::ref_result<element>
- >::type
- type;
-
- static type
- call(Sequence& m)
- {
- return m.at_impl(mpl::identity<Key>());
- }
- };
- };
- }
-}}
-
-#endif

Modified: branches/release/boost/fusion/container/map/detail/begin_impl.hpp
==============================================================================
--- branches/release/boost/fusion/container/map/detail/begin_impl.hpp (original)
+++ branches/release/boost/fusion/container/map/detail/begin_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -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 <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/identity.hpp>
+#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_BEGIN_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_BEGIN_IMPL_HPP
 
-namespace boost { namespace fusion
+#include <boost/fusion/iterator/basic_iterator.hpp>
+
+namespace boost { namespace fusion { namespace extension
 {
- struct map_tag;
+ template <typename>
+ struct begin_impl;
 
- namespace extension
+ template <>
+ struct begin_impl<map_tag>
     {
- template <typename Tag>
- struct begin_impl;
-
- template <>
- struct begin_impl<map_tag>
+ template <typename Seq>
+ struct apply
         {
- template <typename Sequence>
- struct apply
+ typedef
+ basic_iterator<
+ map_iterator_tag
+ , typename Seq::category
+ , Seq
+ , 0
+ >
+ type;
+
+ static type
+ call(Seq& seq)
             {
- typedef typename
- result_of::begin<typename Sequence::storage_type>::type
- iterator_type;
-
- typedef typename
- result_of::begin<typename Sequence::storage_type const>::type
- const_iterator_type;
-
- typedef typename
- mpl::eval_if<
- is_const<Sequence>
- , mpl::identity<const_iterator_type>
- , mpl::identity<iterator_type>
- >::type
- type;
-
- static type
- call(Sequence& m)
- {
- return fusion::begin(m.get_data());
- }
- };
+ return type(seq,0);
+ }
         };
- }
-}}
+ };
+}}}
 
 #endif

Modified: branches/release/boost/fusion/container/map/detail/end_impl.hpp
==============================================================================
--- branches/release/boost/fusion/container/map/detail/end_impl.hpp (original)
+++ branches/release/boost/fusion/container/map/detail/end_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -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 <boost/fusion/sequence/intrinsic/end.hpp>
+#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_END_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_MAP_DETAIL_END_IMPL_HPP
 
-namespace boost { namespace fusion
+#include <boost/fusion/iterator/basic_iterator.hpp>
+
+namespace boost { namespace fusion { namespace extension
 {
- struct map_tag;
+ template <typename>
+ struct end_impl;
 
- namespace extension
+ template <>
+ struct end_impl<map_tag>
     {
- template <typename Tag>
- struct end_impl;
-
- template <>
- struct end_impl<map_tag>
+ template <typename Seq>
+ struct apply
         {
- template <typename Sequence>
- 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<typename Sequence::storage_type>::type
- iterator_type;
-
- typedef typename
- result_of::end<typename Sequence::storage_type const>::type
- const_iterator_type;
-
- typedef typename
- mpl::eval_if<
- is_const<Sequence>
- , mpl::identity<const_iterator_type>
- , mpl::identity<iterator_type>
- >::type
- type;
-
- static type
- call(Sequence& m)
- {
- return fusion::end(m.get_data());
- }
- };
+ return type(seq,0);
+ }
         };
- }
-}}
+ };
+}}}
 
 #endif

Deleted: branches/release/boost/fusion/container/map/detail/lookup_key.hpp
==============================================================================
--- branches/release/boost/fusion/container/map/detail/lookup_key.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
+++ (empty file)
@@ -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 <boost/mpl/int.hpp>
-#include <boost/type_traits/add_const.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/fusion/support/detail/unknown_key.hpp>
-
-namespace boost { namespace fusion
-{
- struct void_;
-}}
-
-namespace boost { namespace fusion { namespace detail
-{
- template <typename T>
- struct map_data_type
- {
- typedef typename
- add_reference<
- typename T::second_type
- >::type
- type;
- };
-
- template <>
- struct map_data_type<void_>
- {
- typedef void_& type;
- };
-
- template <typename T>
- 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<void_>
- {
- typedef void_ const& type;
- };
-
- template <typename T>
- struct map_value_type
- {
- typedef typename T::second_type type;
- };
-
- template <>
- struct map_value_type<void_>
- {
- typedef void_ type;
- };
-
- template <typename T, int index>
- struct map_key_type
- {
- typedef typename T::first_type type;
- };
-
- template <int index>
- struct map_key_type<void_, index>
- {
- typedef unknown_key<index> type;
- };
-
- template <int index, typename RT, typename Key, typename Vector>
- struct map_lookup_key
- {
- static RT
- call(Vector& vec)
- {
- return vec.at_impl(mpl::int_<index>()).second;
- }
- };
-
- template <int index, typename Vector>
- struct map_lookup_key<index, void_&, unknown_key<index>, Vector>
- {
- static void_&
- call(Vector& vec); // intentionally undefined
- };
-}}}
-
-#endif
-

Deleted: branches/release/boost/fusion/container/map/detail/map_lookup.hpp
==============================================================================
--- branches/release/boost/fusion/container/map/detail/map_lookup.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
+++ (empty file)
@@ -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 <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/arithmetic/dec.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
-#pragma warning (push)
-#pragma warning(disable: 4348) // redefinition of default parameter
-#endif
-
- template <typename Key, typename dummy = int>
- struct meta_at_impl
- {
- typedef void_ type;
- };
-
- template <typename Key, typename dummy = int>
- struct meta_find_impl
- {
- typedef vector_iterator<storage_type, storage_type::size::value> type;
- };
-
- template <typename Key, typename dummy = int>
- struct meta_find_impl_const
- {
- typedef vector_iterator<storage_type const, storage_type::size::value> type;
- };
-
- template <typename Key>
- vector_iterator<storage_type const, storage_type::size::value>
- find_impl(mpl::identity<Key>) const
- {
- return vector_iterator<storage_type const, storage_type::size::value>(data);
- }
-
- template <typename Key>
- vector_iterator<storage_type, storage_type::size::value>
- find_impl(mpl::identity<Key>)
- {
- return vector_iterator<storage_type, storage_type::size::value>(data);
- }
-
-#define BOOST_PP_FILENAME_1 \
- <boost/fusion/container/map/detail/map_lookup.hpp>
-#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 <typename dummy>
- struct meta_at_impl<
- typename detail::map_key_type<BOOST_PP_CAT(T, N), N>::type, dummy>
- {
- typedef typename detail::map_value_type<BOOST_PP_CAT(T, N)>::type type;
- };
-
- typename detail::map_data_type<BOOST_PP_CAT(T, N)>::type
- at_impl(mpl::identity<typename detail::map_key_type<BOOST_PP_CAT(T, N), N>::type>)
- {
- return detail::map_lookup_key<
- N
- , typename detail::map_data_type<BOOST_PP_CAT(T, N)>::type
- , typename detail::map_key_type<BOOST_PP_CAT(T, N), N>::type
- , storage_type>::call(data);
- }
-
- typename detail::map_const_data_type<BOOST_PP_CAT(T, N)>::type
- at_impl(mpl::identity<typename detail::map_key_type<BOOST_PP_CAT(T, N), N>::type>) const
- {
- return detail::map_lookup_key<
- N
- , typename detail::map_const_data_type<BOOST_PP_CAT(T, N)>::type
- , typename detail::map_key_type<BOOST_PP_CAT(T, N), N>::type
- , storage_type const>::call(data);
- }
-
- template <typename dummy>
- struct meta_find_impl<
- typename detail::map_key_type<BOOST_PP_CAT(T, N), N>::type, dummy>
- {
- typedef vector_iterator<storage_type, N> type;
- };
-
- template <typename dummy>
- struct meta_find_impl_const<
- typename detail::map_key_type<BOOST_PP_CAT(T, N), N>::type, dummy>
- {
- typedef vector_iterator<storage_type const, N> type;
- };
-
- vector_iterator<storage_type, N>
- find_impl(mpl::identity<typename detail::map_key_type<BOOST_PP_CAT(T, N), N>::type>)
- {
- return vector_iterator<storage_type, N>(data);
- }
-
- vector_iterator<storage_type const, N>
- find_impl(mpl::identity<typename detail::map_key_type<BOOST_PP_CAT(T, N), N>::type>) const
- {
- return vector_iterator<storage_type const, N>(data);
- }
-
-#undef N
-#endif // defined(BOOST_PP_IS_ITERATING)
-

Deleted: branches/release/boost/fusion/container/map/detail/value_at_key_impl.hpp
==============================================================================
--- branches/release/boost/fusion/container/map/detail/value_at_key_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
+++ (empty file)
@@ -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 <typename Tag>
- struct value_at_key_impl;
-
- template <>
- struct value_at_key_impl<map_tag>
- {
- template <typename Sequence, typename Key>
- struct apply
- {
- typedef typename Sequence::
- template meta_at_impl<Key>::type type;
- };
- };
- }
-}}
-
-#endif

Modified: branches/release/boost/fusion/container/map/map.hpp
==============================================================================
--- branches/release/boost/fusion/container/map/map.hpp (original)
+++ branches/release/boost/fusion/container/map/map.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -11,11 +11,13 @@
 #include <boost/fusion/support/category_of.hpp>
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/container/map/map_fwd.hpp>
-#include <boost/fusion/container/map/detail/lookup_key.hpp>
 #include <boost/fusion/container/map/detail/begin_impl.hpp>
 #include <boost/fusion/container/map/detail/end_impl.hpp>
-#include <boost/fusion/container/map/detail/at_key_impl.hpp>
-#include <boost/fusion/container/map/detail/value_at_key_impl.hpp>
+#include <boost/fusion/container/map/detail/value_of_impl.hpp>
+#include <boost/fusion/container/map/detail/deref_data_impl.hpp>
+#include <boost/fusion/container/map/detail/deref_impl.hpp>
+#include <boost/fusion/container/map/detail/key_of_impl.hpp>
+#include <boost/fusion/container/map/detail/value_of_data_impl.hpp>
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/bool.hpp>
@@ -23,13 +25,12 @@
 namespace boost { namespace fusion
 {
     struct void_;
- struct map_tag;
     struct fusion_sequence_tag;
 
     template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_MAP_SIZE, typename T)>
     struct map : sequence_base<map<BOOST_PP_ENUM_PARAMS(FUSION_MAX_MAP_SIZE, T)> >
     {
- 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 @@
             : data(rhs) {}
 
         #include <boost/fusion/container/map/detail/map_forward_ctor.hpp>
- #include <boost/fusion/container/map/detail/map_lookup.hpp>
 
         template <typename T>
         map&

Modified: branches/release/boost/fusion/container/map/map_fwd.hpp
==============================================================================
--- branches/release/boost/fusion/container/map/map_fwd.hpp (original)
+++ branches/release/boost/fusion/container/map/map_fwd.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -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(

Deleted: branches/release/boost/fusion/container/set/detail/at_key_impl.hpp
==============================================================================
--- branches/release/boost/fusion/container/set/detail/at_key_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
+++ (empty file)
@@ -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 <boost/fusion/support/detail/access.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/mpl/identity.hpp>
-
-namespace boost { namespace fusion
-{
- struct set_tag;
-
- namespace extension
- {
- template <typename Tag>
- struct at_key_impl;
-
- template <>
- struct at_key_impl<set_tag>
- {
- template <typename Sequence, typename Key>
- struct apply
- {
- typedef typename Sequence::template meta_at_impl<Key> element;
-
- typedef typename
- mpl::eval_if<
- is_const<Sequence>
- , detail::cref_result<element>
- , detail::ref_result<element>
- >::type
- type;
-
- static type
- call(Sequence& s)
- {
- return s.at_impl(mpl::identity<Key>());
- }
- };
- };
- }
-}}
-
-#endif

Modified: branches/release/boost/fusion/container/set/detail/begin_impl.hpp
==============================================================================
--- branches/release/boost/fusion/container/set/detail/begin_impl.hpp (original)
+++ branches/release/boost/fusion/container/set/detail/begin_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -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 <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/identity.hpp>
+#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_BEGIN_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_BEGIN_IMPL_HPP
 
-namespace boost { namespace fusion
+#include <boost/fusion/iterator/basic_iterator.hpp>
+
+namespace boost { namespace fusion { namespace extension
 {
- struct set_tag;
+ template <typename>
+ struct begin_impl;
 
- namespace extension
+ template <>
+ struct begin_impl<set_tag>
     {
- template <typename Tag>
- struct begin_impl;
-
- template <>
- struct begin_impl<set_tag>
+ template <typename Seq>
+ struct apply
         {
- template <typename Sequence>
- struct apply
+ typedef
+ basic_iterator<
+ set_iterator_tag
+ , typename Seq::category
+ , Seq
+ , 0
+ >
+ type;
+
+ static type
+ call(Seq& seq)
             {
- typedef typename
- result_of::begin<typename Sequence::storage_type>::type
- iterator_type;
-
- typedef typename
- result_of::begin<typename Sequence::storage_type const>::type
- const_iterator_type;
-
- typedef typename
- mpl::eval_if<
- is_const<Sequence>
- , mpl::identity<const_iterator_type>
- , mpl::identity<iterator_type>
- >::type
- type;
-
- static type
- call(Sequence& s)
- {
- return fusion::begin(s.get_data());
- }
- };
+ return type(seq,0);
+ }
         };
- }
-}}
+ };
+}}}
 
 #endif

Modified: branches/release/boost/fusion/container/set/detail/end_impl.hpp
==============================================================================
--- branches/release/boost/fusion/container/set/detail/end_impl.hpp (original)
+++ branches/release/boost/fusion/container/set/detail/end_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -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 <boost/fusion/sequence/intrinsic/end.hpp>
+#ifndef BOOST_FUSION_CONTAINER_SET_DETAIL_END_IMPL_HPP
+#define BOOST_FUSION_CONTAINER_SET_DETAIL_END_IMPL_HPP
 
-namespace boost { namespace fusion
+#include <boost/fusion/iterator/basic_iterator.hpp>
+
+namespace boost { namespace fusion { namespace extension
 {
- struct set_tag;
+ template <typename>
+ struct end_impl;
 
- namespace extension
+ template <>
+ struct end_impl<set_tag>
     {
- template <typename Tag>
- struct end_impl;
-
- template <>
- struct end_impl<set_tag>
+ template <typename Seq>
+ struct apply
         {
- template <typename Sequence>
- 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<typename Sequence::storage_type>::type
- iterator_type;
-
- typedef typename
- result_of::end<typename Sequence::storage_type const>::type
- const_iterator_type;
-
- typedef typename
- mpl::eval_if<
- is_const<Sequence>
- , mpl::identity<const_iterator_type>
- , mpl::identity<iterator_type>
- >::type
- type;
-
- static type
- call(Sequence& s)
- {
- return fusion::end(s.get_data());
- }
- };
+ return type(seq,0);
+ }
         };
- }
-}}
+ };
+}}}
 
 #endif

Deleted: branches/release/boost/fusion/container/set/detail/lookup_key.hpp
==============================================================================
--- branches/release/boost/fusion/container/set/detail/lookup_key.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
+++ (empty file)
@@ -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 <boost/mpl/int.hpp>
-#include <boost/type_traits/add_const.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/fusion/support/detail/unknown_key.hpp>
-
-namespace boost { namespace fusion
-{
- struct void_;
-}}
-
-namespace boost { namespace fusion { namespace detail
-{
- template <typename T>
- struct set_data_type
- {
- typedef typename add_reference<T>::type type;
- };
-
- template <>
- struct set_data_type<void_>
- {
- typedef void_& type;
- };
-
- template <typename T>
- struct set_const_data_type
- {
- typedef typename
- add_reference<
- typename add_const<T>::type
- >::type
- type;
- };
-
- template <>
- struct set_const_data_type<void_>
- {
- typedef void_ const& type;
- };
-
- template <typename T>
- struct set_value_type
- {
- typedef T type;
- };
-
- template <>
- struct set_value_type<void_>
- {
- typedef void_ type;
- };
-
- template <typename T, int index>
- struct set_key_type
- {
- typedef T type;
- };
-
- template <int index>
- struct set_key_type<void_, index>
- {
- typedef unknown_key<index> type;
- };
-
- template <int index, typename RT, typename Key, typename Vector>
- struct set_lookup_key
- {
- static RT
- call(Vector& vec)
- {
- return vec.at_impl(mpl::int_<index>());
- }
- };
-
- template <int index, typename Vector>
- struct set_lookup_key<index, void_&, unknown_key<index>, Vector>
- {
- static void_&
- call(Vector& vec); // intentionally undefined
- };
-}}}
-
-#endif
-

Deleted: branches/release/boost/fusion/container/set/detail/set_lookup.hpp
==============================================================================
--- branches/release/boost/fusion/container/set/detail/set_lookup.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
+++ (empty file)
@@ -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 <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/arithmetic/dec.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
-#pragma warning (push)
-#pragma warning(disable: 4348) // redefinition of default parameter
-#endif
-
- template <typename Key, typename dummy = int>
- struct meta_at_impl
- {
- typedef void_ type;
- };
-
- template <typename Key, typename dummy = int>
- struct meta_find_impl
- {
- typedef vector_iterator<storage_type, storage_type::size::value> type;
- };
-
- template <typename Key, typename dummy = int>
- struct meta_find_impl_const
- {
- typedef vector_iterator<storage_type const, storage_type::size::value> type;
- };
-
- template <typename Key>
- vector_iterator<storage_type const, storage_type::size::value>
- find_impl(mpl::identity<Key>) const
- {
- return vector_iterator<storage_type const, storage_type::size::value>(data);
- }
-
- template <typename Key>
- vector_iterator<storage_type, storage_type::size::value>
- find_impl(mpl::identity<Key>)
- {
- return vector_iterator<storage_type, storage_type::size::value>(data);
- }
-
-#define BOOST_PP_FILENAME_1 \
- <boost/fusion/container/set/detail/set_lookup.hpp>
-#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 <typename dummy>
- struct meta_at_impl<
- typename detail::set_key_type<BOOST_PP_CAT(T, N), N>::type, dummy>
- {
- typedef typename detail::set_value_type<BOOST_PP_CAT(T, N)>::type type;
- };
-
- typename detail::set_data_type<BOOST_PP_CAT(T, N)>::type
- at_impl(mpl::identity<typename detail::set_key_type<BOOST_PP_CAT(T, N), N>::type>)
- {
- return detail::set_lookup_key<
- N
- , typename detail::set_data_type<BOOST_PP_CAT(T, N)>::type
- , typename detail::set_key_type<BOOST_PP_CAT(T, N), N>::type
- , storage_type>::call(data);
- }
-
- typename detail::set_const_data_type<BOOST_PP_CAT(T, N)>::type
- at_impl(mpl::identity<typename detail::set_key_type<BOOST_PP_CAT(T, N), N>::type>) const
- {
- return detail::set_lookup_key<
- N
- , typename detail::set_const_data_type<BOOST_PP_CAT(T, N)>::type
- , typename detail::set_key_type<BOOST_PP_CAT(T, N), N>::type
- , storage_type const>::call(data);
- }
-
- template <typename dummy>
- struct meta_find_impl<
- typename detail::set_key_type<BOOST_PP_CAT(T, N), N>::type, dummy>
- {
- typedef vector_iterator<storage_type, N> type;
- };
-
- template <typename dummy>
- struct meta_find_impl_const<
- typename detail::set_key_type<BOOST_PP_CAT(T, N), N>::type, dummy>
- {
- typedef vector_iterator<storage_type const, N> type;
- };
-
- vector_iterator<storage_type, N>
- find_impl(mpl::identity<typename detail::set_key_type<BOOST_PP_CAT(T, N), N>::type>)
- {
- return vector_iterator<storage_type, N>(data);
- }
-
- vector_iterator<storage_type const, N>
- find_impl(mpl::identity<typename detail::set_key_type<BOOST_PP_CAT(T, N), N>::type>) const
- {
- return vector_iterator<storage_type const, N>(data);
- }
-
-#undef N
-#endif // defined(BOOST_PP_IS_ITERATING)
-

Deleted: branches/release/boost/fusion/container/set/detail/value_at_key_impl.hpp
==============================================================================
--- branches/release/boost/fusion/container/set/detail/value_at_key_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
+++ (empty file)
@@ -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 <boost/mpl/at.hpp>
-
-namespace boost { namespace fusion
-{
- struct set_tag;
-
- namespace extension
- {
- template <typename Tag>
- struct value_at_key_impl;
-
- template <>
- struct value_at_key_impl<set_tag>
- {
- template <typename Sequence, typename Key>
- struct apply
- {
- typedef typename Sequence::
- template meta_at_impl<Key>::type type;
- };
- };
- }
-}}
-
-#endif

Modified: branches/release/boost/fusion/container/set/set.hpp
==============================================================================
--- branches/release/boost/fusion/container/set/set.hpp (original)
+++ branches/release/boost/fusion/container/set/set.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -11,11 +11,13 @@
 #include <boost/fusion/support/category_of.hpp>
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/container/set/set_fwd.hpp>
-#include <boost/fusion/container/set/detail/lookup_key.hpp>
 #include <boost/fusion/container/set/detail/begin_impl.hpp>
 #include <boost/fusion/container/set/detail/end_impl.hpp>
-#include <boost/fusion/container/set/detail/at_key_impl.hpp>
-#include <boost/fusion/container/set/detail/value_at_key_impl.hpp>
+#include <boost/fusion/container/set/detail/value_of_impl.hpp>
+#include <boost/fusion/container/set/detail/deref_data_impl.hpp>
+#include <boost/fusion/container/set/detail/deref_impl.hpp>
+#include <boost/fusion/container/set/detail/key_of_impl.hpp>
+#include <boost/fusion/container/set/detail/value_of_data_impl.hpp>
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/bool.hpp>
@@ -23,13 +25,12 @@
 namespace boost { namespace fusion
 {
     struct void_;
- struct set_tag;
     struct fusion_sequence_tag;
 
     template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_SET_SIZE, typename T)>
     struct set : sequence_base<set<BOOST_PP_ENUM_PARAMS(FUSION_MAX_SET_SIZE, T)> >
     {
- 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 @@
             : data(rhs) {}
 
         #include <boost/fusion/container/set/detail/set_forward_ctor.hpp>
- #include <boost/fusion/container/set/detail/set_lookup.hpp>
 
         template <typename T>
         set&

Modified: branches/release/boost/fusion/container/set/set_fwd.hpp
==============================================================================
--- branches/release/boost/fusion/container/set/set_fwd.hpp (original)
+++ branches/release/boost/fusion/container/set/set_fwd.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -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(

Modified: branches/release/boost/fusion/iterator/iterator_facade.hpp
==============================================================================
--- branches/release/boost/fusion/iterator/iterator_facade.hpp (original)
+++ branches/release/boost/fusion/iterator/iterator_facade.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -50,8 +50,7 @@
         template <typename First, typename Last>
         struct distance :
             distance_detail::linear_distance<First, Last>
- {
- };
+ {};
     };
 }}
 

Modified: branches/release/boost/fusion/sequence/intrinsic/at_key.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/at_key.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/at_key.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -9,6 +9,8 @@
 #define BOOST_FUSION_AT_KEY_20060304_1755
 
 #include <boost/type_traits/is_const.hpp>
+#include <boost/fusion/algorithm/query/find.hpp>
+#include <boost/fusion/iterator/deref_data.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/support/detail/access.hpp>
 
@@ -25,15 +27,28 @@
         template <typename Tag>
         struct at_key_impl
         {
- template <typename Sequence, typename Key>
- struct apply;
+ template <typename Seq, typename Key>
+ struct apply
+ {
+ typedef typename
+ result_of::deref_data<
+ typename result_of::find<Seq, Key>::type
+ >::type
+ type;
+
+ static type
+ call(Seq& seq)
+ {
+ return fusion::deref_data(fusion::find<Key>(seq));
+ }
+ };
         };
 
         template <>
         struct at_key_impl<sequence_facade_tag>
         {
             template <typename Sequence, typename Key>
- struct apply : Sequence::template at_key<Sequence, Key> {};
+ struct apply : Sequence::template at_key_impl<Sequence, Key> {};
         };
 
         template <>

Modified: branches/release/boost/fusion/sequence/intrinsic/ext_/size_s.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/ext_/size_s.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/ext_/size_s.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -28,8 +28,8 @@
             template<typename Sig>
             struct result;
 
- template<typename This, typename Seq, typename State>
- struct result<This(Seq, State)>
+ template<typename This, typename State, typename Seq>
+ struct result<This(State, Seq)>
               : mpl::plus<
                     segmented_size<typename remove_reference<Seq>::type>
                   , typename remove_reference<State>::type

Modified: branches/release/boost/fusion/sequence/intrinsic/has_key.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/has_key.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/has_key.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -7,9 +7,11 @@
 #if !defined(FUSION_HAS_KEY_09232005_1454)
 #define FUSION_HAS_KEY_09232005_1454
 
-#include <boost/mpl/not.hpp>
 #include <boost/fusion/support/tag_of.hpp>
-#include <boost/type_traits/is_same.hpp>
+#include <boost/fusion/iterator/equal_to.hpp>
+#include <boost/fusion/algorithm/query/find.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/mpl/not.hpp>
 
 namespace boost { namespace fusion
 {
@@ -26,10 +28,14 @@
         template <typename Tag>
         struct has_key_impl
         {
- template <typename Sequence, typename Key>
+ template <typename Seq, typename Key>
             struct apply
- : mpl::not_<is_same<typename Sequence::
- template meta_at_impl<Key>::type, void_> >
+ : mpl::not_<
+ typename result_of::equal_to<
+ typename result_of::find<Seq, Key>::type
+ , typename result_of::end<Seq>::type
+ >::type
+ >::type
             {};
         };
 

Modified: branches/release/boost/fusion/sequence/intrinsic/value_at_key.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/value_at_key.hpp (original)
+++ branches/release/boost/fusion/sequence/intrinsic/value_at_key.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -9,6 +9,8 @@
 #define FUSION_VALUE_AT_KEY_05052005_0229
 
 #include <boost/mpl/int.hpp>
+#include <boost/fusion/iterator/value_of_data.hpp>
+#include <boost/fusion/algorithm/query/find.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 
 namespace boost { namespace fusion
@@ -24,8 +26,12 @@
         template <typename Tag>
         struct value_at_key_impl
         {
- template <typename Sequence, typename Key>
- struct apply;
+ template <typename Seq, typename Key>
+ struct apply
+ : result_of::value_of_data<
+ typename result_of::find<Seq, Key>::type
+ >
+ {};
         };
 
         template <>

Modified: branches/release/boost/fusion/support/category_of.hpp
==============================================================================
--- branches/release/boost/fusion/support/category_of.hpp (original)
+++ branches/release/boost/fusion/support/category_of.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -33,7 +33,7 @@
     struct random_access_traversal_tag
         : bidirectional_traversal_tag {};
 
- struct associative_sequence_tag {};
+ struct associative_tag {};
 
     namespace extension
     {
@@ -68,7 +68,7 @@
         template <typename T>
         struct is_associative
             : is_base_of<
- associative_sequence_tag
+ associative_tag
               , typename category_of<T>::type>
         {};
 

Modified: branches/release/boost/fusion/view/detail/strictest_traversal.hpp
==============================================================================
--- branches/release/boost/fusion/view/detail/strictest_traversal.hpp (original)
+++ branches/release/boost/fusion/view/detail/strictest_traversal.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -42,8 +42,8 @@
             template<typename Sig>
             struct result;
 
- template<typename Next, typename StrictestSoFar>
- struct result<strictest_traversal_impl(Next, StrictestSoFar)>
+ template<typename StrictestSoFar, typename Next>
+ struct result<strictest_traversal_impl(StrictestSoFar, Next)>
             {
                 typedef typename remove_reference<Next>::type next_value;
                 typedef typename remove_reference<StrictestSoFar>::type strictest_so_far;

Modified: branches/release/boost/fusion/view/ext_/segmented_iterator.hpp
==============================================================================
--- branches/release/boost/fusion/view/ext_/segmented_iterator.hpp (original)
+++ branches/release/boost/fusion/view/ext_/segmented_iterator.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -9,8 +9,10 @@
 #define FUSION_SEGMENTED_ITERATOR_EAN_05032006_1027
 
 #include <boost/mpl/if.hpp>
+#include <boost/mpl/int.hpp>
 #include <boost/mpl/not.hpp>
 #include <boost/mpl/assert.hpp>
+#include <boost/mpl/next_prior.hpp>
 #include <boost/mpl/placeholders.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_reference.hpp>
@@ -20,6 +22,7 @@
 #include <boost/fusion/view/filter_view.hpp>
 #include <boost/fusion/container/list/cons.hpp> // for nil
 #include <boost/fusion/container/generation/make_cons.hpp>
+#include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/iterator/distance.hpp>
 #include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
 #include <boost/fusion/support/ext_/is_segmented.hpp>
@@ -59,16 +62,15 @@
         struct segmented_range_tag;
 
         ////////////////////////////////////////////////////////////////////////////
- template<typename Sequence, typename Iterator, bool IsSegmented>
+ template<typename Sequence, typename Index, bool IsSegmented>
         struct segmented_range
- : sequence_base<segmented_range<Sequence, Iterator, IsSegmented> >
+ : sequence_base<segmented_range<Sequence, Index, IsSegmented> >
         {
             BOOST_MPL_ASSERT_NOT((is_reference<Sequence>));
             typedef mpl::bool_<IsSegmented> 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 @@
               , sequence_non_ref_type &
>::type sequence_type;
 
+ typedef
+ typename fusion::result_of::advance<
+ typename fusion::result_of::begin<sequence_non_ref_type>::type
+ , Index
+ >::type
+ iterator_type;
+
             typedef typename traits::category_of<sequence_non_ref_type>::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<Index>(
+ fusion::begin(const_cast<sequence_non_ref_type &>(this->sequence))
+ );
+ }
+
             sequence_type sequence;
- iterator_type where_;
+
+ private:
+ segmented_range &operator =(segmented_range const &);
         };
     }
 
@@ -148,7 +164,7 @@
                 typedef typename Sequence::iterator_type type;
                 static type call(Sequence &seq)
                 {
- return seq.where_;
+ return seq.where_();
                 }
             };
         };
@@ -176,15 +192,15 @@
         template<typename Range>
         struct range_next;
 
- template<typename Sequence, typename Iterator, bool IsSegmented>
- struct range_next<segmented_range<Sequence, Iterator, IsSegmented> >
+ template<typename Sequence, typename Index, bool IsSegmented>
+ struct range_next<segmented_range<Sequence, Index, IsSegmented> >
         {
- typedef typename result_of::next<Iterator>::type iterator_type;
- typedef segmented_range<Sequence, iterator_type, IsSegmented> type;
+ typedef typename mpl::next<Index>::type index_type;
+ typedef segmented_range<Sequence, index_type, IsSegmented> type;
 
- static type call(segmented_range<Sequence, Iterator, IsSegmented> const &rng)
+ static type call(segmented_range<Sequence, Index, IsSegmented> const &rng)
             {
- return type(rng.sequence, fusion::next(rng.where_));
+ return type(rng.sequence, 0);
             }
         };
 
@@ -205,8 +221,7 @@
         {
             typedef typename result_of::segments<Sequence>::type segments;
             typedef typename remove_reference<segments>::type sequence;
- typedef typename result_of::begin<filter_view<sequence, not_is_empty_pred> >::type begin;
- typedef segmented_range<sequence, begin, true> type;
+ typedef segmented_range<sequence, mpl::int_<0>, true> type;
 
             static type call(Sequence &seq)
             {
@@ -219,8 +234,7 @@
         struct as_segmented_range<Sequence, false>
         {
             typedef typename remove_reference<Sequence>::type sequence;
- typedef typename result_of::begin<sequence>::type begin;
- typedef segmented_range<sequence, begin, false> type;
+ typedef segmented_range<sequence, mpl::int_<0>, false> type;
 
             static type call(Sequence &seq)
             {
@@ -228,10 +242,10 @@
             }
         };
 
- template<typename Sequence, typename Iterator, bool IsSegmented>
- struct as_segmented_range<segmented_range<Sequence, Iterator, IsSegmented>, IsSegmented>
+ template<typename Sequence, typename Index, bool IsSegmented>
+ struct as_segmented_range<segmented_range<Sequence, Index, IsSegmented>, IsSegmented>
         {
- typedef segmented_range<Sequence, Iterator, IsSegmented> type;
+ typedef segmented_range<Sequence, Index, IsSegmented> type;
             static type &call(type &seq)
             {
                 return seq;

Modified: branches/release/boost/fusion/view/filter_view/detail/begin_impl.hpp
==============================================================================
--- branches/release/boost/fusion/view/filter_view/detail/begin_impl.hpp (original)
+++ branches/release/boost/fusion/view/filter_view/detail/begin_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -11,7 +11,7 @@
 {
     struct filter_view_tag;
 
- template <typename First, typename Last, typename Pred>
+ template <typename Category, typename First, typename Last, typename Pred>
     struct filter_iterator;
 
     namespace extension
@@ -28,7 +28,8 @@
                 typedef typename Sequence::first_type first_type;
                 typedef typename Sequence::last_type last_type;
                 typedef typename Sequence::pred_type pred_type;
- typedef filter_iterator<first_type, last_type, pred_type> type;
+ typedef typename Sequence::category category;
+ typedef filter_iterator<category, first_type, last_type, pred_type> type;
 
                 static type
                 call(Sequence& s)

Modified: branches/release/boost/fusion/view/filter_view/detail/end_impl.hpp
==============================================================================
--- branches/release/boost/fusion/view/filter_view/detail/end_impl.hpp (original)
+++ branches/release/boost/fusion/view/filter_view/detail/end_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -11,7 +11,7 @@
 {
     struct filter_view_tag;
 
- template <typename First, typename Last, typename Pred>
+ template <typename Category, typename First, typename Last, typename Pred>
     struct filter_iterator;
 
     namespace extension
@@ -27,7 +27,8 @@
             {
                 typedef typename Sequence::last_type last_type;
                 typedef typename Sequence::pred_type pred_type;
- typedef filter_iterator<last_type, last_type, pred_type> type;
+ typedef typename Sequence::category category;
+ typedef filter_iterator<category,last_type, last_type, pred_type> type;
 
                 static type
                 call(Sequence& s)

Modified: branches/release/boost/fusion/view/filter_view/detail/next_impl.hpp
==============================================================================
--- branches/release/boost/fusion/view/filter_view/detail/next_impl.hpp (original)
+++ branches/release/boost/fusion/view/filter_view/detail/next_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -8,14 +8,19 @@
 #define FUSION_NEXT_IMPL_06052005_0900
 
 #include <boost/fusion/algorithm/query/detail/find_if.hpp>
+#include <boost/fusion/iterator/value_of.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
+#include <boost/mpl/lambda.hpp>
+#include <boost/mpl/quote.hpp>
+#include <boost/mpl/bind.hpp>
+#include <boost/mpl/placeholders.hpp>
 
 namespace boost { namespace fusion
 {
     struct filter_view_iterator_tag;
 
- template <typename First, typename Last, typename Pred>
+ template <typename Category, typename First, typename Last, typename Pred>
     struct filter_iterator;
 
     namespace extension
@@ -32,6 +37,7 @@
                 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 @@
>::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<pred_type>::type
+ , mpl::bind1<mpl::quote1<result_of::value_of>,mpl::_1>
+ >
+ >
                 filter;
 
                 typedef filter_iterator<
- typename filter::type, last_type, pred_type>
+ category, typename filter::type, last_type, pred_type>
                 type;
 
                 static type

Modified: branches/release/boost/fusion/view/filter_view/filter_view.hpp
==============================================================================
--- branches/release/boost/fusion/view/filter_view/filter_view.hpp (original)
+++ branches/release/boost/fusion/view/filter_view/filter_view.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -17,6 +17,10 @@
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/mpl/bool.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/inherit.hpp>
+#include <boost/mpl/identity.hpp>
+
 
 namespace boost { namespace fusion
 {
@@ -29,7 +33,13 @@
     {
         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<Sequence>
+ , mpl::inherit2<forward_traversal_tag,associative_tag>
+ , mpl::identity<forward_traversal_tag>
+ >::type
+ category;
         typedef mpl::true_ is_view;
 
         typedef typename result_of::begin<Sequence>::type first_type;

Modified: branches/release/boost/fusion/view/filter_view/filter_view_iterator.hpp
==============================================================================
--- branches/release/boost/fusion/view/filter_view/filter_view_iterator.hpp (original)
+++ branches/release/boost/fusion/view/filter_view/filter_view_iterator.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -9,20 +9,29 @@
 
 #include <boost/fusion/iterator/mpl/convert_iterator.hpp>
 #include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/support/iterator_base.hpp>
+#include <boost/fusion/algorithm/query/detail/find_if.hpp>
+#include <boost/mpl/lambda.hpp>
+#include <boost/mpl/quote.hpp>
+#include <boost/mpl/bind.hpp>
+#include <boost/mpl/placeholders.hpp>
+
 #include <boost/fusion/view/filter_view/detail/deref_impl.hpp>
 #include <boost/fusion/view/filter_view/detail/next_impl.hpp>
 #include <boost/fusion/view/filter_view/detail/value_of_impl.hpp>
 #include <boost/fusion/view/filter_view/detail/equal_to_impl.hpp>
-#include <boost/fusion/algorithm/query/detail/find_if.hpp>
+#include <boost/fusion/view/filter_view/detail/deref_data_impl.hpp>
+#include <boost/fusion/view/filter_view/detail/value_of_data_impl.hpp>
+#include <boost/fusion/view/filter_view/detail/key_of_impl.hpp>
 
 namespace boost { namespace fusion
 {
     struct filter_view_iterator_tag;
     struct forward_traversal_tag;
 
- template <typename First, typename Last, typename Pred>
- struct filter_iterator : iterator_base<filter_iterator<First, Last, Pred> >
+ template <typename Category, typename First, typename Last, typename Pred>
+ struct filter_iterator : iterator_base<filter_iterator<Category, First, Last, Pred> >
     {
         typedef convert_iterator<First> first_converter;
         typedef typename first_converter::type first_iter;
@@ -30,8 +39,17 @@
         typedef typename last_converter::type last_iter;
 
         typedef filter_view_iterator_tag fusion_tag;
- typedef forward_traversal_tag category;
- typedef detail::static_find_if<first_iter, last_iter, Pred> filter;
+ typedef Category category;
+ typedef
+ detail::static_find_if<
+ first_iter
+ , last_iter
+ , mpl::bind1<
+ typename mpl::lambda<Pred>::type
+ , mpl::bind1<mpl::quote1<result_of::value_of>,mpl::_1>
+ >
+ >
+ filter;
         typedef typename filter::type first_type;
         typedef last_iter last_type;
         typedef Pred pred_type;

Modified: branches/release/boost/fusion/view/iterator_range/iterator_range.hpp
==============================================================================
--- branches/release/boost/fusion/view/iterator_range/iterator_range.hpp (original)
+++ branches/release/boost/fusion/view/iterator_range/iterator_range.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -17,7 +17,6 @@
 #include <boost/fusion/view/iterator_range/detail/at_impl.hpp>
 #include <boost/fusion/view/iterator_range/detail/value_at_impl.hpp>
 #include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
-#include <boost/mpl/bool.hpp>
 
 namespace boost { namespace fusion
 {

Modified: branches/release/boost/fusion/view/joint_view/detail/begin_impl.hpp
==============================================================================
--- branches/release/boost/fusion/view/joint_view/detail/begin_impl.hpp (original)
+++ branches/release/boost/fusion/view/joint_view/detail/begin_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -14,7 +14,7 @@
 {
     struct joint_view_tag;
 
- template <typename First, typename Last, typename Concat>
+ template <typename Category, typename First, typename Last, typename Concat>
     struct joint_view_iterator;
 
     namespace extension
@@ -31,13 +31,14 @@
                 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<first_type, last_type> equal_to;
 
                 typedef typename
                     mpl::if_<
                         equal_to
                       , concat_type
- , joint_view_iterator<first_type, last_type, concat_type>
+ , joint_view_iterator<category, first_type, last_type, concat_type>
>::type
                 type;
 

Modified: branches/release/boost/fusion/view/joint_view/detail/next_impl.hpp
==============================================================================
--- branches/release/boost/fusion/view/joint_view/detail/next_impl.hpp (original)
+++ branches/release/boost/fusion/view/joint_view/detail/next_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -15,7 +15,7 @@
 {
     struct joint_view_iterator_tag;
 
- template <typename First, typename Last, typename Concat>
+ template <typename Category, typename First, typename Last, typename Concat>
     struct joint_view_iterator;
 
     namespace extension
@@ -32,6 +32,7 @@
                 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<first_type>::type next_type;
                 typedef result_of::equal_to<next_type, last_type> equal_to;
 
@@ -39,7 +40,7 @@
                     mpl::if_<
                         equal_to
                       , concat_type
- , joint_view_iterator<next_type, last_type, concat_type>
+ , joint_view_iterator<category, next_type, last_type, concat_type>
>::type
                 type;
 

Modified: branches/release/boost/fusion/view/joint_view/joint_view.hpp
==============================================================================
--- branches/release/boost/fusion/view/joint_view/joint_view.hpp (original)
+++ branches/release/boost/fusion/view/joint_view/joint_view.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -19,6 +19,9 @@
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/plus.hpp>
 #include <boost/mpl/bool.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/inherit.hpp>
+#include <boost/mpl/identity.hpp>
 
 namespace boost { namespace fusion
 {
@@ -31,7 +34,16 @@
     {
         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<Sequence1>
+ , traits::is_associative<Sequence2>
+ >
+ , mpl::inherit2<forward_traversal_tag,associative_tag>
+ , mpl::identity<forward_traversal_tag>
+ >::type
+ category;
         typedef mpl::true_ is_view;
 
         typedef typename result_of::begin<Sequence1>::type first_type;

Modified: branches/release/boost/fusion/view/joint_view/joint_view_iterator.hpp
==============================================================================
--- branches/release/boost/fusion/view/joint_view/joint_view_iterator.hpp (original)
+++ branches/release/boost/fusion/view/joint_view/joint_view_iterator.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -14,6 +14,9 @@
 #include <boost/fusion/view/joint_view/detail/deref_impl.hpp>
 #include <boost/fusion/view/joint_view/detail/next_impl.hpp>
 #include <boost/fusion/view/joint_view/detail/value_of_impl.hpp>
+#include <boost/fusion/view/joint_view/detail/deref_data_impl.hpp>
+#include <boost/fusion/view/joint_view/detail/value_of_data_impl.hpp>
+#include <boost/fusion/view/joint_view/detail/key_of_impl.hpp>
 #include <boost/static_assert.hpp>
 
 namespace boost { namespace fusion
@@ -21,9 +24,9 @@
     struct joint_view_iterator_tag;
     struct forward_traversal_tag;
 
- template <typename First, typename Last, typename Concat>
+ template <typename Category, typename First, typename Last, typename Concat>
     struct joint_view_iterator
- : iterator_base<joint_view_iterator<First, Last, Concat> >
+ : iterator_base<joint_view_iterator<Category, First, Last, Concat> >
     {
         typedef convert_iterator<First> first_converter;
         typedef convert_iterator<Last> last_converter;
@@ -34,7 +37,7 @@
         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<first_type, last_type>::value));
 
         joint_view_iterator(First const& first, Concat const& concat)

Modified: branches/release/boost/fusion/view/reverse_view/reverse_view.hpp
==============================================================================
--- branches/release/boost/fusion/view/reverse_view/reverse_view.hpp (original)
+++ branches/release/boost/fusion/view/reverse_view/reverse_view.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -13,6 +13,8 @@
 #include <boost/fusion/view/reverse_view/reverse_view_iterator.hpp>
 #include <boost/fusion/view/reverse_view/detail/begin_impl.hpp>
 #include <boost/fusion/view/reverse_view/detail/end_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/at_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/value_at_impl.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
@@ -20,6 +22,9 @@
 #include <boost/type_traits/is_base_of.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/mpl/bool.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/inherit.hpp>
+#include <boost/mpl/identity.hpp>
 
 namespace boost { namespace fusion
 {
@@ -33,6 +38,7 @@
         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<Sequence>::type category;
         typedef typename result_of::begin<Sequence>::type first_type;
         typedef typename result_of::end<Sequence>::type last_type;

Modified: branches/release/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
==============================================================================
--- branches/release/boost/fusion/view/reverse_view/reverse_view_iterator.hpp (original)
+++ branches/release/boost/fusion/view/reverse_view/reverse_view_iterator.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -17,6 +17,9 @@
 #include <boost/fusion/view/reverse_view/detail/advance_impl.hpp>
 #include <boost/fusion/view/reverse_view/detail/distance_impl.hpp>
 #include <boost/fusion/view/reverse_view/detail/value_of_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/deref_data_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/value_of_data_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/key_of_impl.hpp>
 #include <boost/type_traits/is_base_of.hpp>
 #include <boost/static_assert.hpp>
 

Modified: branches/release/libs/fusion/changelist.txt
==============================================================================
--- branches/release/libs/fusion/changelist.txt (original)
+++ branches/release/libs/fusion/changelist.txt 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,5 +3,8 @@
 - 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.

Modified: branches/release/libs/fusion/doc/algorithm.qbk
==============================================================================
--- branches/release/libs/fusion/doc/algorithm.qbk (original)
+++ branches/release/libs/fusion/doc/algorithm.qbk 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -62,7 +62,7 @@
 [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 @@
 
 [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__<F(E,S)>::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__<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`][Operation's argument]]
 ]
 
 [heading Expression Semantics]
@@ -85,7 +85,7 @@
 
 [*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__<Sequence>::value` applications of `f`.
@@ -101,7 +101,7 @@
         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);
         }
@@ -115,7 +115,7 @@
 [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 @@
 
 [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__<F(E,S)>::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__<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`][Operation's argument]]
 ]
 
 [heading Expression Semantics]
@@ -138,7 +138,7 @@
 
 [*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__<Sequence>::value` applications of `f`.
@@ -154,7 +154,7 @@
         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);
         }
@@ -238,7 +238,7 @@
     [[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__<F(E,S)>::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__<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`] [The operation to be applied on forward traversal]]
 ]
 
 [heading Expression Semantics]
@@ -278,7 +278,7 @@
     [[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__<F(E,S)>::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__<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`] [The operation to be applied on forward traversal]]
 ]
 
 [heading Expression Semantics]
@@ -583,8 +583,8 @@
 [heading Complexity]
 Linear. At most `__result_of_size__<Sequence>::value` comparisons.
 
-
-/algorithm/query/find_if.hpp>
+#include <boost/fusion/algorithm/query/find_if.hpp>
+#include <boost/fusion/include/find_if.hpp>
 
 [heading Example]
     const __vector__<double,int> vec(1.0,2);
@@ -795,7 +795,7 @@
 [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 @@
 [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 @@
 [heading Expression Semantics]
     __filter__<T>(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__<boost::same_type<_, T> >(seq)`.
@@ -1024,7 +1027,10 @@
 [heading Expression Semantics]
     __filter_if__<Pred>(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 @@
 [heading Expression Semantics]
     __remove__<T>(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__<boost::is_same<_,T> >(seq)`.
@@ -1266,7 +1275,10 @@
 [heading Expression Semantics]
     __remove_if__<Pred>(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 @@
 [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 @@
 [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 @@
 [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<Sequence const, Key>::type erase_key(Sequence const& seq);
+ typename __result_of_erase_key__<Sequence const, 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__<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 @@
         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);
 
 [table Parameters
     [[Parameter][Requirement][Description]]
@@ -1479,7 +1503,10 @@
 [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 @@
 [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 @@
 [heading Expression Semantics]
     __join__(lhs, rhs);
 
-[*Return type]: A model of __forward_sequence__.
+[*Return type]:
+
+* 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 th elements is preserved.
+[*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 @@
 [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 @@
 [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 @@
 [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 @@
 [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 @@
 [heading Expression Semantics]
     __result_of_filter__<Sequence, T>::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__<Sequence, boost::is_same<mpl::_, T> >::type`.
 
@@ -1839,7 +1887,10 @@
 [heading Expression Semantics]
     __result_of_filter_if__<Sequence, Pred>::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 @@
 [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 @@
 [heading Expression Semantics]
     __result_of_remove__<Sequence, T>::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__<Sequence, boost::is_same<mpl::_, T> >::type`.
 
@@ -2062,7 +2119,10 @@
 [heading Expression Semantics]
     __result_of_remove_if__<Sequence, Pred>::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 @@
 [heading Expression Semantics]
     __result_of_reverse__<Sequence>::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 @@
 [heading Expression Semantics]
     __result_of_erase__<Sequence, It1>::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 @@
 
 [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__<Sequence, 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 @@
 [heading Expression Semantics]
     __result_of_insert__<Sequence, Position, T>::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 @@
 [heading Expression Semantics]
     __result_of_insert_range__<Sequence, Position, 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 @@
 [heading Expression Semantics]
     __result_of_join__<LhSequence, RhSequence>::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 @@
 [heading Expression Semantics]
     __result_of_pop_back__<Sequence>::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 @@
 
 [heading Header]
 
- #include <boost/fusion/algorithm/tranformation/pop_back.hpp>
+ #include <boost/fusion/algorithm/transformation/pop_back.hpp>
     #include <boost/fusion/include/pop_back.hpp>
 
 [endsect]
@@ -2435,14 +2514,20 @@
 [heading Expression Semantics]
     __result_of_pop_front__<Sequence>::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 <boost/fusion/algorithm/transformation/pop_front.hpp>
+ #include <boost/fusion/include/pop_front.hpp>
 
 [endsect]
 
@@ -2470,14 +2555,20 @@
 [heading Expression Semantics]
     __result_of_push_back__<Sequence, T>::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 <boost/fusion/algorithm/transformation/push_back.hpp>
+ #include <boost/fusion/include/push_back.hpp>
 
 [endsect]
 
@@ -2505,14 +2596,20 @@
 [heading Expression Semantics]
     __result_of_push_front__<Sequence, T>::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 <boost/fusion/algorithm/transformation/push_front.hpp>
+ #include <boost/fusion/include/push_front.hpp>
 
 [endsect]
 

Modified: branches/release/libs/fusion/doc/changelog.qbk
==============================================================================
--- branches/release/libs/fusion/doc/changelog.qbk (original)
+++ branches/release/libs/fusion/doc/changelog.qbk 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -12,7 +12,7 @@
 * 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 @@
   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]

Modified: branches/release/libs/fusion/doc/extension.qbk
==============================================================================
--- branches/release/libs/fusion/doc/extension.qbk (original)
+++ branches/release/libs/fusion/doc/extension.qbk 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -145,15 +145,15 @@
 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 <typename Iterator>
- struct __value_of__
+ struct value_of
         : extension::value_of_impl<typename detail::tag_of<Iterator>::type>::
             template apply<Iterator>
     {};
 
-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 @@
     }
 
 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 @@
 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 @@
 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 @@
 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 @@
 [[`iterator::template distance<It1, It2>::call(it1, it2)`][The distance between iterator `it1` and `it2`][None]]
 [[`iterator::template equal_to<It1, It2>::type`][The distance between iterators of type `It1` and `It2`][`boost::same_type<It1, It2>::type`]]
 [[`iterator::template equal_to<It1, It2>::call(it1, it2)`][The distance between iterators `it1` and `it2`][`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]]
 ]
 
 [heading Header]

Modified: branches/release/libs/fusion/doc/fusion.qbk
==============================================================================
--- branches/release/libs/fusion/doc/fusion.qbk (original)
+++ branches/release/libs/fusion/doc/fusion.qbk 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -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]]

Modified: branches/release/libs/fusion/doc/html/fusion/acknowledgements.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/acknowledgements.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/acknowledgements.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Acknowledgements</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="previous" href="change_log.html" title="Change log">

Modified: branches/release/libs/fusion/doc/html/fusion/adapted.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Adapted</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="previous" href="view/nview.html" title="nview">
@@ -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.
     </p>
+<<<<<<< .working
 <a name="fusion.adapted.header"></a><h3>
 <a name="id530111"></a>
       <a href="adapted.html#fusion.adapted.header">Header</a>
     </h3>
+=======
+<a name="fusion.adapted.header"></a><h4>
+<a name="id737474"></a>
+ <a class="link" href="adapted.html#fusion.adapted.header">Header</a>
+ </h4>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/adapt_assoc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/adapt_assoc.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/adapt_assoc.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title> BOOST_FUSION_ADAPT_ASSOC_STRUCT</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
 <link rel="previous" href="adapt_struct.html" title=" BOOST_FUSION_ADAPT_STRUCT">
@@ -22,6 +26,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="adapt_struct.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapted.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../algorithm.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
+<<<<<<< .working
 <div class="section" lang="en">
 <div class="titlepage">
 <div><div><h3 class="title">
@@ -33,6 +38,16 @@
 <a name="id534295"></a>
         <a href="adapt_assoc.html#fusion.adapted.adapt_assoc.description">Description</a>
       </h4>
+=======
+<div class="section" title="BOOST_FUSION_ADAPT_ASSOC_STRUCT">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.adapted.adapt_assoc"></a><a class="link" href="adapt_assoc.html" title="BOOST_FUSION_ADAPT_ASSOC_STRUCT"> BOOST_FUSION_ADAPT_ASSOC_STRUCT</a>
+</h3></div></div></div>
+<a name="fusion.adapted.adapt_assoc.description"></a><h5>
+<a name="id741464"></a>
+ <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <p>
         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 <a href="../sequence/concepts/random_access_sequence.html" title="Random
@@ -41,10 +56,17 @@
         Sequence">Associative
         Sequence</a>.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.adapt_assoc.synopsis"></a><h4>
 <a name="id534343"></a>
         <a href="adapt_assoc.html#fusion.adapted.adapt_assoc.synopsis">Synopsis</a>
       </h4>
+=======
+<a name="fusion.adapted.adapt_assoc.synopsis"></a><h5>
+<a name="id741490"></a>
+ <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">BOOST_FUSION_ADAPT_ASSOC_STRUCT</span><span class="special">(</span>
     <span class="identifier">struct_name</span><span class="special">,</span>
     <span class="special">(</span><span class="identifier">member_type0</span><span class="special">,</span> <span class="identifier">member_name0</span><span class="special">,</span> <span class="identifier">key_type0</span><span class="special">)</span>
@@ -52,10 +74,17 @@
     <span class="special">...</span>
     <span class="special">)</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.adapt_assoc.semantics"></a><h4>
 <a name="id534485"></a>
         <a href="adapt_assoc.html#fusion.adapted.adapt_assoc.semantics">Semantics</a>
       </h4>
+=======
+<a name="fusion.adapted.adapt_assoc.semantics"></a><h5>
+<a name="id741591"></a>
+ <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.semantics">Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <p>
         The above macro generates the necessary code to adapt <tt class="computeroutput"><span class="identifier">struct_name</span></tt>
         as a model of <a href="../sequence/concepts/random_access_sequence.html" title="Random
@@ -72,17 +101,31 @@
         The macro should be used at global scope, and <tt class="computeroutput"><span class="identifier">struct_name</span></tt>
         should be the fully namespace qualified name of the struct to be converted.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.adapt_assoc.header"></a><h4>
 <a name="id534609"></a>
         <a href="adapt_assoc.html#fusion.adapted.adapt_assoc.header">Header</a>
       </h4>
+=======
+<a name="fusion.adapted.adapt_assoc.header"></a><h5>
+<a name="id742214"></a>
+ <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="keyword">struct</span><span class="special">/</span><span class="identifier">adapt_assoc_struct</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">adapt_assoc_struct</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.adapt_assoc.example"></a><h4>
 <a name="id534774"></a>
         <a href="adapt_assoc.html#fusion.adapted.adapt_assoc.example">Example</a>
       </h4>
+=======
+<a name="fusion.adapted.adapt_assoc.example"></a><h5>
+<a name="id742330"></a>
+ <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">demo</span>
 <span class="special">{</span>
     <span class="keyword">struct</span> <span class="identifier">employee</span>

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/adapt_struct.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/adapt_struct.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/adapt_struct.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title> BOOST_FUSION_ADAPT_STRUCT</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
 <link rel="previous" href="boost__tuple.html" title="boost::tuple">
@@ -22,6 +26,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="boost__tuple.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapted.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="adapt_assoc.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
+<<<<<<< .working
 <div class="section" lang="en">
 <div class="titlepage">
 <div><div><h3 class="title">
@@ -33,16 +38,33 @@
 <a name="id533623"></a>
         <a href="adapt_struct.html#fusion.adapted.adapt_struct.description">Description</a>
       </h4>
+=======
+<div class="section" title="BOOST_FUSION_ADAPT_STRUCT">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.adapted.adapt_struct"></a><a class="link" href="adapt_struct.html" title="BOOST_FUSION_ADAPT_STRUCT"> BOOST_FUSION_ADAPT_STRUCT</a>
+</h3></div></div></div>
+<a name="fusion.adapted.adapt_struct.description"></a><h5>
+<a name="id741004"></a>
+ <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <p>
         BOOST_FUSION_ADAPT_STRUCT is a macro that can be used to generate all the
         necessary boilerplate to make an arbitrary struct into a <a href="../sequence/concepts/random_access_sequence.html" title="Random
         Access Sequence">Random
         Access Sequence</a>.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.adapt_struct.synopsis"></a><h4>
 <a name="id533662"></a>
         <a href="adapt_struct.html#fusion.adapted.adapt_struct.synopsis">Synopsis</a>
       </h4>
+=======
+<a name="fusion.adapted.adapt_struct.synopsis"></a><h5>
+<a name="id741026"></a>
+ <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">BOOST_FUSION_ADAPT_STRUCT</span><span class="special">(</span>
     <span class="identifier">struct_name</span><span class="special">,</span>
     <span class="special">(</span><span class="identifier">member_type0</span><span class="special">,</span> <span class="identifier">member_name0</span><span class="special">)</span>
@@ -50,10 +72,17 @@
     <span class="special">...</span>
     <span class="special">)</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.adapt_struct.semantics"></a><h4>
 <a name="id533781"></a>
         <a href="adapt_struct.html#fusion.adapted.adapt_struct.semantics">Semantics</a>
       </h4>
+=======
+<a name="fusion.adapted.adapt_struct.semantics"></a><h5>
+<a name="id741110"></a>
+ <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.semantics">Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <p>
         The above macro generates the necessary code to adapt <tt class="computeroutput"><span class="identifier">struct_name</span></tt>
         as a model of <a href="../sequence/concepts/random_access_sequence.html" title="Random
@@ -67,17 +96,31 @@
         The macro should be used at global scope, and <tt class="computeroutput"><span class="identifier">struct_name</span></tt>
         should be the fully namespace qualified name of the struct to be converted.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.adapt_struct.header"></a><h4>
 <a name="id533884"></a>
         <a href="adapt_struct.html#fusion.adapted.adapt_struct.header">Header</a>
       </h4>
+=======
+<a name="fusion.adapted.adapt_struct.header"></a><h5>
+<a name="id741173"></a>
+ <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="keyword">struct</span><span class="special">/</span><span class="identifier">adapt_struct</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">adapt_struct</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.adapt_struct.example"></a><h4>
 <a name="id534049"></a>
         <a href="adapt_struct.html#fusion.adapted.adapt_struct.example">Example</a>
       </h4>
+=======
+<a name="fusion.adapted.adapt_struct.example"></a><h5>
+<a name="id741288"></a>
+ <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">demo</span>
 <span class="special">{</span>
     <span class="keyword">struct</span> <span class="identifier">employee</span>

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/boost__array.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/boost__array.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/boost__array.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>boost::array</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
 <link rel="previous" href="mpl_sequence.html" title="mpl sequence">
@@ -36,24 +40,46 @@
         Access Sequence">Random
         Access Sequence</a>.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.boost__array.header"></a><h4>
 <a name="id532132"></a>
         <a href="boost__array.html#fusion.adapted.boost__array.header">Header</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__array.header"></a><h5>
+<a name="id739972"></a>
+ <a class="link" href="boost__array.html#fusion.adapted.boost__array.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="identifier">array</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">array</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.boost__array.model_of"></a><h4>
 <a name="id532287"></a>
         <a href="boost__array.html#fusion.adapted.boost__array.model_of">Model of</a>
       </h4>
 <div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/random_access_sequence.html" title="Random
         Access Sequence">Random
+=======
+<a name="fusion.adapted.boost__array.model_of"></a><h5>
+<a name="id740080"></a>
+ <a class="link" href="boost__array.html#fusion.adapted.boost__array.model_of">Model of</a>
+ </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+>>>>>>> .merge-right.r57125
           Access Sequence</a></li></ul></div>
+<<<<<<< .working
 <a name="fusion.adapted.boost__array.example"></a><h4>
 <a name="id532327"></a>
         <a href="boost__array.html#fusion.adapted.boost__array.example">Example</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__array.example"></a><h5>
+<a name="id740105"></a>
+ <a class="link" href="boost__array.html#fusion.adapted.boost__array.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="number">3</span><span class="special">&gt;</span> <span class="identifier">arr</span> <span class="special">=</span> <span class="special">{{</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">}};</span>
 
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span>begin<span class="special">(</span><span class="identifier">arr</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
@@ -62,10 +88,17 @@
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span>prior<span class="special">(</span>end<span class="special">(</span><span class="identifier">arr</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;(</span><span class="identifier">arr</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.boost__array.see_also"></a><h4>
 <a name="id532945"></a>
         <a href="boost__array.html#fusion.adapted.boost__array.see_also">See also</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__array.see_also"></a><h5>
+<a name="id740541"></a>
+ <a class="link" href="boost__array.html#fusion.adapted.boost__array.see_also">See also</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <a href="http://www.boost.org/doc/html/array.html" target="_top">Boost.Array Library</a>
       </p>

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/boost__tuple.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/boost__tuple.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/boost__tuple.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>boost::tuple</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
 <link rel="previous" href="boost__array.html" title="boost::array">
@@ -36,13 +40,21 @@
         Sequence">Forward
         Sequence</a>.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.boost__tuple.header"></a><h4>
 <a name="id533058"></a>
         <a href="boost__tuple.html#fusion.adapted.boost__tuple.header">Header</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__tuple.header"></a><h5>
+<a name="id740610"></a>
+ <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="identifier">boost_tuple</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">boost_tuple</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.boost__tuple.model_of"></a><h4>
 <a name="id533213"></a>
         <a href="boost__tuple.html#fusion.adapted.boost__tuple.model_of">Model of</a>
@@ -53,14 +65,32 @@
 <a name="id533252"></a>
         <a href="boost__tuple.html#fusion.adapted.boost__tuple.example">Example</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__tuple.model_of"></a><h5>
+<a name="id740718"></a>
+ <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.model_of">Model of</a>
+ </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a></li></ul></div>
+<a name="fusion.adapted.boost__tuple.example"></a><h5>
+<a name="id740744"></a>
+ <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">tuple</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">example_tuple</span><span class="special">(</span><span class="number">101</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">);</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">begin</span><span class="special">(</span><span class="identifier">example_tuple</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="char">'\n'</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">next</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">begin</span><span class="special">(</span><span class="identifier">example_tuple</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="char">'\n'</span><span class="special">;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.boost__tuple.see_also"></a><h4>
 <a name="id533568"></a>
         <a href="boost__tuple.html#fusion.adapted.boost__tuple.see_also">See also</a>
       </h4>
+=======
+<a name="fusion.adapted.boost__tuple.see_also"></a><h5>
+<a name="id740970"></a>
+ <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.see_also">See also</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <a href="http://www.boost.org/libs/tuple/doc/tuple_users_guide.html" target="_top">Boost.Tuple
         Library</a>

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/mpl_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/mpl_sequence.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/mpl_sequence.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>mpl sequence</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
 <link rel="previous" href="std__pair.html" title="std::pair">
@@ -34,13 +38,21 @@
         sequences. Including the module header makes all MPL
         sequences fully conforming fusion sequences.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.mpl_sequence.header"></a><h4>
 <a name="id531191"></a>
         <a href="mpl_sequence.html#fusion.adapted.mpl_sequence.header">Header</a>
       </h4>
+=======
+<a name="fusion.adapted.mpl_sequence.header"></a><h5>
+<a name="id738223"></a>
+ <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="identifier">mpl</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">mpl</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.mpl_sequence.model_of"></a><h4>
 <a name="id531346"></a>
         <a href="mpl_sequence.html#fusion.adapted.mpl_sequence.model_of">Model of</a>
@@ -49,6 +61,15 @@
 <li>
 <a href="../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward Sequence</a>
+=======
+<a name="fusion.adapted.mpl_sequence.model_of"></a><h5>
+<a name="id738331"></a>
+ <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.model_of">Model of</a>
+ </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+<a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
+>>>>>>> .merge-right.r57125
           (If the MPL
           sequence is a forward sequence.)
         </li>
@@ -65,10 +86,17 @@
           sequence is a random access sequence.)
         </li>
 </ul></div>
+<<<<<<< .working
 <a name="fusion.adapted.mpl_sequence.example"></a><h4>
 <a name="id531436"></a>
         <a href="mpl_sequence.html#fusion.adapted.mpl_sequence.example">Example</a>
       </h4>
+=======
+<a name="fusion.adapted.mpl_sequence.example"></a><h5>
+<a name="id739482"></a>
+ <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector_c</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="number">456</span><span class="special">&gt;</span> <span class="identifier">vec_c</span><span class="special">;</span>
 <span class="identifier">fusion</span><span class="special">::</span><span class="identifier">vector2</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">long</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="identifier">vec_c</span><span class="special">);</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
@@ -78,10 +106,17 @@
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.mpl_sequence.see_also"></a><h4>
 <a name="id532022"></a>
         <a href="mpl_sequence.html#fusion.adapted.mpl_sequence.see_also">See also</a>
       </h4>
+=======
+<a name="fusion.adapted.mpl_sequence.see_also"></a><h5>
+<a name="id739902"></a>
+ <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.see_also">See also</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a>
       </p>

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/std__pair.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/std__pair.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/std__pair.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>std::pair</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
 <link rel="previous" href="../adapted.html" title="Adapted">
@@ -36,33 +40,62 @@
         Access Sequence">Random
         Access Sequence</a>.
       </p>
+<<<<<<< .working
 <a name="fusion.adapted.std__pair.header"></a><h4>
 <a name="id530512"></a>
         <a href="std__pair.html#fusion.adapted.std__pair.header">Header</a>
       </h4>
+=======
+<a name="fusion.adapted.std__pair.header"></a><h5>
+<a name="id737752"></a>
+ <a class="link" href="std__pair.html#fusion.adapted.std__pair.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="identifier">std_pair</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">std_pair</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.std__pair.model_of"></a><h4>
 <a name="id530668"></a>
         <a href="std__pair.html#fusion.adapted.std__pair.model_of">Model of</a>
       </h4>
 <div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/random_access_sequence.html" title="Random
         Access Sequence">Random
+=======
+<a name="fusion.adapted.std__pair.model_of"></a><h5>
+<a name="id737860"></a>
+ <a class="link" href="std__pair.html#fusion.adapted.std__pair.model_of">Model of</a>
+ </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+>>>>>>> .merge-right.r57125
           Access Sequence</a></li></ul></div>
+<<<<<<< .working
 <a name="fusion.adapted.std__pair.example"></a><h4>
 <a name="id530707"></a>
         <a href="std__pair.html#fusion.adapted.std__pair.example">Example</a>
       </h4>
+=======
+<a name="fusion.adapted.std__pair.example"></a><h5>
+<a name="id737886"></a>
+ <a class="link" href="std__pair.html#fusion.adapted.std__pair.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">p</span><span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"Hola!!!"</span><span class="special">);</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">p</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">p</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">p</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
+<<<<<<< .working
 <a name="fusion.adapted.std__pair.see_also"></a><h4>
 <a name="id531057"></a>
         <a href="std__pair.html#fusion.adapted.std__pair.see_also">See also</a>
       </h4>
+=======
+<a name="fusion.adapted.std__pair.see_also"></a><h5>
+<a name="id738136"></a>
+ <a class="link" href="std__pair.html#fusion.adapted.std__pair.see_also">See also</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <p>
         <a href="http://www.sgi.com/tech/stl/pair.html" target="_top"><tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt></a>,
         <a href="../tuple/pairs.html" title="Pairs"><tt class="computeroutput"><span class="identifier">TR1</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Algorithm</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="previous" href="adapted/adapt_assoc.html" title=" BOOST_FUSION_ADAPT_ASSOC_STRUCT">
@@ -46,10 +50,17 @@
 <dt><span class="section">Metafunctions</span></dt>
 </dl></dd>
 </dl></div>
+<<<<<<< .working
 <a name="fusion.algorithm.lazy_evaluation"></a><h3>
 <a name="id535132"></a>
       <a href="algorithm.html#fusion.algorithm.lazy_evaluation">Lazy Evaluation</a>
     </h3>
+=======
+<a name="fusion.algorithm.lazy_evaluation"></a><h4>
+<a name="id742590"></a>
+ <a class="link" href="algorithm.html#fusion.algorithm.lazy_evaluation">Lazy Evaluation</a>
+ </h4>
+>>>>>>> .merge-right.r57125
 <p>
       Unlike MPL, Fusion
       algorithms are lazy and non sequence-type preserving. What does that mean?
@@ -69,10 +80,17 @@
       <span class="emphasis"><em>lazy</em></span> evaluation scheme allows us to chain as many algorithms
       as we want without incurring a high runtime penalty.
     </p>
+<<<<<<< .working
 <a name="fusion.algorithm.sequence_extension"></a><h3>
 <a name="id535279"></a>
       <a href="algorithm.html#fusion.algorithm.sequence_extension">Sequence Extension</a>
     </h3>
+=======
+<a name="fusion.algorithm.sequence_extension"></a><h4>
+<a name="id742667"></a>
+ <a class="link" href="algorithm.html#fusion.algorithm.sequence_extension">Sequence Extension</a>
+ </h4>
+>>>>>>> .merge-right.r57125
 <p>
       The <span class="emphasis"><em>lazy</em></span> 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.
     </p>
+<<<<<<< .working
 <a name="fusion.algorithm.header"></a><h3>
 <a name="id535506"></a>
       <a href="algorithm.html#fusion.algorithm.header">Header</a>
     </h3>
+=======
+<a name="fusion.algorithm.header"></a><h4>
+<a name="id742794"></a>
+ <a class="link" href="algorithm.html#fusion.algorithm.header">Header</a>
+ </h4>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Iteration</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../algorithm.html" title="Algorithm">
 <link rel="previous" href="../algorithm.html" title="Algorithm">
@@ -37,10 +41,17 @@
         The iteration algorithms provide the fundamental algorithms for traversing
         a sequence repeatedly applying an operation to its elements.
       </p>
+<<<<<<< .working
 <a name="fusion.algorithm.iteration.header"></a><h4>
 <a name="id535675"></a>
         <a href="iteration.html#fusion.algorithm.iteration.header">Header</a>
       </h4>
+=======
+<a name="fusion.algorithm.iteration.header"></a><h5>
+<a name="id742908"></a>
+ <a class="link" href="iteration.html#fusion.algorithm.iteration.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../iteration.html" title="Iteration">
 <link rel="previous" href="../iteration.html" title="Iteration">

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/accumulate.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/accumulate.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/accumulate.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>accumulate</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="fold.html" title="fold">
 <link rel="next" href="for_each.html" title="for_each">
@@ -30,19 +38,80 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.iteration.functions.accumulate.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id537581"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.description">Description</a>
+=======
+<a name="id789366"></a>
+=======
+<a name="id751900"></a>
+=======
+<a name="id744276"></a>
+=======
+<a name="id767092"></a>
+=======
+<a name="id755686"></a>
+=======
+<a name="id752410"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
+<<<<<<< .working
             For a sequence <tt class="computeroutput"><span class="identifier">Seq</span></tt>, initial
             state, and binary function object or function pointer <tt class="computeroutput"><span class="identifier">f</span></tt>,
             accumulate repeatedly applies binary <tt class="computeroutput"><span class="identifier">f</span></tt>
             to each element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>
             and the previous state.
+=======
+ For a sequence <code class="computeroutput"><span class="identifier">seq</span></code>, initial
+ state <code class="computeroutput"><span class="identifier">initial_state</span></code>,
+ and binary function object or function pointer <code class="computeroutput"><span class="identifier">f</span></code>,
+ accumulate returns the result of the repeated application of binary
+ <code class="computeroutput"><span class="identifier">f</span></code> to the result of the
+ previous <code class="computeroutput"><span class="identifier">f</span></code> invocation
+ (<code class="computeroutput"><span class="identifier">inital_state</span></code> if it is
+ the first call) and each element of <code class="computeroutput"><span class="identifier">seq</span></code>.
+>>>>>>> .merge-right.r57125
           </p>
 <a name="fusion.algorithm.iteration.functions.accumulate.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id537658"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.synopsis">Synopsis</a>
+=======
+<a name="id789441"></a>
+=======
+<a name="id751975"></a>
+=======
+<a name="id744350"></a>
+=======
+<a name="id767166"></a>
+=======
+<a name="id755761"></a>
+=======
+<a name="id752484"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -53,8 +122,33 @@
     <span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">State</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">initial_state</span><span class="special">,</span> <span class="identifier">F</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id537917"></a><p class="title"><b>Table 1.34. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id789627"></a><p class="title"><b>Table 1.34. Parameters</b></p>
+=======
+<a name="id752184"></a><p class="title"><b>Table 1.38. Parameters</b></p>
+=======
+<a name="id744560"></a><p class="title"><b>Table 1.38. Parameters</b></p>
+=======
+<a name="id767352"></a><p class="title"><b>Table&#160;1.38.&#160;Parameters</b></p>
+=======
+<a name="id755947"></a><p class="title"><b>Table&#160;1.38.&#160;Parameters</b></p>
+=======
+<a name="id752670"></a><p class="title"><b>Table&#160;1.38.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -73,6 +167,7 @@
 </tr></thead>
 <tbody>
 <tr>
+<<<<<<< .working
 <td><p>
                   <tt class="computeroutput"><span class="identifier">seq</span></tt>
                 </p></td>
@@ -85,6 +180,24 @@
                   to <tt class="computeroutput"><span class="identifier">eN</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>
                 </p></td>
 <td><p>
+=======
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">seq</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>, <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span><span class="identifier">e</span><span class="special">)</span></code> must be a valid expression for
+ current state <code class="computeroutput"><span class="identifier">s</span></code>,
+ and each element <code class="computeroutput"><span class="identifier">e</span></code>
+ in <code class="computeroutput"><span class="identifier">seq</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+>>>>>>> .merge-right.r57125
                   Operation's argument
                 </p></td>
 </tr>
@@ -100,6 +213,7 @@
                 </p></td>
 </tr>
 <tr>
+<<<<<<< .working
 <td><p>
                   <tt class="computeroutput"><span class="identifier">f</span></tt>
                 </p></td>
@@ -109,15 +223,39 @@
                   of type <tt class="computeroutput"><span class="identifier">E</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>, and current state <tt class="computeroutput"><span class="identifier">s</span></tt> of type <tt class="computeroutput"><span class="identifier">S</span></tt>
                 </p></td>
 <td><p>
+=======
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">f</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ <code class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">S</span><span class="special">,</span><span class="identifier">E</span><span class="special">)&gt;::</span><span class="identifier">type</span></code> is the return type of <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span><span class="identifier">e</span><span class="special">)</span></code>
+ current state <code class="computeroutput"><span class="identifier">s</span></code>
+ of type <code class="computeroutput"><span class="identifier">S</span></code>, and
+ for each element <code class="computeroutput"><span class="identifier">e</span></code>
+ of type <code class="computeroutput"><span class="identifier">E</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+>>>>>>> .merge-right.r57125
                   Operation's argument
                 </p></td>
 </tr>
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.iteration.functions.accumulate.expression_semantics"></a><h6>
 <a name="id538367"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.iteration.functions.accumulate.expression_semantics"></a><h6>
+<a name="id752970"></a>
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">accumulate</span><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">initial_state</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
@@ -126,33 +264,114 @@
             <span class="bold"><b>Return type</b></span>: Any type
           </p>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Semantics</b></span>: Equivalent to <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">eN</span> <span class="special">....</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">e2</span><span class="special">,</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span><span class="identifier">initial_state</span><span class="special">)))</span></tt>
             where <tt class="computeroutput"><span class="identifier">e1</span> <span class="special">...</span><span class="identifier">eN</span></tt> are the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+=======
+ <span class="bold"><strong>Semantics</strong></span>: Equivalent to <code class="computeroutput"><span class="identifier">f</span><span class="special">(...</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">initial_state</span><span class="special">,</span><span class="identifier">e1</span><span class="special">),</span><span class="identifier">e2</span><span class="special">)</span> <span class="special">...</span><span class="identifier">eN</span><span class="special">)</span></code> where <code class="computeroutput"><span class="identifier">e1</span>
+ <span class="special">...</span><span class="identifier">eN</span></code>
+ are the elements of <code class="computeroutput"><span class="identifier">seq</span></code>.
+>>>>>>> .merge-right.r57125
           </p>
 <a name="fusion.algorithm.iteration.functions.accumulate.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id538575"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.complexity">Complexity</a>
+=======
+<a name="id790624"></a>
+=======
+<a name="id752635"></a>
+=======
+<a name="id745011"></a>
+=======
+<a name="id767803"></a>
+=======
+<a name="id756398"></a>
+=======
+<a name="id753121"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear, exactly <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> applications of <tt class="computeroutput"><span class="identifier">f</span></tt>.
           </p>
 <a name="fusion.algorithm.iteration.functions.accumulate.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id538669"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.header">Header</a>
+=======
+<a name="id790684"></a>
+=======
+<a name="id752695"></a>
+=======
+<a name="id745071"></a>
+=======
+<a name="id767863"></a>
+=======
+<a name="id756458"></a>
+=======
+<a name="id753181"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">accumulate</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">accumulate</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.iteration.functions.accumulate.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id538836"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.example">Example</a>
+=======
+<a name="id790800"></a>
+=======
+<a name="id752811"></a>
+=======
+<a name="id745186"></a>
+=======
+<a name="id767978"></a>
+=======
+<a name="id756573"></a>
+=======
+<a name="id753296"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">make_string</span>
 <span class="special">{</span>
     <span class="keyword">typedef</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">result_type</span><span class="special">;</span>
 
     <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
- <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="keyword">operator</span><span class="special">()(</span><span class="keyword">const</span> <span class="identifier">T</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">str</span><span class="special">)</span> <span class="keyword">const</span>
+ <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="keyword">operator</span><span class="special">()(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">str</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">T</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">)</span> <span class="keyword">const</span>
     <span class="special">{</span>
         <span class="keyword">return</span> <span class="identifier">str</span> <span class="special">+</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">lexical_cast</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;(</span><span class="identifier">t</span><span class="special">);</span>
     <span class="special">}</span>
@@ -164,7 +383,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/fold.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/fold.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/fold.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>fold</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="../functions.html" title="Functions">
 <link rel="next" href="accumulate.html" title="accumulate">
@@ -30,19 +38,77 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.iteration.functions.fold.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id535870"></a>
             <a href="fold.html#fusion.algorithm.iteration.functions.fold.description">Description</a>
+=======
+<a name="id788125"></a>
+=======
+<a name="id750659"></a>
+=======
+<a name="id743035"></a>
+=======
+<a name="id765839"></a>
+=======
+<a name="id753341"></a>
+=======
+<a name="id750065"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
+<<<<<<< .working
             For a sequence <tt class="computeroutput"><span class="identifier">Seq</span></tt>, initial
             state, and binary function object or function pointer <tt class="computeroutput"><span class="identifier">f</span></tt>,
             fold repeatedly applies binary <tt class="computeroutput"><span class="identifier">f</span></tt>
             to each element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>
             and the previous state.
+=======
+ For a sequence <code class="computeroutput"><span class="identifier">seq</span></code>, initial
+ state <code class="computeroutput"><span class="identifier">initial_state</span></code>,
+ and binary function object or function pointer <code class="computeroutput"><span class="identifier">f</span></code>,
+ fold returns the result of the repeated application of binary <code class="computeroutput"><span class="identifier">f</span></code> to the result of the previous <code class="computeroutput"><span class="identifier">f</span></code> invocation (<code class="computeroutput"><span class="identifier">inital_state</span></code>
+ if it is the first call) and each element of <code class="computeroutput"><span class="identifier">seq</span></code>.
+>>>>>>> .merge-right.r57125
           </p>
 <a name="fusion.algorithm.iteration.functions.fold.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id535948"></a>
             <a href="fold.html#fusion.algorithm.iteration.functions.fold.synopsis">Synopsis</a>
+=======
+<a name="id788195"></a>
+=======
+<a name="id750729"></a>
+=======
+<a name="id743105"></a>
+=======
+<a name="id765908"></a>
+=======
+<a name="id753411"></a>
+=======
+<a name="id750134"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -53,8 +119,33 @@
     <span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">State</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">initial_state</span><span class="special">,</span> <span class="identifier">F</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id536204"></a><p class="title"><b>Table 1.33. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id788379"></a><p class="title"><b>Table 1.33. Parameters</b></p>
+=======
+<a name="id750913"></a><p class="title"><b>Table 1.37. Parameters</b></p>
+=======
+<a name="id743288"></a><p class="title"><b>Table 1.37. Parameters</b></p>
+=======
+<a name="id766092"></a><p class="title"><b>Table&#160;1.37.&#160;Parameters</b></p>
+=======
+<a name="id753595"></a><p class="title"><b>Table&#160;1.37.&#160;Parameters</b></p>
+=======
+<a name="id750318"></a><p class="title"><b>Table&#160;1.37.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -73,6 +164,7 @@
 </tr></thead>
 <tbody>
 <tr>
+<<<<<<< .working
 <td><p>
                   <tt class="computeroutput"><span class="identifier">seq</span></tt>
                 </p></td>
@@ -85,6 +177,24 @@
                   state <tt class="computeroutput"><span class="identifier">s</span></tt>
                 </p></td>
 <td><p>
+=======
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">seq</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>, <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span><span class="identifier">e</span><span class="special">)</span></code> must be a valid expression for
+ current state <code class="computeroutput"><span class="identifier">s</span></code>,
+ and each element <code class="computeroutput"><span class="identifier">e</span></code>
+ in <code class="computeroutput"><span class="identifier">seq</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+>>>>>>> .merge-right.r57125
                   Operation's argument
                 </p></td>
 </tr>
@@ -100,6 +210,7 @@
                 </p></td>
 </tr>
 <tr>
+<<<<<<< .working
 <td><p>
                   <tt class="computeroutput"><span class="identifier">f</span></tt>
                 </p></td>
@@ -109,15 +220,39 @@
                   of type <tt class="computeroutput"><span class="identifier">E</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>, and current state <tt class="computeroutput"><span class="identifier">s</span></tt> of type <tt class="computeroutput"><span class="identifier">S</span></tt>
                 </p></td>
 <td><p>
+=======
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">f</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ <code class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">S</span><span class="special">,</span><span class="identifier">E</span><span class="special">)&gt;::</span><span class="identifier">type</span></code> is the return type of <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span><span class="identifier">e</span><span class="special">)</span></code>
+ current state <code class="computeroutput"><span class="identifier">s</span></code>
+ of type <code class="computeroutput"><span class="identifier">S</span></code>, and
+ for each element <code class="computeroutput"><span class="identifier">e</span></code>
+ of type <code class="computeroutput"><span class="identifier">E</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+>>>>>>> .merge-right.r57125
                   Operation's argument
                 </p></td>
 </tr>
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.iteration.functions.fold.expression_semantics"></a><h6>
 <a name="id536612"></a>
             <a href="fold.html#fusion.algorithm.iteration.functions.fold.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.iteration.functions.fold.expression_semantics"></a><h6>
+<a name="id750620"></a>
+ <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">fold</span><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">initial_state</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
@@ -126,33 +261,114 @@
             <span class="bold"><b>Return type</b></span>: Any type
           </p>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Semantics</b></span>: Equivalent to <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">eN</span> <span class="special">....</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">e2</span><span class="special">,</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span><span class="identifier">initial_state</span><span class="special">)))</span></tt>
             where <tt class="computeroutput"><span class="identifier">e1</span> <span class="special">...</span><span class="identifier">eN</span></tt> are the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+=======
+ <span class="bold"><strong>Semantics</strong></span>: Equivalent to <code class="computeroutput"><span class="identifier">f</span><span class="special">(...</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">initial_state</span><span class="special">,</span><span class="identifier">e1</span><span class="special">),</span><span class="identifier">e2</span><span class="special">)</span> <span class="special">...</span><span class="identifier">eN</span><span class="special">)</span></code> where <code class="computeroutput"><span class="identifier">e1</span>
+ <span class="special">...</span><span class="identifier">eN</span></code>
+ are the elements of <code class="computeroutput"><span class="identifier">seq</span></code>.
+>>>>>>> .merge-right.r57125
           </p>
 <a name="fusion.algorithm.iteration.functions.fold.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id536820"></a>
             <a href="fold.html#fusion.algorithm.iteration.functions.fold.complexity">Complexity</a>
+=======
+<a name="id788832"></a>
+=======
+<a name="id751366"></a>
+=======
+<a name="id743742"></a>
+=======
+<a name="id766546"></a>
+=======
+<a name="id754048"></a>
+=======
+<a name="id750771"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear, exactly <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> applications of <tt class="computeroutput"><span class="identifier">f</span></tt>.
           </p>
 <a name="fusion.algorithm.iteration.functions.fold.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id536913"></a>
             <a href="fold.html#fusion.algorithm.iteration.functions.fold.header">Header</a>
+=======
+<a name="id788890"></a>
+=======
+<a name="id751424"></a>
+=======
+<a name="id743800"></a>
+=======
+<a name="id766603"></a>
+=======
+<a name="id754106"></a>
+=======
+<a name="id750829"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">fold</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">fold</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.iteration.functions.fold.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id537079"></a>
             <a href="fold.html#fusion.algorithm.iteration.functions.fold.example">Example</a>
+=======
+<a name="id789005"></a>
+=======
+<a name="id751539"></a>
+=======
+<a name="id743915"></a>
+=======
+<a name="id766718"></a>
+=======
+<a name="id754221"></a>
+=======
+<a name="id750944"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">make_string</span>
 <span class="special">{</span>
     <span class="keyword">typedef</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">result_type</span><span class="special">;</span>
 
     <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
- <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="keyword">operator</span><span class="special">()(</span><span class="keyword">const</span> <span class="identifier">T</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">str</span><span class="special">)</span> <span class="keyword">const</span>
+ <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="keyword">operator</span><span class="special">()(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&amp;</span> <span class="identifier">str</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">T</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">)</span> <span class="keyword">const</span>
     <span class="special">{</span>
         <span class="keyword">return</span> <span class="identifier">str</span> <span class="special">+</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">lexical_cast</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;(</span><span class="identifier">t</span><span class="special">);</span>
     <span class="special">}</span>
@@ -164,7 +380,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/for_each.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/for_each.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/for_each.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>for_each</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="accumulate.html" title="accumulate">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.iteration.functions.for_each.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id539334"></a>
             <a href="for_each.html#fusion.algorithm.iteration.functions.for_each.description">Description</a>
+=======
+<a name="id791161"></a>
+=======
+<a name="id753172"></a>
+=======
+<a name="id745548"></a>
+=======
+<a name="id768340"></a>
+=======
+<a name="id756934"></a>
+=======
+<a name="id753658"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Applies a unary function object to each element of a sequence.
           </p>
 <a name="fusion.algorithm.iteration.functions.for_each.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id539364"></a>
             <a href="for_each.html#fusion.algorithm.iteration.functions.for_each.synopsis">Synopsis</a>
+=======
+<a name="id791180"></a>
+=======
+<a name="id753191"></a>
+=======
+<a name="id745567"></a>
+=======
+<a name="id768359"></a>
+=======
+<a name="id756954"></a>
+=======
+<a name="id753677"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -48,8 +106,33 @@
     <span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id539564"></a><p class="title"><b>Table 1.35. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id791320"></a><p class="title"><b>Table 1.35. Parameters</b></p>
+=======
+<a name="id753331"></a><p class="title"><b>Table 1.39. Parameters</b></p>
+=======
+<a name="id745707"></a><p class="title"><b>Table 1.39. Parameters</b></p>
+=======
+<a name="id768499"></a><p class="title"><b>Table&#160;1.39.&#160;Parameters</b></p>
+=======
+<a name="id757094"></a><p class="title"><b>Table&#160;1.39.&#160;Parameters</b></p>
+=======
+<a name="id753817"></a><p class="title"><b>Table&#160;1.39.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -98,9 +181,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.iteration.functions.for_each.expression_semantics"></a><h6>
 <a name="id539763"></a>
             <a href="for_each.html#fusion.algorithm.iteration.functions.for_each.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.iteration.functions.for_each.expression_semantics"></a><h6>
+<a name="id753970"></a>
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">for_each<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
@@ -113,22 +202,97 @@
             in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.iteration.functions.for_each.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id539918"></a>
             <a href="for_each.html#fusion.algorithm.iteration.functions.for_each.complexity">Complexity</a>
+=======
+<a name="id791577"></a>
+=======
+<a name="id753588"></a>
+=======
+<a name="id745964"></a>
+=======
+<a name="id768756"></a>
+=======
+<a name="id757351"></a>
+=======
+<a name="id754074"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear, exactly <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> applications of <tt class="computeroutput"><span class="identifier">f</span></tt>.
           </p>
 <a name="fusion.algorithm.iteration.functions.for_each.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id540012"></a>
             <a href="for_each.html#fusion.algorithm.iteration.functions.for_each.header">Header</a>
+=======
+<a name="id791637"></a>
+=======
+<a name="id753648"></a>
+=======
+<a name="id746024"></a>
+=======
+<a name="id768816"></a>
+=======
+<a name="id757411"></a>
+=======
+<a name="id754134"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">for_each</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">for_each</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.iteration.functions.for_each.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id540179"></a>
             <a href="for_each.html#fusion.algorithm.iteration.functions.for_each.example">Example</a>
+=======
+<a name="id791752"></a>
+=======
+<a name="id753763"></a>
+=======
+<a name="id746139"></a>
+=======
+<a name="id768931"></a>
+=======
+<a name="id757526"></a>
+=======
+<a name="id754249"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">increment</span>
 <span class="special">{</span>
@@ -146,7 +310,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Metafunctions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../iteration.html" title="Iteration">
 <link rel="previous" href="functions/for_each.html" title="for_each">

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>accumulate</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
 <link rel="previous" href="fold.html" title="fold">
 <link rel="next" href="for_each.html" title="for_each">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.iteration.metafunctions.accumulate.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id541535"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.description">Description</a>
+=======
+<a name="id793250"></a>
+=======
+<a name="id755807"></a>
+=======
+<a name="id748182"></a>
+=======
+<a name="id769882"></a>
+=======
+<a name="id758477"></a>
+=======
+<a name="id755200"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the result type of accumulate.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.accumulate.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id541582"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.synopsis">Synopsis</a>
+=======
+<a name="id793281"></a>
+=======
+<a name="id755838"></a>
+=======
+<a name="id748214"></a>
+=======
+<a name="id769913"></a>
+=======
+<a name="id758508"></a>
+=======
+<a name="id755231"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -50,8 +108,33 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id541715"></a><p class="title"><b>Table 1.37. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id793380"></a><p class="title"><b>Table 1.37. Parameters</b></p>
+=======
+<a name="id755937"></a><p class="title"><b>Table 1.41. Parameters</b></p>
+=======
+<a name="id748313"></a><p class="title"><b>Table 1.41. Parameters</b></p>
+=======
+<a name="id770013"></a><p class="title"><b>Table&#160;1.41.&#160;Parameters</b></p>
+=======
+<a name="id758608"></a><p class="title"><b>Table&#160;1.41.&#160;Parameters</b></p>
+=======
+<a name="id755331"></a><p class="title"><b>Table&#160;1.41.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -94,6 +177,7 @@
                 </p></td>
 </tr>
 <tr>
+<<<<<<< .working
 <td><p>
                   <tt class="computeroutput"><span class="identifier">F</span></tt>
                 </p></td>
@@ -103,15 +187,39 @@
                   of type <tt class="computeroutput"><span class="identifier">E</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>, and current state <tt class="computeroutput"><span class="identifier">s</span></tt> of type <tt class="computeroutput"><span class="identifier">S</span></tt>
                 </p></td>
 <td><p>
+=======
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">F</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ <code class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">S</span><span class="special">,</span><span class="identifier">E</span><span class="special">)&gt;::</span><span class="identifier">type</span></code> is the return type of <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span><span class="identifier">e</span><span class="special">)</span></code>
+ for current state <code class="computeroutput"><span class="identifier">s</span></code>
+ of type <code class="computeroutput"><span class="identifier">S</span></code>, and
+ for each element <code class="computeroutput"><span class="identifier">e</span></code>
+ of type <code class="computeroutput"><span class="identifier">E</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+>>>>>>> .merge-right.r57125
                   The operation to be applied on forward traversal
                 </p></td>
 </tr>
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.iteration.metafunctions.accumulate.expression_semantics"></a><h6>
 <a name="id542066"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.iteration.metafunctions.accumulate.expression_semantics"></a><h6>
+<a name="id755590"></a>
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">result_of::accumulate<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">State</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -127,15 +235,65 @@
             and binary function object or function pointer of type <tt class="computeroutput"><span class="identifier">F</span></tt>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.accumulate.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id542240"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.complexity">Complexity</a>
+=======
+<a name="id793752"></a>
+=======
+<a name="id756309"></a>
+=======
+<a name="id748685"></a>
+=======
+<a name="id770385"></a>
+=======
+<a name="id758980"></a>
+=======
+<a name="id755703"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear, exactly <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> applications of <tt class="computeroutput"><span class="identifier">F</span></tt>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.accumulate.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id542334"></a>
             <a href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.header">Header</a>
+=======
+<a name="id793815"></a>
+=======
+<a name="id756372"></a>
+=======
+<a name="id748748"></a>
+=======
+<a name="id770447"></a>
+=======
+<a name="id759042"></a>
+=======
+<a name="id755765"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">accumulate</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">accumulate</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -143,7 +301,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/fold.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/fold.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/fold.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>fold</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
 <link rel="previous" href="../metafunctions.html" title="Metafunctions">
 <link rel="next" href="accumulate.html" title="accumulate">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.iteration.metafunctions.fold.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id540554"></a>
             <a href="fold.html#fusion.algorithm.iteration.metafunctions.fold.description">Description</a>
+=======
+<a name="id792016"></a>
+=======
+<a name="id754027"></a>
+=======
+<a name="id746403"></a>
+=======
+<a name="id769195"></a>
+=======
+<a name="id757790"></a>
+=======
+<a name="id754513"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the result type of fold.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.fold.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id540601"></a>
             <a href="fold.html#fusion.algorithm.iteration.metafunctions.fold.synopsis">Synopsis</a>
+=======
+<a name="id792045"></a>
+=======
+<a name="id754056"></a>
+=======
+<a name="id746432"></a>
+=======
+<a name="id769224"></a>
+=======
+<a name="id757819"></a>
+=======
+<a name="id754542"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -50,8 +108,33 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id540735"></a><p class="title"><b>Table 1.36. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id792142"></a><p class="title"><b>Table 1.36. Parameters</b></p>
+=======
+<a name="id754153"></a><p class="title"><b>Table 1.40. Parameters</b></p>
+=======
+<a name="id746529"></a><p class="title"><b>Table 1.40. Parameters</b></p>
+=======
+<a name="id769322"></a><p class="title"><b>Table&#160;1.40.&#160;Parameters</b></p>
+=======
+<a name="id757916"></a><p class="title"><b>Table&#160;1.40.&#160;Parameters</b></p>
+=======
+<a name="id754640"></a><p class="title"><b>Table&#160;1.40.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -94,6 +177,7 @@
                 </p></td>
 </tr>
 <tr>
+<<<<<<< .working
 <td><p>
                   <tt class="computeroutput"><span class="identifier">F</span></tt>
                 </p></td>
@@ -103,15 +187,39 @@
                   of type <tt class="computeroutput"><span class="identifier">E</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>, and current state <tt class="computeroutput"><span class="identifier">s</span></tt> of type <tt class="computeroutput"><span class="identifier">S</span></tt>
                 </p></td>
 <td><p>
+=======
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">F</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ <code class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">S</span><span class="special">,</span><span class="identifier">E</span><span class="special">)&gt;::</span><span class="identifier">type</span></code> is the return type of <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span><span class="identifier">e</span><span class="special">)</span></code>
+ for current state <code class="computeroutput"><span class="identifier">s</span></code>
+ of type <code class="computeroutput"><span class="identifier">S</span></code>, and
+ for each element <code class="computeroutput"><span class="identifier">e</span></code>
+ of type <code class="computeroutput"><span class="identifier">E</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+>>>>>>> .merge-right.r57125
                   The operation to be applied on forward traversal
                 </p></td>
 </tr>
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.iteration.metafunctions.fold.expression_semantics"></a><h6>
 <a name="id541084"></a>
             <a href="fold.html#fusion.algorithm.iteration.metafunctions.fold.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.iteration.metafunctions.fold.expression_semantics"></a><h6>
+<a name="id754899"></a>
+ <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">result_of::fold<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">State</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -127,15 +235,65 @@
             and binary function object or function pointer of type <tt class="computeroutput"><span class="identifier">F</span></tt>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.fold.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id541254"></a>
             <a href="fold.html#fusion.algorithm.iteration.metafunctions.fold.complexity">Complexity</a>
+=======
+<a name="id793061"></a>
+=======
+<a name="id755618"></a>
+=======
+<a name="id747994"></a>
+=======
+<a name="id769694"></a>
+=======
+<a name="id758288"></a>
+=======
+<a name="id755012"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear, exactly <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> applications of <tt class="computeroutput"><span class="identifier">F</span></tt>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.fold.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id541349"></a>
             <a href="fold.html#fusion.algorithm.iteration.metafunctions.fold.header">Header</a>
+=======
+<a name="id793121"></a>
+=======
+<a name="id755678"></a>
+=======
+<a name="id748054"></a>
+=======
+<a name="id769754"></a>
+=======
+<a name="id758348"></a>
+=======
+<a name="id755072"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">fold</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">fold</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -143,7 +301,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>for_each</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
 <link rel="previous" href="accumulate.html" title="accumulate">
 <link rel="next" href="../../query.html" title="Query">
@@ -34,12 +42,62 @@
             return type of for_each is always <tt class="computeroutput"><span class="keyword">void</span></tt>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.for_each.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id542575"></a>
             <a href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.description">Description</a>
+=======
+<a name="id793976"></a>
+=======
+<a name="id756533"></a>
+=======
+<a name="id748908"></a>
+=======
+<a name="id770608"></a>
+=======
+<a name="id759203"></a>
+=======
+<a name="id755926"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <a name="fusion.algorithm.iteration.metafunctions.for_each.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id542600"></a>
             <a href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.synopsis">Synopsis</a>
+=======
+<a name="id793994"></a>
+=======
+<a name="id756551"></a>
+=======
+<a name="id748926"></a>
+=======
+<a name="id770626"></a>
+=======
+<a name="id759221"></a>
+=======
+<a name="id755944"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -51,8 +109,33 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id542720"></a><p class="title"><b>Table 1.38. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id794082"></a><p class="title"><b>Table 1.38. Parameters</b></p>
+=======
+<a name="id756639"></a><p class="title"><b>Table 1.42. Parameters</b></p>
+=======
+<a name="id749015"></a><p class="title"><b>Table 1.42. Parameters</b></p>
+=======
+<a name="id770715"></a><p class="title"><b>Table&#160;1.42.&#160;Parameters</b></p>
+=======
+<a name="id759310"></a><p class="title"><b>Table&#160;1.42.&#160;Parameters</b></p>
+=======
+<a name="id756033"></a><p class="title"><b>Table&#160;1.42.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -97,9 +180,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.iteration.metafunctions.for_each.expression_semantics"></a><h6>
 <a name="id542860"></a>
             <a href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.iteration.metafunctions.for_each.expression_semantics"></a><h6>
+<a name="id756147"></a>
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">result_of::for_each<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -115,15 +204,65 @@
             return type is always <tt class="computeroutput"><span class="keyword">void</span></tt>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.for_each.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id543040"></a>
             <a href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.complexity">Complexity</a>
+=======
+<a name="id794310"></a>
+=======
+<a name="id756867"></a>
+=======
+<a name="id749243"></a>
+=======
+<a name="id770943"></a>
+=======
+<a name="id759538"></a>
+=======
+<a name="id756261"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.for_each.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id543069"></a>
             <a href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.header">Header</a>
+=======
+<a name="id794332"></a>
+=======
+<a name="id756889"></a>
+=======
+<a name="id749265"></a>
+=======
+<a name="id770964"></a>
+=======
+<a name="id759559"></a>
+=======
+<a name="id756282"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">for_each</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">for_each</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -131,7 +270,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Query</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../algorithm.html" title="Algorithm">
 <link rel="previous" href="iteration/metafunctions/for_each.html" title="for_each">
@@ -36,10 +40,17 @@
 <p>
         The query algorithms provide support for searching and analyzing sequences.
       </p>
+<<<<<<< .working
 <a name="fusion.algorithm.query.header"></a><h4>
 <a name="id543262"></a>
         <a href="query.html#fusion.algorithm.query.header">Header</a>
       </h4>
+=======
+<a name="fusion.algorithm.query.header"></a><h5>
+<a name="id749399"></a>
+ <a class="link" href="query.html#fusion.algorithm.query.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">query</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../query.html" title="Query">
 <link rel="previous" href="../query.html" title="Query">

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/all.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/all.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/all.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>all</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="any.html" title="any">
 <link rel="next" href="none.html" title="none">
@@ -30,8 +38,33 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.functions.all.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id545520"></a>
             <a href="all.html#fusion.algorithm.query.functions.all.description">Description</a>
+=======
+<a name="id796555"></a>
+=======
+<a name="id758293"></a>
+=======
+<a name="id750669"></a>
+=======
+<a name="id773256"></a>
+=======
+<a name="id761782"></a>
+=======
+<a name="id758506"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="all.html#fusion.algorithm.query.functions.all.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             For a sequence <tt class="computeroutput"><span class="identifier">seq</span></tt> and
@@ -41,8 +74,33 @@
             element of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.query.functions.all.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id353686"></a>
             <a href="all.html#fusion.algorithm.query.functions.all.synopsis">Synopsis</a>
+=======
+<a name="id796608"></a>
+=======
+<a name="id758346"></a>
+=======
+<a name="id750722"></a>
+=======
+<a name="id773309"></a>
+=======
+<a name="id761835"></a>
+=======
+<a name="id758558"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="all.html#fusion.algorithm.query.functions.all.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -52,8 +110,33 @@
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id546380"></a><p class="title"><b>Table 1.40. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id796744"></a><p class="title"><b>Table 1.40. Parameters</b></p>
+=======
+<a name="id758481"></a><p class="title"><b>Table 1.44. Parameters</b></p>
+=======
+<a name="id750857"></a><p class="title"><b>Table 1.44. Parameters</b></p>
+=======
+<a name="id773444"></a><p class="title"><b>Table&#160;1.44.&#160;Parameters</b></p>
+=======
+<a name="id761971"></a><p class="title"><b>Table&#160;1.44.&#160;Parameters</b></p>
+=======
+<a name="id758694"></a><p class="title"><b>Table&#160;1.44.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -100,9 +183,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.functions.all.expression_semantics"></a><h6>
 <a name="id546567"></a>
             <a href="all.html#fusion.algorithm.query.functions.all.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.functions.all.expression_semantics"></a><h6>
+<a name="id758852"></a>
+ <a class="link" href="all.html#fusion.algorithm.query.functions.all.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">all<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
@@ -117,22 +206,97 @@
             element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.query.functions.all.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id546716"></a>
             <a href="all.html#fusion.algorithm.query.functions.all.complexity">Complexity</a>
+=======
+<a name="id797014"></a>
+=======
+<a name="id758751"></a>
+=======
+<a name="id751127"></a>
+=======
+<a name="id773714"></a>
+=======
+<a name="id762241"></a>
+=======
+<a name="id758964"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="all.html#fusion.algorithm.query.functions.all.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.all.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id546786"></a>
             <a href="all.html#fusion.algorithm.query.functions.all.header">Header</a>
+=======
+<a name="id797064"></a>
+=======
+<a name="id758802"></a>
+=======
+<a name="id751178"></a>
+=======
+<a name="id773765"></a>
+=======
+<a name="id762291"></a>
+=======
+<a name="id759014"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="all.html#fusion.algorithm.query.functions.all.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">all</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">all</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.all.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id546934"></a>
             <a href="all.html#fusion.algorithm.query.functions.all.example">Example</a>
+=======
+<a name="id797179"></a>
+=======
+<a name="id758917"></a>
+=======
+<a name="id751293"></a>
+=======
+<a name="id773880"></a>
+=======
+<a name="id762406"></a>
+=======
+<a name="id759130"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="all.html#fusion.algorithm.query.functions.all.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">odd</span>
 <span class="special">{</span>
@@ -149,7 +313,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/any.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/any.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/any.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>any</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="../functions.html" title="Functions">
 <link rel="next" href="all.html" title="all">
@@ -30,8 +38,33 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.functions.any.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id543456"></a>
             <a href="any.html#fusion.algorithm.query.functions.any.description">Description</a>
+=======
+<a name="id794594"></a>
+=======
+<a name="id757151"></a>
+=======
+<a name="id749526"></a>
+=======
+<a name="id771226"></a>
+=======
+<a name="id759821"></a>
+=======
+<a name="id756544"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="any.html#fusion.algorithm.query.functions.any.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             For a sequence <tt class="computeroutput"><span class="identifier">seq</span></tt> and
@@ -41,8 +74,33 @@
             least one element of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.query.functions.any.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id543543"></a>
             <a href="any.html#fusion.algorithm.query.functions.any.synopsis">Synopsis</a>
+=======
+<a name="id794646"></a>
+=======
+<a name="id757203"></a>
+=======
+<a name="id749579"></a>
+=======
+<a name="id771279"></a>
+=======
+<a name="id759874"></a>
+=======
+<a name="id756597"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="any.html#fusion.algorithm.query.functions.any.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -52,8 +110,33 @@
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id543734"></a><p class="title"><b>Table 1.39. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id794782"></a><p class="title"><b>Table 1.39. Parameters</b></p>
+=======
+<a name="id757339"></a><p class="title"><b>Table 1.43. Parameters</b></p>
+=======
+<a name="id749715"></a><p class="title"><b>Table 1.43. Parameters</b></p>
+=======
+<a name="id771414"></a><p class="title"><b>Table&#160;1.43.&#160;Parameters</b></p>
+=======
+<a name="id761102"></a><p class="title"><b>Table&#160;1.43.&#160;Parameters</b></p>
+=======
+<a name="id757825"></a><p class="title"><b>Table&#160;1.43.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -100,9 +183,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.functions.any.expression_semantics"></a><h6>
 <a name="id543934"></a>
             <a href="any.html#fusion.algorithm.query.functions.any.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.functions.any.expression_semantics"></a><h6>
+<a name="id757984"></a>
+ <a class="link" href="any.html#fusion.algorithm.query.functions.any.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             semantics</a>
           </h6>
 <pre class="programlisting">any<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
@@ -117,22 +206,97 @@
             element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.query.functions.any.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id544102"></a>
             <a href="any.html#fusion.algorithm.query.functions.any.complexity">Complexity</a>
+=======
+<a name="id795052"></a>
+=======
+<a name="id757883"></a>
+=======
+<a name="id750258"></a>
+=======
+<a name="id772846"></a>
+=======
+<a name="id761372"></a>
+=======
+<a name="id758095"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="any.html#fusion.algorithm.query.functions.any.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.any.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id544184"></a>
             <a href="any.html#fusion.algorithm.query.functions.any.header">Header</a>
+=======
+<a name="id795102"></a>
+=======
+<a name="id757933"></a>
+=======
+<a name="id750309"></a>
+=======
+<a name="id772896"></a>
+=======
+<a name="id761422"></a>
+=======
+<a name="id758146"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="any.html#fusion.algorithm.query.functions.any.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">any</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">any</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.any.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id544349"></a>
             <a href="any.html#fusion.algorithm.query.functions.any.example">Example</a>
+=======
+<a name="id796310"></a>
+=======
+<a name="id758048"></a>
+=======
+<a name="id750424"></a>
+=======
+<a name="id773011"></a>
+=======
+<a name="id761538"></a>
+=======
+<a name="id758261"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="any.html#fusion.algorithm.query.functions.any.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">odd</span>
 <span class="special">{</span>
@@ -149,7 +313,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>count</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="find_if.html" title="find_if">
 <link rel="next" href="count_if.html" title="count_if">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.functions.count.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id550460"></a>
             <a href="count.html#fusion.algorithm.query.functions.count.description">Description</a>
+=======
+<a name="id801492"></a>
+=======
+<a name="id765424"></a>
+=======
+<a name="id757800"></a>
+=======
+<a name="id780387"></a>
+=======
+<a name="id767958"></a>
+=======
+<a name="id764681"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count.html#fusion.algorithm.query.functions.count.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the number of elements of a given type within a sequence.
           </p>
 <a name="fusion.algorithm.query.functions.count.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id550488"></a>
             <a href="count.html#fusion.algorithm.query.functions.count.synopsis">Synopsis</a>
+=======
+<a name="id801509"></a>
+=======
+<a name="id765441"></a>
+=======
+<a name="id757816"></a>
+=======
+<a name="id780404"></a>
+=======
+<a name="id767974"></a>
+=======
+<a name="id764698"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count.html#fusion.algorithm.query.functions.count.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -48,8 +106,33 @@
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id550689"></a><p class="title"><b>Table 1.44. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id801654"></a><p class="title"><b>Table 1.44. Parameters</b></p>
+=======
+<a name="id765586"></a><p class="title"><b>Table 1.48. Parameters</b></p>
+=======
+<a name="id757962"></a><p class="title"><b>Table 1.48. Parameters</b></p>
+=======
+<a name="id780549"></a><p class="title"><b>Table&#160;1.48.&#160;Parameters</b></p>
+=======
+<a name="id768120"></a><p class="title"><b>Table&#160;1.48.&#160;Parameters</b></p>
+=======
+<a name="id764843"></a><p class="title"><b>Table&#160;1.48.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -97,9 +180,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.functions.count.expression_semantics"></a><h6>
 <a name="id550879"></a>
             <a href="count.html#fusion.algorithm.query.functions.count.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.functions.count.expression_semantics"></a><h6>
+<a name="id764998"></a>
+ <a class="link" href="count.html#fusion.algorithm.query.functions.count.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">count<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
@@ -113,22 +202,97 @@
             <tt class="computeroutput"><span class="identifier">t</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.query.functions.count.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id551015"></a>
             <a href="count.html#fusion.algorithm.query.functions.count.complexity">Complexity</a>
+=======
+<a name="id801902"></a>
+=======
+<a name="id765834"></a>
+=======
+<a name="id758210"></a>
+=======
+<a name="id780797"></a>
+=======
+<a name="id769461"></a>
+=======
+<a name="id766184"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count.html#fusion.algorithm.query.functions.count.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.count.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id551094"></a>
             <a href="count.html#fusion.algorithm.query.functions.count.header">Header</a>
+=======
+<a name="id801953"></a>
+=======
+<a name="id765885"></a>
+=======
+<a name="id758260"></a>
+=======
+<a name="id781940"></a>
+=======
+<a name="id769511"></a>
+=======
+<a name="id766234"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count.html#fusion.algorithm.query.functions.count.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">count</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">count</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.count.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id551257"></a>
             <a href="count.html#fusion.algorithm.query.functions.count.example">Example</a>
+=======
+<a name="id802068"></a>
+=======
+<a name="id766000"></a>
+=======
+<a name="id758376"></a>
+=======
+<a name="id782056"></a>
+=======
+<a name="id769626"></a>
+=======
+<a name="id766350"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count.html#fusion.algorithm.query.functions.count.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1.0</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span>count<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span><span class="number">2</span><span class="special">)</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
@@ -136,7 +300,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count_if.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count_if.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>count_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="count.html" title="count">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
@@ -30,16 +38,66 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.functions.count_if.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id551462"></a>
             <a href="count_if.html#fusion.algorithm.query.functions.count_if.description">Description</a>
+=======
+<a name="id802213"></a>
+=======
+<a name="id766146"></a>
+=======
+<a name="id758521"></a>
+=======
+<a name="id782201"></a>
+=======
+<a name="id769772"></a>
+=======
+<a name="id766495"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the number of elements within a sequence with a type for which
             a given unary function object evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt>.
           </p>
 <a name="fusion.algorithm.query.functions.count_if.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id551502"></a>
             <a href="count_if.html#fusion.algorithm.query.functions.count_if.synopsis">Synopsis</a>
+=======
+<a name="id802237"></a>
+=======
+<a name="id766170"></a>
+=======
+<a name="id758545"></a>
+=======
+<a name="id782225"></a>
+=======
+<a name="id769796"></a>
+=======
+<a name="id766519"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -49,8 +107,33 @@
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id551692"></a><p class="title"><b>Table 1.45. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id804559"></a><p class="title"><b>Table 1.45. Parameters</b></p>
+=======
+<a name="id766306"></a><p class="title"><b>Table 1.49. Parameters</b></p>
+=======
+<a name="id758682"></a><p class="title"><b>Table 1.49. Parameters</b></p>
+=======
+<a name="id782362"></a><p class="title"><b>Table&#160;1.49.&#160;Parameters</b></p>
+=======
+<a name="id769932"></a><p class="title"><b>Table&#160;1.49.&#160;Parameters</b></p>
+=======
+<a name="id766656"></a><p class="title"><b>Table&#160;1.49.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -97,9 +180,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.functions.count_if.expression_semantics"></a><h6>
 <a name="id551887"></a>
             <a href="count_if.html#fusion.algorithm.query.functions.count_if.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.functions.count_if.expression_semantics"></a><h6>
+<a name="id766814"></a>
+ <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">count_if<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">)</span>
@@ -112,22 +201,97 @@
             in <tt class="computeroutput"><span class="identifier">seq</span></tt> where <tt class="computeroutput"><span class="identifier">f</span></tt> evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt>.
           </p>
 <a name="fusion.algorithm.query.functions.count_if.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id552021"></a>
             <a href="count_if.html#fusion.algorithm.query.functions.count_if.complexity">Complexity</a>
+=======
+<a name="id804811"></a>
+=======
+<a name="id766558"></a>
+=======
+<a name="id758934"></a>
+=======
+<a name="id782614"></a>
+=======
+<a name="id770184"></a>
+=======
+<a name="id766908"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.count_if.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id552099"></a>
             <a href="count_if.html#fusion.algorithm.query.functions.count_if.header">Header</a>
+=======
+<a name="id804861"></a>
+=======
+<a name="id766609"></a>
+=======
+<a name="id758985"></a>
+=======
+<a name="id782664"></a>
+=======
+<a name="id770235"></a>
+=======
+<a name="id766958"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">count_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">count_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.count_if.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id552264"></a>
             <a href="count_if.html#fusion.algorithm.query.functions.count_if.example">Example</a>
+=======
+<a name="id804977"></a>
+=======
+<a name="id766724"></a>
+=======
+<a name="id759100"></a>
+=======
+<a name="id782779"></a>
+=======
+<a name="id770350"></a>
+=======
+<a name="id767073"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span>count_if<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span><span class="identifier">odd</span><span class="special">())</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
@@ -135,7 +299,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>find</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="none.html" title="none">
 <link rel="next" href="find_if.html" title="find_if">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.functions.find.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id548407"></a>
             <a href="find.html#fusion.algorithm.query.functions.find.description">Description</a>
+=======
+<a name="id798323"></a>
+=======
+<a name="id763884"></a>
+=======
+<a name="id756260"></a>
+=======
+<a name="id778847"></a>
+=======
+<a name="id766418"></a>
+=======
+<a name="id763141"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find.html#fusion.algorithm.query.functions.find.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Finds the first element of a given type within a sequence.
           </p>
 <a name="fusion.algorithm.query.functions.find.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id548433"></a>
             <a href="find.html#fusion.algorithm.query.functions.find.synopsis">Synopsis</a>
+=======
+<a name="id798340"></a>
+=======
+<a name="id763901"></a>
+=======
+<a name="id756277"></a>
+=======
+<a name="id778864"></a>
+=======
+<a name="id766435"></a>
+=======
+<a name="id763158"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find.html#fusion.algorithm.query.functions.find.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span>
@@ -53,8 +111,33 @@
 <span class="emphasis"><em>unspecified</em></span> <span class="identifier">find</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id548610"></a><p class="title"><b>Table 1.42. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id800124"></a><p class="title"><b>Table 1.42. Parameters</b></p>
+=======
+<a name="id764046"></a><p class="title"><b>Table 1.46. Parameters</b></p>
+=======
+<a name="id756422"></a><p class="title"><b>Table 1.46. Parameters</b></p>
+=======
+<a name="id779009"></a><p class="title"><b>Table&#160;1.46.&#160;Parameters</b></p>
+=======
+<a name="id766580"></a><p class="title"><b>Table&#160;1.46.&#160;Parameters</b></p>
+=======
+<a name="id763303"></a><p class="title"><b>Table&#160;1.46.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -99,9 +182,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.functions.find.expression_semantics"></a><h6>
 <a name="id548742"></a>
             <a href="find.html#fusion.algorithm.query.functions.find.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.functions.find.expression_semantics"></a><h6>
+<a name="id763420"></a>
+ <a class="link" href="find.html#fusion.algorithm.query.functions.find.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">find<span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span>
@@ -117,22 +206,97 @@
             to <tt class="computeroutput">find_if<span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span></tt>
           </p>
 <a name="fusion.algorithm.query.functions.find.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id548963"></a>
             <a href="find.html#fusion.algorithm.query.functions.find.complexity">Complexity</a>
+=======
+<a name="id800408"></a>
+=======
+<a name="id764331"></a>
+=======
+<a name="id756706"></a>
+=======
+<a name="id779294"></a>
+=======
+<a name="id766864"></a>
+=======
+<a name="id763588"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find.html#fusion.algorithm.query.functions.find.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.find.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id549034"></a>
             <a href="find.html#fusion.algorithm.query.functions.find.header">Header</a>
+=======
+<a name="id800459"></a>
+=======
+<a name="id764381"></a>
+=======
+<a name="id756757"></a>
+=======
+<a name="id779344"></a>
+=======
+<a name="id766915"></a>
+=======
+<a name="id763638"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find.html#fusion.algorithm.query.functions.find.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">find</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">find</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.find.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id549182"></a>
             <a href="find.html#fusion.algorithm.query.functions.find.example">Example</a>
+=======
+<a name="id800574"></a>
+=======
+<a name="id764496"></a>
+=======
+<a name="id756872"></a>
+=======
+<a name="id779459"></a>
+=======
+<a name="id767030"></a>
+=======
+<a name="id763753"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find.html#fusion.algorithm.query.functions.find.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="char">'a'</span><span class="special">,</span><span class="char">'0'</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(*</span>find<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <span class="char">'0'</span><span class="special">);</span>
@@ -141,7 +305,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find_if.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find_if.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>find_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="find.html" title="find">
 <link rel="next" href="count.html" title="count">
@@ -35,12 +43,62 @@
             Lambda Expression</a> evaluates to <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>.
           </p>
 <a name="fusion.algorithm.query.functions.find_if.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id549491"></a>
             <a href="find_if.html#fusion.algorithm.query.functions.find_if.description">Description</a>
+=======
+<a name="id800795"></a>
+=======
+<a name="id764717"></a>
+=======
+<a name="id757093"></a>
+=======
+<a name="id779680"></a>
+=======
+<a name="id767251"></a>
+=======
+<a name="id763974"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <a name="fusion.algorithm.query.functions.find_if.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id549513"></a>
             <a href="find_if.html#fusion.algorithm.query.functions.find_if.synopsis">Synopsis</a>
+=======
+<a name="id800808"></a>
+=======
+<a name="id764730"></a>
+=======
+<a name="id757106"></a>
+=======
+<a name="id779693"></a>
+=======
+<a name="id767264"></a>
+=======
+<a name="id763987"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">F</span><span class="special">,</span>
@@ -55,8 +113,33 @@
 <span class="emphasis"><em>unspecified</em></span> <span class="identifier">find_if</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id549709"></a><p class="title"><b>Table 1.43. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id800953"></a><p class="title"><b>Table 1.43. Parameters</b></p>
+=======
+<a name="id764876"></a><p class="title"><b>Table 1.47. Parameters</b></p>
+=======
+<a name="id757251"></a><p class="title"><b>Table 1.47. Parameters</b></p>
+=======
+<a name="id779838"></a><p class="title"><b>Table&#160;1.47.&#160;Parameters</b></p>
+=======
+<a name="id767409"></a><p class="title"><b>Table&#160;1.47.&#160;Parameters</b></p>
+=======
+<a name="id764132"></a><p class="title"><b>Table&#160;1.47.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -102,9 +185,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.functions.find_if.expression_semantics"></a><h6>
 <a name="id549852"></a>
             <a href="find_if.html#fusion.algorithm.query.functions.find_if.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.functions.find_if.expression_semantics"></a><h6>
+<a name="id764254"></a>
+ <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">find_if<span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span>
@@ -121,18 +210,73 @@
             if there is no such element.
           </p>
 <a name="fusion.algorithm.query.functions.find_if.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id550050"></a>
             <a href="find_if.html#fusion.algorithm.query.functions.find_if.complexity">Complexity</a>
+=======
+<a name="id801209"></a>
+=======
+<a name="id765131"></a>
+=======
+<a name="id757507"></a>
+=======
+<a name="id780094"></a>
+=======
+<a name="id767665"></a>
+=======
+<a name="id764388"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
           </p>
-<p>
- /algorithm/query/find_if.hpp&gt;
- </p>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+ include &lt;boost/fusion/algorithm/query/find_if.hpp&gt;
+ </li>
+<li class="listitem">
+ include &lt;boost/fusion/include/find_if.hpp&gt;
+ </li>
+</ol></div>
 <a name="fusion.algorithm.query.functions.find_if.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id550133"></a>
             <a href="find_if.html#fusion.algorithm.query.functions.find_if.example">Example</a>
+=======
+<a name="id801263"></a>
+=======
+<a name="id765195"></a>
+=======
+<a name="id757570"></a>
+=======
+<a name="id780158"></a>
+=======
+<a name="id767728"></a>
+=======
+<a name="id764452"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1.0</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(*</span>find_if<span class="special">&lt;</span><span class="identifier">is_integral</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
@@ -141,7 +285,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/none.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/none.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/none.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>none</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="all.html" title="all">
 <link rel="next" href="find.html" title="find">
@@ -30,8 +38,33 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.functions.none.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id547251"></a>
             <a href="none.html#fusion.algorithm.query.functions.none.description">Description</a>
+=======
+<a name="id797424"></a>
+=======
+<a name="id759162"></a>
+=======
+<a name="id751538"></a>
+=======
+<a name="id774125"></a>
+=======
+<a name="id762651"></a>
+=======
+<a name="id759374"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="none.html#fusion.algorithm.query.functions.none.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             For a sequence <tt class="computeroutput"><span class="identifier">seq</span></tt> and
@@ -41,8 +74,33 @@
             element of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.query.functions.none.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id547326"></a>
             <a href="none.html#fusion.algorithm.query.functions.none.synopsis">Synopsis</a>
+=======
+<a name="id797477"></a>
+=======
+<a name="id759215"></a>
+=======
+<a name="id751590"></a>
+=======
+<a name="id774178"></a>
+=======
+<a name="id762704"></a>
+=======
+<a name="id759427"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="none.html#fusion.algorithm.query.functions.none.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -52,8 +110,33 @@
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id547496"></a><p class="title"><b>Table 1.41. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id797612"></a><p class="title"><b>Table 1.41. Parameters</b></p>
+=======
+<a name="id759350"></a><p class="title"><b>Table 1.45. Parameters</b></p>
+=======
+<a name="id751726"></a><p class="title"><b>Table 1.45. Parameters</b></p>
+=======
+<a name="id774313"></a><p class="title"><b>Table&#160;1.45.&#160;Parameters</b></p>
+=======
+<a name="id762840"></a><p class="title"><b>Table&#160;1.45.&#160;Parameters</b></p>
+=======
+<a name="id759563"></a><p class="title"><b>Table&#160;1.45.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -100,9 +183,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.functions.none.expression_semantics"></a><h6>
 <a name="id547683"></a>
             <a href="none.html#fusion.algorithm.query.functions.none.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.functions.none.expression_semantics"></a><h6>
+<a name="id759721"></a>
+ <a class="link" href="none.html#fusion.algorithm.query.functions.none.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">none<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
@@ -117,22 +206,97 @@
             element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>. Result equivalent to <tt class="computeroutput"><span class="special">!</span><span class="identifier">any</span><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">)</span></tt>.
           </p>
 <a name="fusion.algorithm.query.functions.none.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id547871"></a>
             <a href="none.html#fusion.algorithm.query.functions.none.complexity">Complexity</a>
+=======
+<a name="id797912"></a>
+=======
+<a name="id759650"></a>
+=======
+<a name="id752026"></a>
+=======
+<a name="id774613"></a>
+=======
+<a name="id763140"></a>
+=======
+<a name="id759863"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="none.html#fusion.algorithm.query.functions.none.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.none.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id547942"></a>
             <a href="none.html#fusion.algorithm.query.functions.none.header">Header</a>
+=======
+<a name="id797963"></a>
+=======
+<a name="id759701"></a>
+=======
+<a name="id752076"></a>
+=======
+<a name="id774664"></a>
+=======
+<a name="id763190"></a>
+=======
+<a name="id759913"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="none.html#fusion.algorithm.query.functions.none.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">none</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">none</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.none.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id548090"></a>
             <a href="none.html#fusion.algorithm.query.functions.none.example">Example</a>
+=======
+<a name="id798078"></a>
+=======
+<a name="id759816"></a>
+=======
+<a name="id752192"></a>
+=======
+<a name="id774779"></a>
+=======
+<a name="id766173"></a>
+=======
+<a name="id762896"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="none.html#fusion.algorithm.query.functions.none.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">odd</span>
 <span class="special">{</span>
@@ -149,7 +313,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Metafunctions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../query.html" title="Query">
 <link rel="previous" href="functions/count_if.html" title="count_if">

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/all.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/all.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/all.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>all</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
 <link rel="previous" href="any.html" title="any">
 <link rel="next" href="none.html" title="none">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.metafunctions.all.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id553205"></a>
             <a href="all.html#fusion.algorithm.query.metafunctions.all.description">Description</a>
+=======
+<a name="id805629"></a>
+=======
+<a name="id767377"></a>
+=======
+<a name="id759753"></a>
+=======
+<a name="id783432"></a>
+=======
+<a name="id771003"></a>
+=======
+<a name="id767726"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             A metafunction returning the result type of all.
           </p>
 <a name="fusion.algorithm.query.metafunctions.all.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id553252"></a>
             <a href="all.html#fusion.algorithm.query.metafunctions.all.synopsis">Synopsis</a>
+=======
+<a name="id805657"></a>
+=======
+<a name="id767404"></a>
+=======
+<a name="id759780"></a>
+=======
+<a name="id783460"></a>
+=======
+<a name="id771030"></a>
+=======
+<a name="id767754"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -50,8 +108,33 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id553371"></a><p class="title"><b>Table 1.47. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id805743"></a><p class="title"><b>Table 1.47. Parameters</b></p>
+=======
+<a name="id767491"></a><p class="title"><b>Table 1.51. Parameters</b></p>
+=======
+<a name="id759867"></a><p class="title"><b>Table 1.51. Parameters</b></p>
+=======
+<a name="id783546"></a><p class="title"><b>Table&#160;1.51.&#160;Parameters</b></p>
+=======
+<a name="id771117"></a><p class="title"><b>Table&#160;1.51.&#160;Parameters</b></p>
+=======
+<a name="id767840"></a><p class="title"><b>Table&#160;1.51.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -98,9 +181,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.metafunctions.all.expression_semantics"></a><h6>
 <a name="id553518"></a>
             <a href="all.html#fusion.algorithm.query.metafunctions.all.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.metafunctions.all.expression_semantics"></a><h6>
+<a name="id767961"></a>
+ <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">result_of::all<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -118,15 +207,65 @@
             The return type is always <tt class="computeroutput"><span class="keyword">bool</span></tt>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.all.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id553703"></a>
             <a href="all.html#fusion.algorithm.query.metafunctions.all.complexity">Complexity</a>
+=======
+<a name="id805983"></a>
+=======
+<a name="id767731"></a>
+=======
+<a name="id760107"></a>
+=======
+<a name="id783786"></a>
+=======
+<a name="id771357"></a>
+=======
+<a name="id768080"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.query.metafunctions.all.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id553731"></a>
             <a href="all.html#fusion.algorithm.query.metafunctions.all.header">Header</a>
+=======
+<a name="id806000"></a>
+=======
+<a name="id767748"></a>
+=======
+<a name="id760123"></a>
+=======
+<a name="id783803"></a>
+=======
+<a name="id771374"></a>
+=======
+<a name="id768097"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">all</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">all</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -134,7 +273,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/any.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/any.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/any.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>any</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
 <link rel="previous" href="../metafunctions.html" title="Metafunctions">
 <link rel="next" href="all.html" title="all">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.metafunctions.any.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id552495"></a>
             <a href="any.html#fusion.algorithm.query.metafunctions.any.description">Description</a>
+=======
+<a name="id805133"></a>
+=======
+<a name="id766880"></a>
+=======
+<a name="id759256"></a>
+=======
+<a name="id782935"></a>
+=======
+<a name="id770506"></a>
+=======
+<a name="id767229"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             A metafunction returning the result type of any.
           </p>
 <a name="fusion.algorithm.query.metafunctions.any.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id552542"></a>
             <a href="any.html#fusion.algorithm.query.metafunctions.any.synopsis">Synopsis</a>
+=======
+<a name="id805160"></a>
+=======
+<a name="id766908"></a>
+=======
+<a name="id759283"></a>
+=======
+<a name="id782963"></a>
+=======
+<a name="id770534"></a>
+=======
+<a name="id767257"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -50,8 +108,33 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id552661"></a><p class="title"><b>Table 1.46. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id805247"></a><p class="title"><b>Table 1.46. Parameters</b></p>
+=======
+<a name="id766994"></a><p class="title"><b>Table 1.50. Parameters</b></p>
+=======
+<a name="id759370"></a><p class="title"><b>Table 1.50. Parameters</b></p>
+=======
+<a name="id783049"></a><p class="title"><b>Table&#160;1.50.&#160;Parameters</b></p>
+=======
+<a name="id770620"></a><p class="title"><b>Table&#160;1.50.&#160;Parameters</b></p>
+=======
+<a name="id767343"></a><p class="title"><b>Table&#160;1.50.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -98,9 +181,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.metafunctions.any.expression_semantics"></a><h6>
 <a name="id552810"></a>
             <a href="any.html#fusion.algorithm.query.metafunctions.any.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.metafunctions.any.expression_semantics"></a><h6>
+<a name="id767464"></a>
+ <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">result_of::any<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -118,15 +207,65 @@
             The return type is always <tt class="computeroutput"><span class="keyword">bool</span></tt>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.any.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id552995"></a>
             <a href="any.html#fusion.algorithm.query.metafunctions.any.complexity">Complexity</a>
+=======
+<a name="id805487"></a>
+=======
+<a name="id767234"></a>
+=======
+<a name="id759610"></a>
+=======
+<a name="id783289"></a>
+=======
+<a name="id770860"></a>
+=======
+<a name="id767583"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.query.metafunctions.any.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id553022"></a>
             <a href="any.html#fusion.algorithm.query.metafunctions.any.header">Header</a>
+=======
+<a name="id805503"></a>
+=======
+<a name="id767251"></a>
+=======
+<a name="id759627"></a>
+=======
+<a name="id783306"></a>
+=======
+<a name="id770877"></a>
+=======
+<a name="id767600"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">any</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">any</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -134,7 +273,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>count</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
 <link rel="previous" href="find_if.html" title="find_if">
 <link rel="next" href="count_if.html" title="count_if">
@@ -30,16 +38,66 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.metafunctions.count.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id556161"></a>
             <a href="count.html#fusion.algorithm.query.metafunctions.count.description">Description</a>
+=======
+<a name="id808381"></a>
+=======
+<a name="id770816"></a>
+=======
+<a name="id763192"></a>
+=======
+<a name="id785779"></a>
+=======
+<a name="id773077"></a>
+=======
+<a name="id769800"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             A metafunction that returns the result type of <tt class="computeroutput"><span class="identifier">count</span></tt>
             given the sequence and search types.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id556202"></a>
             <a href="count.html#fusion.algorithm.query.metafunctions.count.synopsis">Synopsis</a>
+=======
+<a name="id808408"></a>
+=======
+<a name="id770843"></a>
+=======
+<a name="id763218"></a>
+=======
+<a name="id785806"></a>
+=======
+<a name="id773103"></a>
+=======
+<a name="id769827"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -51,8 +109,33 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id556320"></a><p class="title"><b>Table 1.51. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id808494"></a><p class="title"><b>Table 1.51. Parameters</b></p>
+=======
+<a name="id770929"></a><p class="title"><b>Table 1.55. Parameters</b></p>
+=======
+<a name="id763305"></a><p class="title"><b>Table 1.55. Parameters</b></p>
+=======
+<a name="id785892"></a><p class="title"><b>Table&#160;1.55.&#160;Parameters</b></p>
+=======
+<a name="id773190"></a><p class="title"><b>Table&#160;1.55.&#160;Parameters</b></p>
+=======
+<a name="id769913"></a><p class="title"><b>Table&#160;1.55.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -97,9 +180,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.metafunctions.count.expression_semantics"></a><h6>
 <a name="id556458"></a>
             <a href="count.html#fusion.algorithm.query.metafunctions.count.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.metafunctions.count.expression_semantics"></a><h6>
+<a name="id770029"></a>
+ <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">result_of::count<span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -113,15 +202,65 @@
             <tt class="computeroutput"><span class="keyword">int</span></tt>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id556600"></a>
             <a href="count.html#fusion.algorithm.query.metafunctions.count.complexity">Complexity</a>
+=======
+<a name="id808702"></a>
+=======
+<a name="id771137"></a>
+=======
+<a name="id763512"></a>
+=======
+<a name="id786100"></a>
+=======
+<a name="id773397"></a>
+=======
+<a name="id770121"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id556627"></a>
             <a href="count.html#fusion.algorithm.query.metafunctions.count.header">Header</a>
+=======
+<a name="id808719"></a>
+=======
+<a name="id771154"></a>
+=======
+<a name="id763529"></a>
+=======
+<a name="id786116"></a>
+=======
+<a name="id773414"></a>
+=======
+<a name="id770137"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">count</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">count</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -129,7 +268,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count_if.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count_if.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>count_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
 <link rel="previous" href="count.html" title="count">
 <link rel="next" href="../../transformation.html" title="Transformation">
@@ -30,16 +38,66 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.metafunctions.count_if.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id556811"></a>
             <a href="count_if.html#fusion.algorithm.query.metafunctions.count_if.description">Description</a>
+=======
+<a name="id808847"></a>
+=======
+<a name="id771282"></a>
+=======
+<a name="id763658"></a>
+=======
+<a name="id786245"></a>
+=======
+<a name="id773543"></a>
+=======
+<a name="id770266"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             A metafunction that returns the result type of <tt class="computeroutput"><span class="identifier">count_if</span></tt>
             given the sequence and predicate types.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count_if.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id556853"></a>
             <a href="count_if.html#fusion.algorithm.query.metafunctions.count_if.synopsis">Synopsis</a>
+=======
+<a name="id808876"></a>
+=======
+<a name="id771311"></a>
+=======
+<a name="id763686"></a>
+=======
+<a name="id786274"></a>
+=======
+<a name="id773571"></a>
+=======
+<a name="id770295"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -51,8 +109,33 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id556972"></a><p class="title"><b>Table 1.52. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id808962"></a><p class="title"><b>Table 1.52. Parameters</b></p>
+=======
+<a name="id771397"></a><p class="title"><b>Table 1.56. Parameters</b></p>
+=======
+<a name="id763773"></a><p class="title"><b>Table 1.56. Parameters</b></p>
+=======
+<a name="id786360"></a><p class="title"><b>Table&#160;1.56.&#160;Parameters</b></p>
+=======
+<a name="id773658"></a><p class="title"><b>Table&#160;1.56.&#160;Parameters</b></p>
+=======
+<a name="id770381"></a><p class="title"><b>Table&#160;1.56.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -97,9 +180,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.metafunctions.count_if.expression_semantics"></a><h6>
 <a name="id557111"></a>
             <a href="count_if.html#fusion.algorithm.query.metafunctions.count_if.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.metafunctions.count_if.expression_semantics"></a><h6>
+<a name="id772954"></a>
+ <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">result_of::count_if<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -113,15 +202,65 @@
             always <tt class="computeroutput"><span class="keyword">int</span></tt>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count_if.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id557263"></a>
             <a href="count_if.html#fusion.algorithm.query.metafunctions.count_if.complexity">Complexity</a>
+=======
+<a name="id809177"></a>
+=======
+<a name="id771612"></a>
+=======
+<a name="id763988"></a>
+=======
+<a name="id787668"></a>
+=======
+<a name="id776331"></a>
+=======
+<a name="id773054"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count_if.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id557290"></a>
             <a href="count_if.html#fusion.algorithm.query.metafunctions.count_if.header">Header</a>
+=======
+<a name="id809196"></a>
+=======
+<a name="id771631"></a>
+=======
+<a name="id764007"></a>
+=======
+<a name="id787687"></a>
+=======
+<a name="id776350"></a>
+=======
+<a name="id773073"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">count_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">count_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -129,7 +268,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>find</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
 <link rel="previous" href="none.html" title="none">
 <link rel="next" href="find_if.html" title="find_if">
@@ -30,16 +38,71 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.metafunctions.find.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id554625"></a>
             <a href="find.html#fusion.algorithm.query.metafunctions.find.description">Description</a>
+=======
+<a name="id806623"></a>
+=======
+<a name="id769736"></a>
+=======
+<a name="id762112"></a>
+=======
+<a name="id784699"></a>
+=======
+<a name="id771997"></a>
+=======
+<a name="id768720"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
+<<<<<<< .working
             Returns the result type of <tt class="computeroutput"><span class="identifier">find</span></tt>,
             given the sequence and search types.
+=======
+ Returns the result type of <a class="link" href="../functions/find.html" title="find"><code class="computeroutput"><span class="identifier">find</span></code></a>, given the sequence and
+ search types.
+>>>>>>> .merge-right.r57242
           </p>
 <a name="fusion.algorithm.query.metafunctions.find.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id554666"></a>
             <a href="find.html#fusion.algorithm.query.metafunctions.find.synopsis">Synopsis</a>
+=======
+<a name="id807331"></a>
+=======
+<a name="id769764"></a>
+=======
+<a name="id762140"></a>
+=======
+<a name="id784727"></a>
+=======
+<a name="id772025"></a>
+=======
+<a name="id768748"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -51,8 +114,33 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id554782"></a><p class="title"><b>Table 1.49. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id807417"></a><p class="title"><b>Table 1.49. Parameters</b></p>
+=======
+<a name="id769849"></a><p class="title"><b>Table 1.53. Parameters</b></p>
+=======
+<a name="id762225"></a><p class="title"><b>Table 1.53. Parameters</b></p>
+=======
+<a name="id784812"></a><p class="title"><b>Table&#160;1.53.&#160;Parameters</b></p>
+=======
+<a name="id772110"></a><p class="title"><b>Table&#160;1.53.&#160;Parameters</b></p>
+=======
+<a name="id768833"></a><p class="title"><b>Table&#160;1.53.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -97,9 +185,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.metafunctions.find.expression_semantics"></a><h6>
 <a name="id554920"></a>
             <a href="find.html#fusion.algorithm.query.metafunctions.find.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.metafunctions.find.expression_semantics"></a><h6>
+<a name="id768949"></a>
+ <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">result_of::find<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -115,15 +209,65 @@
             if there is no such element.
           </p>
 <a name="fusion.algorithm.query.metafunctions.find.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id555121"></a>
             <a href="find.html#fusion.algorithm.query.metafunctions.find.complexity">Complexity</a>
+=======
+<a name="id807665"></a>
+=======
+<a name="id770098"></a>
+=======
+<a name="id762473"></a>
+=======
+<a name="id785060"></a>
+=======
+<a name="id772358"></a>
+=======
+<a name="id769081"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear, at most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
           </p>
 <a name="fusion.algorithm.query.metafunctions.find.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id555202"></a>
             <a href="find.html#fusion.algorithm.query.metafunctions.find.header">Header</a>
+=======
+<a name="id807715"></a>
+=======
+<a name="id770148"></a>
+=======
+<a name="id762524"></a>
+=======
+<a name="id785111"></a>
+=======
+<a name="id772409"></a>
+=======
+<a name="id769132"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">find</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">find</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -131,7 +275,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find_if.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find_if.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>find_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
 <link rel="previous" href="find.html" title="find">
 <link rel="next" href="count.html" title="count">
@@ -30,16 +38,71 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.metafunctions.find_if.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id555388"></a>
             <a href="find_if.html#fusion.algorithm.query.metafunctions.find_if.description">Description</a>
+=======
+<a name="id807844"></a>
+=======
+<a name="id770276"></a>
+=======
+<a name="id762652"></a>
+=======
+<a name="id785239"></a>
+=======
+<a name="id772537"></a>
+=======
+<a name="id769260"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
+<<<<<<< .working
             Returns the result type of <tt class="computeroutput"><span class="identifier">find_if</span></tt>
             given the sequence and predicate types.
+=======
+ Returns the result type of <a class="link" href="../functions/find_if.html" title="find_if"><code class="computeroutput"><span class="identifier">find_if</span></code></a> given the sequence and
+ predicate types.
+>>>>>>> .merge-right.r57242
           </p>
 <a name="fusion.algorithm.query.metafunctions.find_if.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id555430"></a>
             <a href="find_if.html#fusion.algorithm.query.metafunctions.find_if.synopsis">Synopsis</a>
+=======
+<a name="id807871"></a>
+=======
+<a name="id770306"></a>
+=======
+<a name="id762682"></a>
+=======
+<a name="id785269"></a>
+=======
+<a name="id772567"></a>
+=======
+<a name="id769290"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -51,8 +114,33 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id555547"></a><p class="title"><b>Table 1.50. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id807957"></a><p class="title"><b>Table 1.50. Parameters</b></p>
+=======
+<a name="id770392"></a><p class="title"><b>Table 1.54. Parameters</b></p>
+=======
+<a name="id762767"></a><p class="title"><b>Table 1.54. Parameters</b></p>
+=======
+<a name="id785354"></a><p class="title"><b>Table&#160;1.54.&#160;Parameters</b></p>
+=======
+<a name="id772652"></a><p class="title"><b>Table&#160;1.54.&#160;Parameters</b></p>
+=======
+<a name="id769375"></a><p class="title"><b>Table&#160;1.54.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -98,9 +186,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.metafunctions.find_if.expression_semantics"></a><h6>
 <a name="id555695"></a>
             <a href="find_if.html#fusion.algorithm.query.metafunctions.find_if.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.metafunctions.find_if.expression_semantics"></a><h6>
+<a name="id769494"></a>
+ <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">result_of::find_if<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -116,15 +210,65 @@
             to true. Returns <tt class="computeroutput">result_of::end<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></tt> if there is no such element.
           </p>
 <a name="fusion.algorithm.query.metafunctions.find_if.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id555896"></a>
             <a href="find_if.html#fusion.algorithm.query.metafunctions.find_if.complexity">Complexity</a>
+=======
+<a name="id808205"></a>
+=======
+<a name="id770640"></a>
+=======
+<a name="id763016"></a>
+=======
+<a name="id785603"></a>
+=======
+<a name="id772901"></a>
+=======
+<a name="id769624"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
           </p>
 <a name="fusion.algorithm.query.metafunctions.find_if.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id555976"></a>
             <a href="find_if.html#fusion.algorithm.query.metafunctions.find_if.header">Header</a>
+=======
+<a name="id808255"></a>
+=======
+<a name="id770690"></a>
+=======
+<a name="id763066"></a>
+=======
+<a name="id785653"></a>
+=======
+<a name="id772951"></a>
+=======
+<a name="id769674"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">find_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">find_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -132,7 +276,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/none.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/none.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/none.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>none</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
 <link rel="previous" href="all.html" title="all">
 <link rel="next" href="find.html" title="find">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.query.metafunctions.none.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id553914"></a>
             <a href="none.html#fusion.algorithm.query.metafunctions.none.description">Description</a>
+=======
+<a name="id806126"></a>
+=======
+<a name="id767874"></a>
+=======
+<a name="id760249"></a>
+=======
+<a name="id783929"></a>
+=======
+<a name="id771500"></a>
+=======
+<a name="id768223"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             A metafunction returning the result type of none.
           </p>
 <a name="fusion.algorithm.query.metafunctions.none.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id553961"></a>
             <a href="none.html#fusion.algorithm.query.metafunctions.none.synopsis">Synopsis</a>
+=======
+<a name="id806154"></a>
+=======
+<a name="id767901"></a>
+=======
+<a name="id760277"></a>
+=======
+<a name="id783956"></a>
+=======
+<a name="id771527"></a>
+=======
+<a name="id768250"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -50,8 +108,33 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id554080"></a><p class="title"><b>Table 1.48. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id806240"></a><p class="title"><b>Table 1.48. Parameters</b></p>
+=======
+<a name="id767988"></a><p class="title"><b>Table 1.52. Parameters</b></p>
+=======
+<a name="id760363"></a><p class="title"><b>Table 1.52. Parameters</b></p>
+=======
+<a name="id784043"></a><p class="title"><b>Table&#160;1.52.&#160;Parameters</b></p>
+=======
+<a name="id771614"></a><p class="title"><b>Table&#160;1.52.&#160;Parameters</b></p>
+=======
+<a name="id768337"></a><p class="title"><b>Table&#160;1.52.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -98,9 +181,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.query.metafunctions.none.expression_semantics"></a><h6>
 <a name="id554226"></a>
             <a href="none.html#fusion.algorithm.query.metafunctions.none.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.query.metafunctions.none.expression_semantics"></a><h6>
+<a name="id768459"></a>
+ <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">result_of::none<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -118,15 +207,65 @@
             The return type is always <tt class="computeroutput"><span class="keyword">bool</span></tt>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.none.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id554410"></a>
             <a href="none.html#fusion.algorithm.query.metafunctions.none.complexity">Complexity</a>
+=======
+<a name="id806480"></a>
+=======
+<a name="id769594"></a>
+=======
+<a name="id761969"></a>
+=======
+<a name="id784556"></a>
+=======
+<a name="id771854"></a>
+=======
+<a name="id768577"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.query.metafunctions.none.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id554438"></a>
             <a href="none.html#fusion.algorithm.query.metafunctions.none.header">Header</a>
+=======
+<a name="id806497"></a>
+=======
+<a name="id769610"></a>
+=======
+<a name="id761986"></a>
+=======
+<a name="id784573"></a>
+=======
+<a name="id771871"></a>
+=======
+<a name="id768594"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">none</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">none</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -134,7 +273,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Transformation</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../algorithm.html" title="Algorithm">
 <link rel="previous" href="query/metafunctions/count_if.html" title="count_if">
@@ -49,10 +53,17 @@
           the period during which you wish to use the results.
         </p></td></tr>
 </table></div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.header"></a><h4>
 <a name="id557497"></a>
         <a href="transformation.html#fusion.algorithm.transformation.header">Header</a>
       </h4>
+=======
+<a name="fusion.algorithm.transformation.header"></a><h5>
+<a name="id764147"></a>
+ <a class="link" href="transformation.html#fusion.algorithm.transformation.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../transformation.html" title="Transformation">
 <link rel="previous" href="../transformation.html" title="Transformation">

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/clear.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/clear.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/clear.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>clear</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="reverse.html" title="reverse">
 <link rel="next" href="erase.html" title="erase">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.clear.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id566884"></a>
             <a href="clear.html#fusion.algorithm.transformation.functions.clear.description">Description</a>
+=======
+<a name="id819010"></a>
+=======
+<a name="id780833"></a>
+=======
+<a name="id773209"></a>
+=======
+<a name="id796849"></a>
+=======
+<a name="id785512"></a>
+=======
+<a name="id782235"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             <a href="clear.html" title="clear"><tt class="computeroutput"><span class="identifier">clear</span></tt></a> returns an empty sequence.
           </p>
 <a name="fusion.algorithm.transformation.functions.clear.synposis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id566931"></a>
             <a href="clear.html#fusion.algorithm.transformation.functions.clear.synposis">Synposis</a>
+=======
+<a name="id819042"></a>
+=======
+<a name="id780864"></a>
+=======
+<a name="id773240"></a>
+=======
+<a name="id796880"></a>
+=======
+<a name="id785543"></a>
+=======
+<a name="id782266"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.synposis">Synposis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -46,8 +104,33 @@
 <span class="keyword">typename</span> result_of::clear<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">clear</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id567084"></a><p class="title"><b>Table 1.62. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id819218"></a><p class="title"><b>Table 1.62. Parameters</b></p>
+=======
+<a name="id780972"></a><p class="title"><b>Table 1.66. Parameters</b></p>
+=======
+<a name="id773348"></a><p class="title"><b>Table 1.66. Parameters</b></p>
+=======
+<a name="id796988"></a><p class="title"><b>Table&#160;1.66.&#160;Parameters</b></p>
+=======
+<a name="id785651"></a><p class="title"><b>Table&#160;1.66.&#160;Parameters</b></p>
+=======
+<a name="id782374"></a><p class="title"><b>Table&#160;1.66.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -79,9 +162,15 @@
 </tr></tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.clear.expression_semantics"></a><h6>
 <a name="id567188"></a>
             <a href="clear.html#fusion.algorithm.transformation.functions.clear.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.clear.expression_semantics"></a><h6>
+<a name="id782457"></a>
+ <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">clear<span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -96,29 +185,104 @@
             with no elements.
           </p>
 <a name="fusion.algorithm.transformation.functions.clear.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id567282"></a>
             <a href="clear.html#fusion.algorithm.transformation.functions.clear.complexity">Complexity</a>
+=======
+<a name="id819364"></a>
+=======
+<a name="id781117"></a>
+=======
+<a name="id773493"></a>
+=======
+<a name="id797133"></a>
+=======
+<a name="id785796"></a>
+=======
+<a name="id782519"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.functions.clear.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id567311"></a>
             <a href="clear.html#fusion.algorithm.transformation.functions.clear.header">Header</a>
+=======
+<a name="id819383"></a>
+=======
+<a name="id781136"></a>
+=======
+<a name="id773512"></a>
+=======
+<a name="id797152"></a>
+=======
+<a name="id785815"></a>
+=======
+<a name="id782538"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">clear</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">clear</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.clear.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id567478"></a>
             <a href="clear.html#fusion.algorithm.transformation.functions.clear.example">Example</a>
+=======
+<a name="id819498"></a>
+=======
+<a name="id781252"></a>
+=======
+<a name="id773627"></a>
+=======
+<a name="id797267"></a>
+=======
+<a name="id785930"></a>
+=======
+<a name="id782654"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>clear<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> make_vector<span class="special">());</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>erase</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="clear.html" title="clear">
 <link rel="next" href="erase_key.html" title="erase_key">
@@ -30,16 +38,66 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.erase.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id567635"></a>
             <a href="erase.html#fusion.algorithm.transformation.functions.erase.description">Description</a>
+=======
+<a name="id819600"></a>
+=======
+<a name="id781354"></a>
+=======
+<a name="id773729"></a>
+=======
+<a name="id797369"></a>
+=======
+<a name="id786032"></a>
+=======
+<a name="id782756"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence, containing all the elements of the original except
             those at a specified iterator, or between two iterators.
           </p>
 <a name="fusion.algorithm.transformation.functions.erase.synposis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id567666"></a>
             <a href="erase.html#fusion.algorithm.transformation.functions.erase.synposis">Synposis</a>
+=======
+<a name="id819622"></a>
+=======
+<a name="id781375"></a>
+=======
+<a name="id773751"></a>
+=======
+<a name="id797391"></a>
+=======
+<a name="id786054"></a>
+=======
+<a name="id782777"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.synposis">Synposis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -57,8 +115,33 @@
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">First</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">it1</span><span class="special">,</span> <span class="identifier">Last</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">it2</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id568124"></a><p class="title"><b>Table 1.63. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id819954"></a><p class="title"><b>Table 1.63. Parameters</b></p>
+=======
+<a name="id781708"></a><p class="title"><b>Table 1.67. Parameters</b></p>
+=======
+<a name="id774083"></a><p class="title"><b>Table 1.67. Parameters</b></p>
+=======
+<a name="id797723"></a><p class="title"><b>Table&#160;1.67.&#160;Parameters</b></p>
+=======
+<a name="id786386"></a><p class="title"><b>Table&#160;1.67.&#160;Parameters</b></p>
+=======
+<a name="id783110"></a><p class="title"><b>Table&#160;1.67.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -119,18 +202,40 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.erase.expression_semantics"></a><h6>
 <a name="id568351"></a>
             <a href="erase.html#fusion.algorithm.transformation.functions.erase.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.erase.expression_semantics"></a><h6>
+<a name="id783284"></a>
+ <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">erase<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">pos</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ implements the <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
             all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>
@@ -139,32 +244,123 @@
 <pre class="programlisting">erase<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">last</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ implements the <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a new sequence, with
             all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
             in their original order, except those in the range [<tt class="computeroutput"><span class="identifier">first</span></tt>,<tt class="computeroutput"><span class="identifier">last</span></tt>).
           </p>
 <a name="fusion.algorithm.transformation.functions.erase.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id568605"></a>
             <a href="erase.html#fusion.algorithm.transformation.functions.erase.complexity">Complexity</a>
+=======
+<a name="id820297"></a>
+=======
+<a name="id782106"></a>
+=======
+<a name="id774482"></a>
+=======
+<a name="id798122"></a>
+=======
+<a name="id786785"></a>
+=======
+<a name="id783508"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.erase.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id568633"></a>
             <a href="erase.html#fusion.algorithm.transformation.functions.erase.header">Header</a>
+=======
+<a name="id820316"></a>
+=======
+<a name="id782125"></a>
+=======
+<a name="id774501"></a>
+=======
+<a name="id798141"></a>
+=======
+<a name="id786804"></a>
+=======
+<a name="id783527"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">erase</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">erase</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.erase.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id568800"></a>
             <a href="erase.html#fusion.algorithm.transformation.functions.erase.example">Example</a>
+=======
+<a name="id820432"></a>
+=======
+<a name="id782240"></a>
+=======
+<a name="id774616"></a>
+=======
+<a name="id798256"></a>
+=======
+<a name="id786919"></a>
+=======
+<a name="id783642"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">double</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2.0</span><span class="special">,</span> <span class="char">'c'</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span>erase<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">vec</span><span class="special">)))</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'c'</span><span class="special">));<
/span>
@@ -173,7 +369,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase_key.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase_key.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>erase_key</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="erase.html" title="erase">
 <link rel="next" href="insert.html" title="insert">
@@ -30,10 +38,36 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.erase_key.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id569251"></a>
             <a href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.description">Description</a>
+=======
+<a name="id820735"></a>
+=======
+<a name="id782544"></a>
+=======
+<a name="id774920"></a>
+=======
+<a name="id798629"></a>
+=======
+<a name="id787292"></a>
+=======
+<a name="id784015"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
+<<<<<<< .working
             For an <a href="../../../sequence/concepts/associative_sequence.html" title="Associative
         Sequence">Associative
             Sequence</a> <tt class="computeroutput"><span class="identifier">seq</span></tt>,
@@ -41,20 +75,78 @@
         Sequence">Forward
             Sequence</a> containing all the elements of the original except those
             with a given key.
+=======
+ For an <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">associative</a>]
+ <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
+ <code class="computeroutput"><span class="identifier">seq</span></code>, returns a <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">associative</a>]
+ <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
+ containing all the elements of the original except those with a given
+ key.
+>>>>>>> .merge-right.r57242
           </p>
 <a name="fusion.algorithm.transformation.functions.erase_key.synposis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id569311"></a>
             <a href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.synposis">Synposis</a>
+=======
+<a name="id820774"></a>
+=======
+<a name="id782592"></a>
+=======
+<a name="id774968"></a>
+=======
+<a name="id798677"></a>
+=======
+<a name="id787340"></a>
+=======
+<a name="id784063"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.synposis">Synposis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Key</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">erase_key</span><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">erase_key</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/erase_key.html" title="erase_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">erase_key</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">erase_key</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id569481"></a><p class="title"><b>Table 1.64. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id820898"></a><p class="title"><b>Table 1.64. Parameters</b></p>
+=======
+<a name="id783814"></a><p class="title"><b>Table 1.68. Parameters</b></p>
+=======
+<a name="id776190"></a><p class="title"><b>Table 1.68. Parameters</b></p>
+=======
+<a name="id798806"></a><p class="title"><b>Table&#160;1.68.&#160;Parameters</b></p>
+=======
+<a name="id787469"></a><p class="title"><b>Table&#160;1.68.&#160;Parameters</b></p>
+=======
+<a name="id784192"></a><p class="title"><b>Table&#160;1.68.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -73,12 +165,24 @@
 </tr></thead>
 <tbody>
 <tr>
+<<<<<<< .working
 <td><p>
                   <tt class="computeroutput"><span class="identifier">seq</span></tt>
                 </p></td>
 <td><p>
                   A model of <a href="../../../sequence/concepts/associative_sequence.html" title="Associative
         Sequence">Associative
+=======
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">seq</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a> and <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+>>>>>>> .merge-right.r57242
                   Sequence</a>
                 </p></td>
 <td><p>
@@ -99,9 +203,15 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.erase_key.expression_semantics"></a><h6>
 <a name="id569620"></a>
             <a href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.erase_key.expression_semantics"></a><h6>
+<a name="id784310"></a>
+ <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">erase_key<span class="special">&lt;</span><span class="identifier">Key</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -109,6 +219,7 @@
 <p>
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
+ Sequence</a> and <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
             Sequence</a>.
           </p>
 <p>
@@ -117,29 +228,104 @@
             except those with key <tt class="computeroutput"><span class="identifier">Key</span></tt>.
           </p>
 <a name="fusion.algorithm.transformation.functions.erase_key.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id569749"></a>
             <a href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.complexity">Complexity</a>
+=======
+<a name="id821094"></a>
+=======
+<a name="id784020"></a>
+=======
+<a name="id776395"></a>
+=======
+<a name="id799011"></a>
+=======
+<a name="id787674"></a>
+=======
+<a name="id784398"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.erase_key.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id569777"></a>
             <a href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.header">Header</a>
+=======
+<a name="id821116"></a>
+=======
+<a name="id784041"></a>
+=======
+<a name="id776417"></a>
+=======
+<a name="id799033"></a>
+=======
+<a name="id787696"></a>
+=======
+<a name="id784419"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">erase_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">erase_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.erase_key.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id569944"></a>
             <a href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.example">Example</a>
+=======
+<a name="id821236"></a>
+=======
+<a name="id784161"></a>
+=======
+<a name="id776537"></a>
+=======
+<a name="id799153"></a>
+=======
+<a name="id787816"></a>
+=======
+<a name="id784539"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>erase_key<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span>make_map<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">long</span><span class="special">&gt;(</span><span class="char">'a'</span><span class="special">,</span> <span class="char">'b'</span><span class="special">))</span> <span class="special">==</span> make_map<span class="special">&lt;</span><span class="keyword">long</span><span class
="special">&gt;(</span><span class="char">'b'</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>filter</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="../functions.html" title="Functions">
 <link rel="next" href="filter_if.html" title="filter_if">
@@ -30,16 +38,66 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.filter.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id557690"></a>
             <a href="filter.html#fusion.algorithm.transformation.functions.filter.description">Description</a>
+=======
+<a name="id809465"></a>
+=======
+<a name="id771900"></a>
+=======
+<a name="id764276"></a>
+=======
+<a name="id787956"></a>
+=======
+<a name="id776619"></a>
+=======
+<a name="id773342"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             For a given sequence, filter returns a new sequences containing only
             the elements of a specified type.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id557721"></a>
             <a href="filter.html#fusion.algorithm.transformation.functions.filter.synopsis">Synopsis</a>
+=======
+<a name="id809487"></a>
+=======
+<a name="id771922"></a>
+=======
+<a name="id764298"></a>
+=======
+<a name="id787977"></a>
+=======
+<a name="id776640"></a>
+=======
+<a name="id773364"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span>
@@ -48,8 +106,33 @@
 <span class="keyword">typename</span> result_of::filter<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">filter</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id557902"></a><p class="title"><b>Table 1.53. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id811255"></a><p class="title"><b>Table 1.53. Parameters</b></p>
+=======
+<a name="id772052"></a><p class="title"><b>Table 1.57. Parameters</b></p>
+=======
+<a name="id764427"></a><p class="title"><b>Table 1.57. Parameters</b></p>
+=======
+<a name="id788107"></a><p class="title"><b>Table&#160;1.57.&#160;Parameters</b></p>
+=======
+<a name="id776770"></a><p class="title"><b>Table&#160;1.57.&#160;Parameters</b></p>
+=======
+<a name="id773493"></a><p class="title"><b>Table&#160;1.57.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -94,18 +177,40 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.filter.expression_semantics"></a><h6>
 <a name="id558039"></a>
             <a href="filter.html#fusion.algorithm.transformation.functions.filter.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.filter.expression_semantics"></a><h6>
+<a name="id773606"></a>
+ <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">filter<span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ implements the <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
             all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>
@@ -113,22 +218,97 @@
             to <tt class="computeroutput">filter_if<span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">same_type</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span></tt>.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id558250"></a>
             <a href="filter.html#fusion.algorithm.transformation.functions.filter.complexity">Complexity</a>
+=======
+<a name="id811508"></a>
+=======
+<a name="id772332"></a>
+=======
+<a name="id764708"></a>
+=======
+<a name="id788388"></a>
+=======
+<a name="id777051"></a>
+=======
+<a name="id773774"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id558280"></a>
             <a href="filter.html#fusion.algorithm.transformation.functions.filter.header">Header</a>
+=======
+<a name="id811528"></a>
+=======
+<a name="id772352"></a>
+=======
+<a name="id764727"></a>
+=======
+<a name="id788407"></a>
+=======
+<a name="id777070"></a>
+=======
+<a name="id773793"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">filter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">filter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.filter.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id558447"></a>
             <a href="filter.html#fusion.algorithm.transformation.functions.filter.example">Example</a>
+=======
+<a name="id811645"></a>
+=======
+<a name="id772469"></a>
+=======
+<a name="id764845"></a>
+=======
+<a name="id788524"></a>
+=======
+<a name="id777188"></a>
+=======
+<a name="id773911"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">long</span><span class="special">,</span><span class="keyword">long</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span>filter<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
@@ -136,7 +316,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter_if.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter_if.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>filter_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="filter.html" title="filter">
 <link rel="next" href="transform.html" title="transform">
@@ -30,8 +38,33 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.filter_if.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id558709"></a>
             <a href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.description">Description</a>
+=======
+<a name="id811829"></a>
+=======
+<a name="id772653"></a>
+=======
+<a name="id765029"></a>
+=======
+<a name="id788708"></a>
+=======
+<a name="id777371"></a>
+=======
+<a name="id774094"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             For a given sequence, filter_if returns a new sequences
@@ -39,8 +72,33 @@
             Lambda Expression</a> evaluates to <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter_if.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id558796"></a>
             <a href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.synopsis">Synopsis</a>
+=======
+<a name="id811886"></a>
+=======
+<a name="id772710"></a>
+=======
+<a name="id765086"></a>
+=======
+<a name="id788766"></a>
+=======
+<a name="id777429"></a>
+=======
+<a name="id774152"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Pred</span><span class="special">,</span>
@@ -49,8 +107,33 @@
 <span class="keyword">typename</span> result_of::filter_if<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">filter_if</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id558979"></a><p class="title"><b>Table 1.54. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id812016"></a><p class="title"><b>Table 1.54. Parameters</b></p>
+=======
+<a name="id772840"></a><p class="title"><b>Table 1.58. Parameters</b></p>
+=======
+<a name="id765216"></a><p class="title"><b>Table 1.58. Parameters</b></p>
+=======
+<a name="id788895"></a><p class="title"><b>Table&#160;1.58.&#160;Parameters</b></p>
+=======
+<a name="id777558"></a><p class="title"><b>Table&#160;1.58.&#160;Parameters</b></p>
+=======
+<a name="id774282"></a><p class="title"><b>Table&#160;1.58.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -96,18 +179,40 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.filter_if.expression_semantics"></a><h6>
 <a name="id559127"></a>
             <a href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.filter_if.expression_semantics"></a><h6>
+<a name="id774400"></a>
+ <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">filter_if<span class="special">&lt;</span><span class="identifier">Pred</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ implements the <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
             all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>
@@ -116,22 +221,97 @@
             is the same as in the original sequence.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter_if.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id559288"></a>
             <a href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.complexity">Complexity</a>
+=======
+<a name="id812239"></a>
+=======
+<a name="id773091"></a>
+=======
+<a name="id765467"></a>
+=======
+<a name="id789146"></a>
+=======
+<a name="id777809"></a>
+=======
+<a name="id774532"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter_if.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id559316"></a>
             <a href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.header">Header</a>
+=======
+<a name="id812261"></a>
+=======
+<a name="id773112"></a>
+=======
+<a name="id765488"></a>
+=======
+<a name="id789168"></a>
+=======
+<a name="id777831"></a>
+=======
+<a name="id774554"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">filter_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">filter_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.filter_if.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id559484"></a>
             <a href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.example">Example</a>
+=======
+<a name="id812381"></a>
+=======
+<a name="id773232"></a>
+=======
+<a name="id765608"></a>
+=======
+<a name="id789288"></a>
+=======
+<a name="id777951"></a>
+=======
+<a name="id774674"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3.0</span><span class="special">,</span><span class="number">4.0</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span>filter_if<span class="special">&lt;</span><span class="identifier">is_integral</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
@@ -139,7 +319,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>insert</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="erase_key.html" title="erase_key">
 <link rel="next" href="insert_range.html" title="insert_range">
@@ -30,27 +38,103 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.insert.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id570144"></a>
             <a href="insert.html#fusion.algorithm.transformation.functions.insert.description">Description</a>
+=======
+<a name="id822464"></a>
+=======
+<a name="id784297"></a>
+=======
+<a name="id776673"></a>
+=======
+<a name="id799289"></a>
+=======
+<a name="id787952"></a>
+=======
+<a name="id784675"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence with all the elements of the original, an a new
             element inserted the position described by a given iterator.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert.synposis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id570175"></a>
             <a href="insert.html#fusion.algorithm.transformation.functions.insert.synposis">Synposis</a>
+=======
+<a name="id822486"></a>
+=======
+<a name="id784318"></a>
+=======
+<a name="id776694"></a>
+=======
+<a name="id799310"></a>
+=======
+<a name="id787973"></a>
+=======
+<a name="id784696"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.synposis">Synposis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">Pos</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">T</span>
     <span class="special">&gt;</span>
-<span class="emphasis"><em>unspecified</em></span> <span class="identifier">insert</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">Pos</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">pos</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/insert.html" title="insert"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">insert</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Pos</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">insert</span><span class="special">(</span>
+ <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">Pos</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">pos</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id570363"></a><p class="title"><b>Table 1.65. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id822626"></a><p class="title"><b>Table 1.65. Parameters</b></p>
+=======
+<a name="id784514"></a><p class="title"><b>Table 1.69. Parameters</b></p>
+=======
+<a name="id776890"></a><p class="title"><b>Table 1.69. Parameters</b></p>
+=======
+<a name="id799506"></a><p class="title"><b>Table&#160;1.69.&#160;Parameters</b></p>
+=======
+<a name="id788169"></a><p class="title"><b>Table&#160;1.69.&#160;Parameters</b></p>
+=======
+<a name="id784892"></a><p class="title"><b>Table&#160;1.69.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -108,18 +192,40 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.insert.expression_semantics"></a><h6>
 <a name="id570546"></a>
             <a href="insert.html#fusion.algorithm.transformation.functions.insert.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.insert.expression_semantics"></a><h6>
+<a name="id785041"></a>
+ <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">insert<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">p</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ implements the <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
             all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
@@ -128,22 +234,97 @@
             <tt class="computeroutput"><span class="identifier">pos</span></tt>.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id570697"></a>
             <a href="insert.html#fusion.algorithm.transformation.functions.insert.complexity">Complexity</a>
+=======
+<a name="id822874"></a>
+=======
+<a name="id784790"></a>
+=======
+<a name="id777166"></a>
+=======
+<a name="id799782"></a>
+=======
+<a name="id788445"></a>
+=======
+<a name="id785168"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id570726"></a>
             <a href="insert.html#fusion.algorithm.transformation.functions.insert.header">Header</a>
+=======
+<a name="id822894"></a>
+=======
+<a name="id784809"></a>
+=======
+<a name="id777185"></a>
+=======
+<a name="id799801"></a>
+=======
+<a name="id788464"></a>
+=======
+<a name="id785187"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">insert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">insert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.insert.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id570892"></a>
             <a href="insert.html#fusion.algorithm.transformation.functions.insert.example">Example</a>
+=======
+<a name="id823011"></a>
+=======
+<a name="id784927"></a>
+=======
+<a name="id777303"></a>
+=======
+<a name="id799919"></a>
+=======
+<a name="id788582"></a>
+=======
+<a name="id785305"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span>insert<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">vec</span><span class="special">)),</span> <span class="number">3</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,
</span><span class="number">3</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
@@ -151,7 +332,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert_range.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert_range.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert_range.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>insert_range</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="insert.html" title="insert">
 <link rel="next" href="join.html" title="join">
@@ -30,16 +38,66 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.insert_range.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id571178"></a>
             <a href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.description">Description</a>
+=======
+<a name="id823204"></a>
+=======
+<a name="id785120"></a>
+=======
+<a name="id777496"></a>
+=======
+<a name="id800112"></a>
+=======
+<a name="id788775"></a>
+=======
+<a name="id785498"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence with another sequence inserted at a specified
             iterator.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert_range.synposis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id571208"></a>
             <a href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.synposis">Synposis</a>
+=======
+<a name="id823224"></a>
+=======
+<a name="id785139"></a>
+=======
+<a name="id777515"></a>
+=======
+<a name="id800131"></a>
+=======
+<a name="id788794"></a>
+=======
+<a name="id785517"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.synposis">Synposis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -50,8 +108,33 @@
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">Pos</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">pos</span><span class="special">,</span> <span class="identifier">Range</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">range</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id571477"></a><p class="title"><b>Table 1.66. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id823422"></a><p class="title"><b>Table 1.66. Parameters</b></p>
+=======
+<a name="id785337"></a><p class="title"><b>Table 1.70. Parameters</b></p>
+=======
+<a name="id777713"></a><p class="title"><b>Table 1.70. Parameters</b></p>
+=======
+<a name="id800329"></a><p class="title"><b>Table&#160;1.70.&#160;Parameters</b></p>
+=======
+<a name="id788992"></a><p class="title"><b>Table&#160;1.70.&#160;Parameters</b></p>
+=======
+<a name="id785715"></a><p class="title"><b>Table&#160;1.70.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -111,18 +194,40 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.insert_range.expression_semantics"></a><h6>
 <a name="id571670"></a>
             <a href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.insert_range.expression_semantics"></a><h6>
+<a name="id785869"></a>
+ <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">insert<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">pos</span><span class="special">,</span> <span class="identifier">range</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ implements the <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
             all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
@@ -131,22 +236,97 @@
             All elements retaining their ordering from the orignal sequences.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert_range.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id571824"></a>
             <a href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.complexity">Complexity</a>
+=======
+<a name="id823672"></a>
+=======
+<a name="id785616"></a>
+=======
+<a name="id777991"></a>
+=======
+<a name="id800607"></a>
+=======
+<a name="id789270"></a>
+=======
+<a name="id785994"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert_range.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id571852"></a>
             <a href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.header">Header</a>
+=======
+<a name="id823692"></a>
+=======
+<a name="id785635"></a>
+=======
+<a name="id778011"></a>
+=======
+<a name="id800627"></a>
+=======
+<a name="id789290"></a>
+=======
+<a name="id786013"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">insert_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">insert_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.insert_range.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id572019"></a>
             <a href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.example">Example</a>
+=======
+<a name="id823812"></a>
+=======
+<a name="id785755"></a>
+=======
+<a name="id778131"></a>
+=======
+<a name="id800747"></a>
+=======
+<a name="id790502"></a>
+=======
+<a name="id787226"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span>insert_range<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">vec</span><span class="special">)),</span> make_vector<span class="special">(</span><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">))</span> <span
class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
@@ -154,7 +334,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/join.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/join.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/join.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>join</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="insert_range.html" title="insert_range">
 <link rel="next" href="zip.html" title="zip">
@@ -30,16 +38,66 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.join.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id572345"></a>
             <a href="join.html#fusion.algorithm.transformation.functions.join.description">Description</a>
+=======
+<a name="id824034"></a>
+=======
+<a name="id785977"></a>
+=======
+<a name="id778626"></a>
+=======
+<a name="id802334"></a>
+=======
+<a name="id790724"></a>
+=======
+<a name="id787448"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Takes 2 sequences and returns a sequence containing the elements of the
             first followed by the elements of the second.
           </p>
 <a name="fusion.algorithm.transformation.functions.join.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id572375"></a>
             <a href="join.html#fusion.algorithm.transformation.functions.join.synopsis">Synopsis</a>
+=======
+<a name="id824053"></a>
+=======
+<a name="id786270"></a>
+=======
+<a name="id778645"></a>
+=======
+<a name="id802354"></a>
+=======
+<a name="id790744"></a>
+=======
+<a name="id787467"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">LhSequence</span><span class="special">,</span>
@@ -47,8 +105,33 @@
 <span class="keyword">typename</span> result_of::join<span class="special">&lt;</span><span class="identifier">LhSequence</span><span class="special">,</span> <span class="identifier">RhSequence</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">join</span><span class="special">(</span><span class="identifier">LhSequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> <span class="identifier">RhSequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id572579"></a><p class="title"><b>Table 1.67. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id824196"></a><p class="title"><b>Table 1.67. Parameters</b></p>
+=======
+<a name="id786412"></a><p class="title"><b>Table 1.71. Parameters</b></p>
+=======
+<a name="id778788"></a><p class="title"><b>Table 1.71. Parameters</b></p>
+=======
+<a name="id802496"></a><p class="title"><b>Table&#160;1.71.&#160;Parameters</b></p>
+=======
+<a name="id790886"></a><p class="title"><b>Table&#160;1.71.&#160;Parameters</b></p>
+=======
+<a name="id787610"></a><p class="title"><b>Table&#160;1.71.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -95,41 +178,139 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.join.expression_semantics"></a><h6>
 <a name="id572726"></a>
             <a href="join.html#fusion.algorithm.transformation.functions.join.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.join.expression_semantics"></a><h6>
+<a name="id787728"></a>
+ <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">join<span class="special">(</span><span class="identifier">lhs</span><span class="special">,</span> <span class="identifier">rhs</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">lhs</span></code>
+ and <code class="computeroutput"><span class="identifier">rhs</span></code> implement the
+ <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
             all the elements of <tt class="computeroutput"><span class="identifier">lhs</span></tt>
             followed by all the elements of <tt class="computeroutput"><span class="identifier">rhs</span></tt>.
- The order of th elements is preserved.
+ The order of the elements is preserved.
           </p>
 <a name="fusion.algorithm.transformation.functions.join.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id572854"></a>
             <a href="join.html#fusion.algorithm.transformation.functions.join.complexity">Complexity</a>
+=======
+<a name="id824400"></a>
+=======
+<a name="id786650"></a>
+=======
+<a name="id779026"></a>
+=======
+<a name="id802734"></a>
+=======
+<a name="id791124"></a>
+=======
+<a name="id787847"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.join.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id572884"></a>
             <a href="join.html#fusion.algorithm.transformation.functions.join.header">Header</a>
+=======
+<a name="id824419"></a>
+=======
+<a name="id786669"></a>
+=======
+<a name="id779045"></a>
+=======
+<a name="id802753"></a>
+=======
+<a name="id791143"></a>
+=======
+<a name="id787866"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">join</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">join</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.join.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id573050"></a>
             <a href="join.html#fusion.algorithm.transformation.functions.join.example">Example</a>
+=======
+<a name="id824534"></a>
+=======
+<a name="id786784"></a>
+=======
+<a name="id779160"></a>
+=======
+<a name="id802868"></a>
+=======
+<a name="id791258"></a>
+=======
+<a name="id787982"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
 <a href="../../../container/vector.html" title="vector"><tt class="computeroutput"><span class="identifier">vector</span></tt></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="char">'b'</span><span class="special">);</span>
@@ -138,7 +319,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_back.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_back.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>pop_back</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="zip.html" title="zip">
 <link rel="next" href="pop_front.html" title="pop_front">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.pop_back.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id574644"></a>
             <a href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.description">Description</a>
+=======
+<a name="id826744"></a>
+=======
+<a name="id787902"></a>
+=======
+<a name="id780277"></a>
+=======
+<a name="id803986"></a>
+=======
+<a name="id792376"></a>
+=======
+<a name="id789099"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence, with the last element of the original removed.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_back.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id574674"></a>
             <a href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.synopsis">Synopsis</a>
+=======
+<a name="id826766"></a>
+=======
+<a name="id787923"></a>
+=======
+<a name="id780299"></a>
+=======
+<a name="id804007"></a>
+=======
+<a name="id792397"></a>
+=======
+<a name="id789120"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -46,8 +104,33 @@
 <span class="keyword">typename</span> result_of::pop_back<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">pop_back</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id574828"></a><p class="title"><b>Table 1.69. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id826874"></a><p class="title"><b>Table 1.69. Parameters</b></p>
+=======
+<a name="id788031"></a><p class="title"><b>Table 1.73. Parameters</b></p>
+=======
+<a name="id780407"></a><p class="title"><b>Table 1.73. Parameters</b></p>
+=======
+<a name="id804115"></a><p class="title"><b>Table&#160;1.73.&#160;Parameters</b></p>
+=======
+<a name="id792505"></a><p class="title"><b>Table&#160;1.73.&#160;Parameters</b></p>
+=======
+<a name="id789228"></a><p class="title"><b>Table&#160;1.73.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -79,18 +162,40 @@
 </tr></tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.pop_back.expression_semantics"></a><h6>
 <a name="id574930"></a>
             <a href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.pop_back.expression_semantics"></a><h6>
+<a name="id789311"></a>
+ <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">pop_back<span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ implements the <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a new sequence containing
             all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
@@ -98,29 +203,104 @@
             same order as they were in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_back.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id575047"></a>
             <a href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.complexity">Complexity</a>
+=======
+<a name="id827032"></a>
+=======
+<a name="id788217"></a>
+=======
+<a name="id780593"></a>
+=======
+<a name="id804301"></a>
+=======
+<a name="id793511"></a>
+=======
+<a name="id790234"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_back.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id575077"></a>
             <a href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.header">Header</a>
+=======
+<a name="id827054"></a>
+=======
+<a name="id788239"></a>
+=======
+<a name="id780615"></a>
+=======
+<a name="id804323"></a>
+=======
+<a name="id793533"></a>
+=======
+<a name="id790256"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">pop_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">pop_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.pop_back.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id575245"></a>
             <a href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.example">Example</a>
+=======
+<a name="id827174"></a>
+=======
+<a name="id788359"></a>
+=======
+<a name="id780735"></a>
+=======
+<a name="id804990"></a>
+=======
+<a name="id793653"></a>
+=======
+<a name="id790376"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span><span class="identifier">___pop_back__</span><span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_front.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_front.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>pop_front</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="pop_back.html" title="pop_back">
 <link rel="next" href="push_back.html" title="push_back">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.pop_front.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id575413"></a>
             <a href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.description">Description</a>
+=======
+<a name="id827288"></a>
+=======
+<a name="id790112"></a>
+=======
+<a name="id782488"></a>
+=======
+<a name="id805104"></a>
+=======
+<a name="id793767"></a>
+=======
+<a name="id790490"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence, with the first element of the original removed.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_front.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id575443"></a>
             <a href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.synopsis">Synopsis</a>
+=======
+<a name="id827309"></a>
+=======
+<a name="id790133"></a>
+=======
+<a name="id782509"></a>
+=======
+<a name="id805125"></a>
+=======
+<a name="id793788"></a>
+=======
+<a name="id790511"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -46,8 +104,33 @@
 <span class="keyword">typename</span> result_of::pop_front<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">pop_front</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id575597"></a><p class="title"><b>Table 1.70. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id827417"></a><p class="title"><b>Table 1.70. Parameters</b></p>
+=======
+<a name="id790241"></a><p class="title"><b>Table 1.74. Parameters</b></p>
+=======
+<a name="id782617"></a><p class="title"><b>Table 1.74. Parameters</b></p>
+=======
+<a name="id805233"></a><p class="title"><b>Table&#160;1.74.&#160;Parameters</b></p>
+=======
+<a name="id793896"></a><p class="title"><b>Table&#160;1.74.&#160;Parameters</b></p>
+=======
+<a name="id790619"></a><p class="title"><b>Table&#160;1.74.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -79,18 +162,40 @@
 </tr></tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.pop_front.expression_semantics"></a><h6>
 <a name="id575701"></a>
             <a href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.pop_front.expression_semantics"></a><h6>
+<a name="id790702"></a>
+ <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">pop_front<span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ implements the <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a new sequence containing
             all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
@@ -98,29 +203,104 @@
             same order as they were in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_front.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id575820"></a>
             <a href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.complexity">Complexity</a>
+=======
+<a name="id827576"></a>
+=======
+<a name="id790427"></a>
+=======
+<a name="id782803"></a>
+=======
+<a name="id805419"></a>
+=======
+<a name="id794082"></a>
+=======
+<a name="id790805"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_front.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id575848"></a>
             <a href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.header">Header</a>
+=======
+<a name="id827597"></a>
+=======
+<a name="id790449"></a>
+=======
+<a name="id782825"></a>
+=======
+<a name="id805441"></a>
+=======
+<a name="id794104"></a>
+=======
+<a name="id790827"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">pop_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">pop_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.pop_front.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id576014"></a>
             <a href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.example">Example</a>
+=======
+<a name="id827717"></a>
+=======
+<a name="id790569"></a>
+=======
+<a name="id782945"></a>
+=======
+<a name="id805561"></a>
+=======
+<a name="id794224"></a>
+=======
+<a name="id790947"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>pop_front<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_back.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_back.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>push_back</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="pop_front.html" title="pop_front">
 <link rel="next" href="push_front.html" title="push_front">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.push_back.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id576190"></a>
             <a href="push_back.html#fusion.algorithm.transformation.functions.push_back.description">Description</a>
+=======
+<a name="id827836"></a>
+=======
+<a name="id790688"></a>
+=======
+<a name="id783064"></a>
+=======
+<a name="id805680"></a>
+=======
+<a name="id794343"></a>
+=======
+<a name="id791066"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence with an element added at the end.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_back.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id576220"></a>
             <a href="push_back.html#fusion.algorithm.transformation.functions.push_back.synopsis">Synopsis</a>
+=======
+<a name="id827858"></a>
+=======
+<a name="id790709"></a>
+=======
+<a name="id783085"></a>
+=======
+<a name="id805701"></a>
+=======
+<a name="id794364"></a>
+=======
+<a name="id791087"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -48,8 +106,33 @@
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id576426"></a><p class="title"><b>Table 1.71. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id828006"></a><p class="title"><b>Table 1.71. Parameters</b></p>
+=======
+<a name="id790857"></a><p class="title"><b>Table 1.75. Parameters</b></p>
+=======
+<a name="id783233"></a><p class="title"><b>Table 1.75. Parameters</b></p>
+=======
+<a name="id805849"></a><p class="title"><b>Table&#160;1.75.&#160;Parameters</b></p>
+=======
+<a name="id794512"></a><p class="title"><b>Table&#160;1.75.&#160;Parameters</b></p>
+=======
+<a name="id791235"></a><p class="title"><b>Table&#160;1.75.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -94,18 +177,40 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.push_back.expression_semantics"></a><h6>
 <a name="id576567"></a>
             <a href="push_back.html#fusion.algorithm.transformation.functions.push_back.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.push_back.expression_semantics"></a><h6>
+<a name="id791349"></a>
+ <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">push_back<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ implements the <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
             all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
@@ -113,29 +218,104 @@
             to the end. The elements are in the same order as they were in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_back.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id576708"></a>
             <a href="push_back.html#fusion.algorithm.transformation.functions.push_back.complexity">Complexity</a>
+=======
+<a name="id828211"></a>
+=======
+<a name="id791090"></a>
+=======
+<a name="id783466"></a>
+=======
+<a name="id806082"></a>
+=======
+<a name="id794745"></a>
+=======
+<a name="id791468"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_back.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id576737"></a>
             <a href="push_back.html#fusion.algorithm.transformation.functions.push_back.header">Header</a>
+=======
+<a name="id828232"></a>
+=======
+<a name="id791111"></a>
+=======
+<a name="id783487"></a>
+=======
+<a name="id806103"></a>
+=======
+<a name="id794766"></a>
+=======
+<a name="id791489"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.header">Header</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">push_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">push_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.push_back.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id576904"></a>
             <a href="push_back.html#fusion.algorithm.transformation.functions.push_back.example">Example</a>
+=======
+<a name="id828352"></a>
+=======
+<a name="id791231"></a>
+=======
+<a name="id783607"></a>
+=======
+<a name="id806223"></a>
+=======
+<a name="id794886"></a>
+=======
+<a name="id791609"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.example">Example</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>push_back<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">),</span><span class="number">4</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</s
pan><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_front.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_front.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,18 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>push_front</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+<<<<<<< .working
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+>>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
 <link rel="previous" href="push_back.html" title="push_back">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
@@ -30,15 +38,65 @@
 <div></div>
 </div>
 <a name="fusion.algorithm.transformation.functions.push_front.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id577112"></a>
             <a href="push_front.html#fusion.algorithm.transformation.functions.push_front.description">Description</a>
+=======
+<a name="id828490"></a>
+=======
+<a name="id791369"></a>
+=======
+<a name="id783745"></a>
+=======
+<a name="id806361"></a>
+=======
+<a name="id795024"></a>
+=======
+<a name="id791747"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.description">Description</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence with an element added at the beginning.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_front.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id577142"></a>
             <a href="push_front.html#fusion.algorithm.transformation.functions.push_front.synopsis">Synopsis</a>
+=======
+<a name="id828510"></a>
+=======
+<a name="id791389"></a>
+=======
+<a name="id783764"></a>
+=======
+<a name="id806380"></a>
+=======
+<a name="id795043"></a>
+=======
+<a name="id791767"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -48,8 +106,33 @@
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id577349"></a><p class="title"><b>Table 1.72. Parameters</b></p>
 <table class="table" summary="Parameters">
+=======
+<a name="id828660"></a><p class="title"><b>Table 1.72. Parameters</b></p>
+=======
+<a name="id791539"></a><p class="title"><b>Table 1.76. Parameters</b></p>
+=======
+<a name="id783914"></a><p class="title"><b>Table 1.76. Parameters</b></p>
+=======
+<a name="id806530"></a><p class="title"><b>Table&#160;1.76.&#160;Parameters</b></p>
+=======
+<a name="id795193"></a><p class="title"><b>Table&#160;1.76.&#160;Parameters</b></p>
+=======
+<a name="id791917"></a><p class="title"><b>Table&#160;1.76.&#160;Parameters</b></p>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+<div class="table-contents"><table class="table" summary="Parameters">
+>>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
@@ -94,18 +177,40 @@
 </tbody>
 </table>
 </div>
+<<<<<<< .working
 <a name="fusion.algorithm.transformation.functions.push_front.expression_semantics"></a><h6>
 <a name="id577488"></a>
             <a href="push_front.html#fusion.algorithm.transformation.functions.push_front.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.push_front.expression_semantics"></a><h6>
+<a name="id792029"></a>
+ <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting">push_back<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
+<<<<<<< .working
             <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
         Sequence">Forward
             Sequence</a>.
+=======
+ <span class="bold"><strong>Return type</strong></span>:
+>>>>>>> .merge-right.r57242
           </p>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ implements the <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
 <p>
             <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
             all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
@@ -114,29 +219,104 @@
             <tt class="computeroutput"><span class="identifier">seq</span></tt>.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_front.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id577629"></a>
             <a href="push_front.html#fusion.algorithm.transformation.functions.push_front.complexity">Complexity</a>
+=======
+<a name="id828864"></a>
+=======
+<a name="id791770"></a>
+=======
+<a name="id784146"></a>
+=======
+<a name="id806762"></a>
+=======
+<a name="id795425"></a>
+=======
+<a name="id792148"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_front.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
 <a name="id577657"></a>
             <a href="push_front.html#fusion.algorithm.transformation.functions.push_front.header">Header</a>
+=======
+<a name="id828885"></a>
+=======
+<a name="id791792"></a>
+=======
+<a name="id784168"></a>
+=======
+<a name="id806784"></a>
+=======
+<a name="id795447"></a>
+=======
+<a name="id792170"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>