|
|
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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></span>
<span class="preprocessor">#include</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">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">></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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">adapt_struct</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">array</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</span><span class="keyword">int</span><span class="special">,</span><span class="number">3</span><span class="special">></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"><<</span> <span class="special">*</span>begin<span class="special">(</span><span class="identifier">arr</span><span class="special">)</span> <span class="special"><<</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"><<</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"><<</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"><<</span> at_c<span class="special"><</span><span class="number">2</span><span class="special">>(</span><span class="identifier">arr</span><span class="special">)</span> <span class="special"><<</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">boost_tuple</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></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"><<</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"><<</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"><<</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"><<</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">mpl</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></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"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">long</span><span class="special">></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"><<</span> at_c<span class="special"><</span><span class="number">0</span><span class="special">>(</span><span class="identifier">v</span><span class="special">)</span> <span class="special"><<</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"><<</span> at_c<span class="special"><</span><span class="number">0</span><span class="special">>(</span><span class="identifier">v</span><span class="special">)</span> <span class="special"><<</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"><<</span> at_c<span class="special"><</span><span class="number">1</span><span class="special">>(</span><span class="identifier">v</span><span class="special">)</span> <span class="special"><<</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">std_pair</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></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"><<</span> at_c<span class="special"><</span><span class="number">0</span><span class="special">>(</span><span class="identifier">p</span><span class="special">)</span> <span class="special"><<</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"><<</span> at_c<span class="special"><</span><span class="number">1</span><span class="special">>(</span><span class="identifier">p</span><span class="special">)</span> <span class="special"><<</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"><<</span> <span class="identifier">p</span> <span class="special"><<</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 1. 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"><</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">State</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">initial_state</span><span class="special">,</span> <span class="identifier">F</span> <span class="keyword">const</span><span class="special">&</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 1.38. Parameters</b></p>
+=======
+<a name="id755947"></a><p class="title"><b>Table 1.38. Parameters</b></p>
+=======
+<a name="id752670"></a><p class="title"><b>Table 1.38. 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"><</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">)>::</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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">accumulate</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">></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">&</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">&</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">&</span> <span class="identifier">str</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">T</span><span class="special">&</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"><</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">>(</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 © 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 1. 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"><</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">State</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">initial_state</span><span class="special">,</span> <span class="identifier">F</span> <span class="keyword">const</span><span class="special">&</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 1.37. Parameters</b></p>
+=======
+<a name="id753595"></a><p class="title"><b>Table 1.37. Parameters</b></p>
+=======
+<a name="id750318"></a><p class="title"><b>Table 1.37. 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"><</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">)>::</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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">fold</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">></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">&</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">&</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">&</span> <span class="identifier">str</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">T</span><span class="special">&</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"><</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">>(</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 © 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 1. 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"><</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="keyword">const</span><span class="special">&</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 1.39. Parameters</b></p>
+=======
+<a name="id757094"></a><p class="title"><b>Table 1.39. Parameters</b></p>
+=======
+<a name="id753817"></a><p class="title"><b>Table 1.39. 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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">for_each</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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 1.41. Parameters</b></p>
+=======
+<a name="id758608"></a><p class="title"><b>Table 1.41. Parameters</b></p>
+=======
+<a name="id755331"></a><p class="title"><b>Table 1.41. 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"><</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">)>::</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"><</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">>::</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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">accumulate</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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 1.40. Parameters</b></p>
+=======
+<a name="id757916"></a><p class="title"><b>Table 1.40. Parameters</b></p>
+=======
+<a name="id754640"></a><p class="title"><b>Table 1.40. 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"><</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">)>::</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"><</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">>::</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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">fold</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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 1.42. Parameters</b></p>
+=======
+<a name="id759310"></a><p class="title"><b>Table 1.42. Parameters</b></p>
+=======
+<a name="id756033"></a><p class="title"><b>Table 1.42. 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"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">for_each</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">query</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 1. 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"><</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">&</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 1.44. Parameters</b></p>
+=======
+<a name="id761971"></a><p class="title"><b>Table 1.44. Parameters</b></p>
+=======
+<a name="id758694"></a><p class="title"><b>Table 1.44. 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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">all</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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">&</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 1.43. Parameters</b></p>
+=======
+<a name="id761102"></a><p class="title"><b>Table 1.43. Parameters</b></p>
+=======
+<a name="id757825"></a><p class="title"><b>Table 1.43. 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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">any</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&</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 1.48. Parameters</b></p>
+=======
+<a name="id768120"></a><p class="title"><b>Table 1.48. Parameters</b></p>
+=======
+<a name="id764843"></a><p class="title"><b>Table 1.48. 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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">count</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></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 © 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 1. 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"><</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">&</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 1.49. Parameters</b></p>
+=======
+<a name="id769932"></a><p class="title"><b>Table 1.49. Parameters</b></p>
+=======
+<a name="id766656"></a><p class="title"><b>Table 1.49. 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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">count_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></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 © 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 1. 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"><</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">&</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 1.46. Parameters</b></p>
+=======
+<a name="id766580"></a><p class="title"><b>Table 1.46. Parameters</b></p>
+=======
+<a name="id763303"></a><p class="title"><b>Table 1.46. 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"><</span><span class="identifier">T</span><span class="special">>(</span><span class="identifier">seq</span><span class="special">)</span>
@@ -117,22 +206,97 @@
to <tt class="computeroutput">find_if<span class="special"><</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">></span> <span class="special">>(</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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">find</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</span><span class="keyword">char</span><span class="special">,</span><span class="keyword">int</span><span class="special">></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"><</span><span class="keyword">int</span><span class="special">>(</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 © 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 1. 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"><</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">&</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 1.47. Parameters</b></p>
+=======
+<a name="id767409"></a><p class="title"><b>Table 1.47. Parameters</b></p>
+=======
+<a name="id764132"></a><p class="title"><b>Table 1.47. 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"><</span><span class="identifier">F</span><span class="special">>(</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"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">value</span></tt> comparisons.
</p>
-<p>
- /algorithm/query/find_if.hpp>
- </p>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+ include <boost/fusion/algorithm/query/find_if.hpp>
+ </li>
+<li class="listitem">
+ include <boost/fusion/include/find_if.hpp>
+ </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"><</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">int</span><span class="special">></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"><</span><span class="identifier">is_integral</span><span class="special"><</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">></span> <span class="special">>(</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 © 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 1. 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"><</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">&</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 1.45. Parameters</b></p>
+=======
+<a name="id762840"></a><p class="title"><b>Table 1.45. Parameters</b></p>
+=======
+<a name="id759563"></a><p class="title"><b>Table 1.45. 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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">none</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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 1.51. Parameters</b></p>
+=======
+<a name="id771117"></a><p class="title"><b>Table 1.51. Parameters</b></p>
+=======
+<a name="id767840"></a><p class="title"><b>Table 1.51. 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"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">all</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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 1.50. Parameters</b></p>
+=======
+<a name="id770620"></a><p class="title"><b>Table 1.50. Parameters</b></p>
+=======
+<a name="id767343"></a><p class="title"><b>Table 1.50. 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"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">any</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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 1.55. Parameters</b></p>
+=======
+<a name="id773190"></a><p class="title"><b>Table 1.55. Parameters</b></p>
+=======
+<a name="id769913"></a><p class="title"><b>Table 1.55. 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"><</span><span class="identifier">T</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">count</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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 1.56. Parameters</b></p>
+=======
+<a name="id773658"></a><p class="title"><b>Table 1.56. Parameters</b></p>
+=======
+<a name="id770381"></a><p class="title"><b>Table 1.56. 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"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">count_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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 1.53. Parameters</b></p>
+=======
+<a name="id772110"></a><p class="title"><b>Table 1.53. Parameters</b></p>
+=======
+<a name="id768833"></a><p class="title"><b>Table 1.53. 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"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">>::</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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">find</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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 1.54. Parameters</b></p>
+=======
+<a name="id772652"></a><p class="title"><b>Table 1.54. Parameters</b></p>
+=======
+<a name="id769375"></a><p class="title"><b>Table 1.54. 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"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">>::</span><span class="identifier">type</span>
@@ -116,15 +210,65 @@
to true. Returns <tt class="computeroutput">result_of::end<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</span><span class="identifier">Sequence</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">find_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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 1.52. Parameters</b></p>
+=======
+<a name="id771614"></a><p class="title"><b>Table 1.52. Parameters</b></p>
+=======
+<a name="id768337"></a><p class="title"><b>Table 1.52. 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"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">>::</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">none</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 1. 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"><</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"><</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">>::</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">&</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 1.66. Parameters</b></p>
+=======
+<a name="id785651"></a><p class="title"><b>Table 1.66. Parameters</b></p>
+=======
+<a name="id782374"></a><p class="title"><b>Table 1.66. 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">clear</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">First</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">it1</span><span class="special">,</span> <span class="identifier">Last</span> <span class="keyword">const</span><span class="special">&</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 1.67. Parameters</b></p>
+=======
+<a name="id786386"></a><p class="title"><b>Table 1.67. Parameters</b></p>
+=======
+<a name="id783110"></a><p class="title"><b>Table 1.67. 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">erase</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></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 © 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 1. 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"><</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">></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"><</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">>::</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">&</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"><</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">>::</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">&</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 1.68. Parameters</b></p>
+=======
+<a name="id787469"></a><p class="title"><b>Table 1.68. Parameters</b></p>
+=======
+<a name="id784192"></a><p class="title"><b>Table 1.68. 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"><</span><span class="identifier">Key</span><span class="special">>(</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">erase_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</span><span class="keyword">int</span><span class="special">>(</span>make_map<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">long</span><span class="special">>(</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"><</span><span class="keyword">long</span><span class
="special">>(</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 © 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 1. 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"><</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"><</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">T</span><span class="special">>::</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">&</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 1.57. Parameters</b></p>
+=======
+<a name="id776770"></a><p class="title"><b>Table 1.57. Parameters</b></p>
+=======
+<a name="id773493"></a><p class="title"><b>Table 1.57. 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"><</span><span class="identifier">T</span><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 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"><</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">same_type</span><span class="special"><</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">></span> <span class="special">>(</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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">filter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></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"><</span><span class="keyword">int</span><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="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 © 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 1. 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"><</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"><</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">>::</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">&</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 1.58. Parameters</b></p>
+=======
+<a name="id777558"></a><p class="title"><b>Table 1.58. Parameters</b></p>
+=======
+<a name="id774282"></a><p class="title"><b>Table 1.58. 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"><</span><span class="identifier">Pred</span><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 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">filter_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</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">></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"><</span><span class="identifier">is_integral</span><span class="special"><</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">></span> <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="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 © 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 1. 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"><</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">></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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">Pos</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="keyword">const</span><span class="special">&</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"><</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">>::</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">Pos</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="keyword">const</span><span class="special">&</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 1.69. Parameters</b></p>
+=======
+<a name="id788169"></a><p class="title"><b>Table 1.69. Parameters</b></p>
+=======
+<a name="id784892"></a><p class="title"><b>Table 1.69. 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">insert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">></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 © 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 1. 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"><</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">Pos</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">pos</span><span class="special">,</span> <span class="identifier">Range</span> <span class="keyword">const</span><span class="special">&</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 1.70. Parameters</b></p>
+=======
+<a name="id788992"></a><p class="title"><b>Table 1.70. Parameters</b></p>
+=======
+<a name="id785715"></a><p class="title"><b>Table 1.70. 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">insert_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">></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 © 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 1. 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"><</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"><</span><span class="identifier">LhSequence</span><span class="special">,</span> <span class="identifier">RhSequence</span><span class="special">>::</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">&</span> <span class="identifier">lhs</span><span class="special">,</span> <span class="identifier">RhSequence</span> <span class="keyword">const</span><span class="special">&</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 1.71. Parameters</b></p>
+=======
+<a name="id790886"></a><p class="title"><b>Table 1.71. Parameters</b></p>
+=======
+<a name="id787610"></a><p class="title"><b>Table 1.71. 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">join</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">></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"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">></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 © 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 1. 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"><</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"><</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">>::</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">&</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 1.73. Parameters</b></p>
+=======
+<a name="id792505"></a><p class="title"><b>Table 1.73. Parameters</b></p>
+=======
+<a name="id789228"></a><p class="title"><b>Table 1.73. 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">pop_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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"><</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">>::</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">&</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 1.74. Parameters</b></p>
+=======
+<a name="id793896"></a><p class="title"><b>Table 1.74. Parameters</b></p>
+=======
+<a name="id790619"></a><p class="title"><b>Table 1.74. 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">pop_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&</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 1.75. Parameters</b></p>
+=======
+<a name="id794512"></a><p class="title"><b>Table 1.75. Parameters</b></p>
+=======
+<a name="id791235"></a><p class="title"><b>Table 1.75. 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"><</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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">push_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></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 © 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 1. 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"><</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&</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 1.76. Parameters</b></p>
+=======
+<a name="id795193"></a><p class="title"><b>Table 1.76. Parameters</b></p>
+=======
+<a name="id791917"></a><p class="title"><b>Table 1.76. 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
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">push_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">push_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.algorithm.transformation.functions.push_front.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id577824"></a>
<a href="push_front.html#fusion.algorithm.transformation.functions.push_front.example">Example</a>
+=======
+<a name="id829005"></a>
+=======
+<a name="id791912"></a>
+=======
+<a name="id784288"></a>
+=======
+<a name="id806904"></a>
+=======
+<a name="id795567"></a>
+=======
+<a name="id792290"></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.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>push_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="number">0</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">0</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>
</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 © 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/remove.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove.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>remove</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="replace_if.html" title="replace_if">
<link rel="next" href="remove_if.html" title="remove_if">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.functions.remove.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id564084"></a>
<a href="remove.html#fusion.algorithm.transformation.functions.remove.description">Description</a>
+=======
+<a name="id817028"></a>
+=======
+<a name="id778699"></a>
+=======
+<a name="id771075"></a>
+=======
+<a name="id794754"></a>
+=======
+<a name="id783417"></a>
+=======
+<a name="id780140"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns a new sequence, with all the elements of the original sequence,
except those of a given type.
</p>
<a name="fusion.algorithm.transformation.functions.remove.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id564115"></a>
<a href="remove.html#fusion.algorithm.transformation.functions.remove.synopsis">Synopsis</a>
+=======
+<a name="id817050"></a>
+=======
+<a name="id778720"></a>
+=======
+<a name="id771096"></a>
+=======
+<a name="id794776"></a>
+=======
+<a name="id783439"></a>
+=======
+<a name="id780162"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</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::remove<span class="special"><</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">replace</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id564298"></a><p class="title"><b>Table 1.59. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id817179"></a><p class="title"><b>Table 1.59. Parameters</b></p>
+=======
+<a name="id778850"></a><p class="title"><b>Table 1.63. Parameters</b></p>
+=======
+<a name="id771226"></a><p class="title"><b>Table 1.63. Parameters</b></p>
+=======
+<a name="id794905"></a><p class="title"><b>Table 1.63. Parameters</b></p>
+=======
+<a name="id783568"></a><p class="title"><b>Table 1.63. Parameters</b></p>
+=======
+<a name="id780292"></a><p class="title"><b>Table 1.63. 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.remove.expression_semantics"></a><h6>
<a name="id564434"></a>
<a href="remove.html#fusion.algorithm.transformation.functions.remove.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.remove.expression_semantics"></a><h6>
+<a name="id780404"></a>
+ <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">remove<span class="special"><</span><span class="identifier">T</span><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">Sequence</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,22 +218,97 @@
Equivalent to <tt class="computeroutput">remove_if<span class="special"><</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span><span class="identifier">_</span><span class="special">,</span><span class="identifier">T</span><span class="special">></span> <span class="special">>(</span><span class="identifier">seq</span><span class="special">)</span></tt>.
</p>
<a name="fusion.algorithm.transformation.functions.remove.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id564647"></a>
<a href="remove.html#fusion.algorithm.transformation.functions.remove.complexity">Complexity</a>
+=======
+<a name="id817432"></a>
+=======
+<a name="id779131"></a>
+=======
+<a name="id771507"></a>
+=======
+<a name="id795186"></a>
+=======
+<a name="id783849"></a>
+=======
+<a name="id780572"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant. Returns a view which is lazily evaluated.
</p>
<a name="fusion.algorithm.transformation.functions.remove.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id564677"></a>
<a href="remove.html#fusion.algorithm.transformation.functions.remove.header">Header</a>
+=======
+<a name="id817452"></a>
+=======
+<a name="id779150"></a>
+=======
+<a name="id771526"></a>
+=======
+<a name="id795205"></a>
+=======
+<a name="id783868"></a>
+=======
+<a name="id780592"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">remove</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">remove</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.algorithm.transformation.functions.remove.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id564843"></a>
<a href="remove.html#fusion.algorithm.transformation.functions.remove.example">Example</a>
+=======
+<a name="id817569"></a>
+=======
+<a name="id779268"></a>
+=======
+<a name="id771643"></a>
+=======
+<a name="id795323"></a>
+=======
+<a name="id783986"></a>
+=======
+<a name="id780709"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">const</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">></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="identifier">assert</span><span class="special">(</span>remove<span class="special"><</span><span class="keyword">double</span><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>
@@ -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 © 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/remove_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove_if.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove_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>remove_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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="remove.html" title="remove">
<link rel="next" href="reverse.html" title="reverse">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.functions.remove_if.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id565058"></a>
<a href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.description">Description</a>
+=======
+<a name="id817717"></a>
+=======
+<a name="id779415"></a>
+=======
+<a name="id771791"></a>
+=======
+<a name="id795470"></a>
+=======
+<a name="id784134"></a>
+=======
+<a name="id780857"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns a new sequence, containing all the elements of the original except
those where a given unary function object evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt>.
</p>
<a name="fusion.algorithm.transformation.functions.remove_if.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id565101"></a>
<a href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.synopsis">Synopsis</a>
+=======
+<a name="id817746"></a>
+=======
+<a name="id779444"></a>
+=======
+<a name="id771820"></a>
+=======
+<a name="id795499"></a>
+=======
+<a name="id784162"></a>
+=======
+<a name="id780886"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Pred</span><span class="special">,</span>
@@ -48,8 +106,33 @@
<span class="keyword">typename</span> result_of::remove_if<span class="special"><</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">remove_if</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id565283"></a><p class="title"><b>Table 1.60. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id817875"></a><p class="title"><b>Table 1.60. Parameters</b></p>
+=======
+<a name="id779574"></a><p class="title"><b>Table 1.64. Parameters</b></p>
+=======
+<a name="id771949"></a><p class="title"><b>Table 1.64. Parameters</b></p>
+=======
+<a name="id795629"></a><p class="title"><b>Table 1.64. Parameters</b></p>
+=======
+<a name="id784292"></a><p class="title"><b>Table 1.64. Parameters</b></p>
+=======
+<a name="id781015"></a><p class="title"><b>Table 1.64. 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,18 +178,40 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.functions.remove_if.expression_semantics"></a><h6>
<a name="id565430"></a>
<a href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.remove_if.expression_semantics"></a><h6>
+<a name="id781133"></a>
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">remove_if<span class="special"><</span><span class="identifier">Pred</span><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>,
@@ -115,22 +220,97 @@
<span class="special">>(</span><span class="identifier">seq</span><span class="special">)</span></tt>.
</p>
<a name="fusion.algorithm.transformation.functions.remove_if.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id565675"></a>
<a href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.complexity">Complexity</a>
+=======
+<a name="id818154"></a>
+=======
+<a name="id779880"></a>
+=======
+<a name="id772255"></a>
+=======
+<a name="id795935"></a>
+=======
+<a name="id784598"></a>
+=======
+<a name="id781321"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant. Returns a view which is lazily evaluated.
</p>
<a name="fusion.algorithm.transformation.functions.remove_if.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id565703"></a>
<a href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.header">Header</a>
+=======
+<a name="id818175"></a>
+=======
+<a name="id779901"></a>
+=======
+<a name="id772277"></a>
+=======
+<a name="id795956"></a>
+=======
+<a name="id784620"></a>
+=======
+<a name="id781343"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">remove_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">remove_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.algorithm.transformation.functions.remove_if.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id565870"></a>
<a href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.example">Example</a>
+=======
+<a name="id818295"></a>
+=======
+<a name="id780021"></a>
+=======
+<a name="id772397"></a>
+=======
+<a name="id796076"></a>
+=======
+<a name="id784740"></a>
+=======
+<a name="id781463"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">const</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">></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="identifier">assert</span><span class="special">(</span>remove_if<span class="special"><</span><span class="identifier">is_floating_point</span><span class="special"><</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">></span> <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>
@@ -138,7 +318,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 © 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/replace.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace.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>replace</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="transform.html" title="transform">
<link rel="next" href="replace_if.html" title="replace_if">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.functions.replace.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id561799"></a>
<a href="replace.html#fusion.algorithm.transformation.functions.replace.description">Description</a>
+=======
+<a name="id814297"></a>
+=======
+<a name="id775968"></a>
+=======
+<a name="id768344"></a>
+=======
+<a name="id790931"></a>
+=======
+<a name="id779594"></a>
+=======
+<a name="id776317"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Replaces each value within a sequence of a given type and value with
a new value.
</p>
<a name="fusion.algorithm.transformation.functions.replace.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id561830"></a>
<a href="replace.html#fusion.algorithm.transformation.functions.replace.synopsis">Synopsis</a>
+=======
+<a name="id814319"></a>
+=======
+<a name="id775990"></a>
+=======
+<a name="id768365"></a>
+=======
+<a name="id790953"></a>
+=======
+<a name="id779616"></a>
+=======
+<a name="id776339"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">old_value</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">new_value</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id562071"></a><p class="title"><b>Table 1.57. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id814493"></a><p class="title"><b>Table 1.57. Parameters</b></p>
+=======
+<a name="id776164"></a><p class="title"><b>Table 1.61. Parameters</b></p>
+=======
+<a name="id768539"></a><p class="title"><b>Table 1.61. Parameters</b></p>
+=======
+<a name="id791127"></a><p class="title"><b>Table 1.61. Parameters</b></p>
+=======
+<a name="id779790"></a><p class="title"><b>Table 1.61. Parameters</b></p>
+=======
+<a name="id776513"></a><p class="title"><b>Table 1.61. 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>
@@ -110,9 +193,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.functions.replace.expression_semantics"></a><h6>
<a name="id562318"></a>
<a href="replace.html#fusion.algorithm.transformation.functions.replace.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.replace.expression_semantics"></a><h6>
+<a name="id776702"></a>
+ <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">replace<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">old_value</span><span class="special">,</span> <span class="identifier">new_value</span><span class="special">);</span>
@@ -129,29 +218,104 @@
to elements with the same type and equal to <tt class="computeroutput"><span class="identifier">old_value</span></tt>.
</p>
<a name="fusion.algorithm.transformation.functions.replace.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id562472"></a>
<a href="replace.html#fusion.algorithm.transformation.functions.replace.complexity">Complexity</a>
+=======
+<a name="id814783"></a>
+=======
+<a name="id776454"></a>
+=======
+<a name="id768830"></a>
+=======
+<a name="id791417"></a>
+=======
+<a name="id780080"></a>
+=======
+<a name="id776803"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant. Returns a view which is lazily evaluated.
</p>
<a name="fusion.algorithm.transformation.functions.replace.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id562502"></a>
<a href="replace.html#fusion.algorithm.transformation.functions.replace.header">Header</a>
+=======
+<a name="id814805"></a>
+=======
+<a name="id776476"></a>
+=======
+<a name="id768851"></a>
+=======
+<a name="id791439"></a>
+=======
+<a name="id780102"></a>
+=======
+<a name="id776825"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">replace</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">replace</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.algorithm.transformation.functions.replace.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id562668"></a>
<a href="replace.html#fusion.algorithm.transformation.functions.replace.example">Example</a>
+=======
+<a name="id814925"></a>
+=======
+<a name="id776596"></a>
+=======
+<a name="id768971"></a>
+=======
+<a name="id791559"></a>
+=======
+<a name="id780222"></a>
+=======
+<a name="id776945"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>replace<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">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">3</span><span class="special">));</spa
n>
</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 © 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/replace_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace_if.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace_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>replace_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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="replace.html" title="replace">
<link rel="next" href="remove.html" title="remove">
@@ -30,8 +38,33 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.functions.replace_if.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id562860"></a>
<a href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.description">Description</a>
+=======
+<a name="id815051"></a>
+=======
+<a name="id776722"></a>
+=======
+<a name="id769097"></a>
+=======
+<a name="id791685"></a>
+=======
+<a name="id780348"></a>
+=======
+<a name="id777071"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Replaces each element of a given sequence for which an unary function
@@ -39,8 +72,33 @@
replaced with a new value.
</p>
<a name="fusion.algorithm.transformation.functions.replace_if.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id562902"></a>
<a href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.synopsis">Synopsis</a>
+=======
+<a name="id815077"></a>
+=======
+<a name="id776748"></a>
+=======
+<a name="id769124"></a>
+=======
+<a name="id791711"></a>
+=======
+<a name="id780374"></a>
+=======
+<a name="id777097"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</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">&</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">new_value</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id563158"></a><p class="title"><b>Table 1.58. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id815266"></a><p class="title"><b>Table 1.58. Parameters</b></p>
+=======
+<a name="id776936"></a><p class="title"><b>Table 1.62. Parameters</b></p>
+=======
+<a name="id769312"></a><p class="title"><b>Table 1.62. Parameters</b></p>
+=======
+<a name="id791899"></a><p class="title"><b>Table 1.62. Parameters</b></p>
+=======
+<a name="id780562"></a><p class="title"><b>Table 1.62. Parameters</b></p>
+=======
+<a name="id777286"></a><p class="title"><b>Table 1.62. 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>
@@ -109,9 +192,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.functions.replace_if.expression_semantics"></a><h6>
<a name="id563396"></a>
<a href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.replace_if.expression_semantics"></a><h6>
+<a name="id779656"></a>
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">replace_if<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">new_value</span><span class="special">);</span>
@@ -129,22 +218,97 @@
evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt>.
</p>
<a name="fusion.algorithm.transformation.functions.replace_if.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id563560"></a>
<a href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.complexity">Complexity</a>
+=======
+<a name="id815558"></a>
+=======
+<a name="id778322"></a>
+=======
+<a name="id770698"></a>
+=======
+<a name="id794377"></a>
+=======
+<a name="id783040"></a>
+=======
+<a name="id779764"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant. Returns a view which is lazily evaluated.
</p>
<a name="fusion.algorithm.transformation.functions.replace_if.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id563587"></a>
<a href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.header">Header</a>
+=======
+<a name="id815580"></a>
+=======
+<a name="id778344"></a>
+=======
+<a name="id770719"></a>
+=======
+<a name="id794399"></a>
+=======
+<a name="id783062"></a>
+=======
+<a name="id779785"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">replace_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">replace_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.algorithm.transformation.functions.replace_if.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id563754"></a>
<a href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.example">Example</a>
+=======
+<a name="id815700"></a>
+=======
+<a name="id778464"></a>
+=======
+<a name="id770839"></a>
+=======
+<a name="id794519"></a>
+=======
+<a name="id783182"></a>
+=======
+<a name="id779905"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">odd</span>
<span class="special">{</span>
@@ -160,7 +324,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 © 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/reverse.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/reverse.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/reverse.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>reverse</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="remove_if.html" title="remove_if">
<link rel="next" href="clear.html" title="clear">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.functions.reverse.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id566112"></a>
<a href="reverse.html#fusion.algorithm.transformation.functions.reverse.description">Description</a>
+=======
+<a name="id818462"></a>
+=======
+<a name="id780188"></a>
+=======
+<a name="id772564"></a>
+=======
+<a name="id796243"></a>
+=======
+<a name="id784906"></a>
+=======
+<a name="id781630"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns a new sequence with the elements of the original in reverse order.
</p>
<a name="fusion.algorithm.transformation.functions.reverse.synposis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id566141"></a>
<a href="reverse.html#fusion.algorithm.transformation.functions.reverse.synposis">Synposis</a>
+=======
+<a name="id818484"></a>
+=======
+<a name="id780210"></a>
+=======
+<a name="id772585"></a>
+=======
+<a name="id796265"></a>
+=======
+<a name="id784928"></a>
+=======
+<a name="id781651"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.synposis">Synposis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -46,8 +104,33 @@
<span class="keyword">typename</span> result_of::reverse<span class="special"><</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">reverse</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id566294"></a><p class="title"><b>Table 1.61. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id818592"></a><p class="title"><b>Table 1.61. Parameters</b></p>
+=======
+<a name="id780318"></a><p class="title"><b>Table 1.65. Parameters</b></p>
+=======
+<a name="id772693"></a><p class="title"><b>Table 1.65. Parameters</b></p>
+=======
+<a name="id796373"></a><p class="title"><b>Table 1.65. Parameters</b></p>
+=======
+<a name="id785036"></a><p class="title"><b>Table 1.65. Parameters</b></p>
+=======
+<a name="id781760"></a><p class="title"><b>Table 1.65. 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,47 +162,149 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.functions.reverse.expression_semantics"></a><h6>
<a name="id566398"></a>
<a href="reverse.html#fusion.algorithm.transformation.functions.reverse.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.reverse.expression_semantics"></a><h6>
+<a name="id781842"></a>
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">reverse<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/bidirectional_sequence.html" title="Bidirectional
Sequence">Bidirectional
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/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> else, <a class="link" href="../../../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+ Access Sequence</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+ Access 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>
in reverse order.
</p>
<a name="fusion.algorithm.transformation.functions.reverse.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id566502"></a>
<a href="reverse.html#fusion.algorithm.transformation.functions.reverse.complexity">Complexity</a>
+=======
+<a name="id818743"></a>
+=======
+<a name="id780565"></a>
+=======
+<a name="id772941"></a>
+=======
+<a name="id796581"></a>
+=======
+<a name="id785244"></a>
+=======
+<a name="id781967"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant. Returns a view which is lazily evaluated.
</p>
<a name="fusion.algorithm.transformation.functions.reverse.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id566531"></a>
<a href="reverse.html#fusion.algorithm.transformation.functions.reverse.header">Header</a>
+=======
+<a name="id818764"></a>
+=======
+<a name="id780587"></a>
+=======
+<a name="id772963"></a>
+=======
+<a name="id796603"></a>
+=======
+<a name="id785266"></a>
+=======
+<a name="id781989"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">reverse</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">reverse</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.algorithm.transformation.functions.reverse.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id566697"></a>
<a href="reverse.html#fusion.algorithm.transformation.functions.reverse.example">Example</a>
+=======
+<a name="id818884"></a>
+=======
+<a name="id780707"></a>
+=======
+<a name="id773083"></a>
+=======
+<a name="id796723"></a>
+=======
+<a name="id785386"></a>
+=======
+<a name="id782109"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>reverse<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">3</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">1</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 © 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/transform.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/transform.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/transform.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>transform</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="filter_if.html" title="filter_if">
<link rel="next" href="replace.html" title="replace">
@@ -30,8 +38,33 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.functions.transform.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id559775"></a>
<a href="transform.html#fusion.algorithm.transformation.functions.transform.description">Description</a>
+=======
+<a name="id812584"></a>
+=======
+<a name="id773435"></a>
+=======
+<a name="id765811"></a>
+=======
+<a name="id789490"></a>
+=======
+<a name="id778154"></a>
+=======
+<a name="id774877"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.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 @@
of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
</p>
<a name="fusion.algorithm.transformation.functions.transform.unary_version_synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id559891"></a>
<a href="transform.html#fusion.algorithm.transformation.functions.transform.unary_version_synopsis">Unary
+=======
+<a name="id812657"></a>
+=======
+<a name="id773508"></a>
+=======
+<a name="id765884"></a>
+=======
+<a name="id789564"></a>
+=======
+<a name="id778227"></a>
+=======
+<a name="id774950"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.unary_version_synopsis">Unary
+>>>>>>> .merge-right.r57125
version synopsis</a>
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
@@ -53,8 +111,33 @@
<span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</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="id560094"></a><p class="title"><b>Table 1.55. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id812798"></a><p class="title"><b>Table 1.55. Parameters</b></p>
+=======
+<a name="id773650"></a><p class="title"><b>Table 1.59. Parameters</b></p>
+=======
+<a name="id766026"></a><p class="title"><b>Table 1.59. Parameters</b></p>
+=======
+<a name="id789705"></a><p class="title"><b>Table 1.59. Parameters</b></p>
+=======
+<a name="id778368"></a><p class="title"><b>Table 1.59. Parameters</b></p>
+=======
+<a name="id775092"></a><p class="title"><b>Table 1.59. 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.transformation.functions.transform.expression_semantics"></a><h6>
<a name="id560365"></a>
<a href="transform.html#fusion.algorithm.transformation.functions.transform.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.transform.expression_semantics"></a><h6>
+<a name="id775295"></a>
+ <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">transform<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
@@ -120,8 +209,33 @@
within <tt class="computeroutput"><span class="identifier">seq</span></tt>.
</p>
<a name="fusion.algorithm.transformation.functions.transform.binary_version_synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id560521"></a>
<a href="transform.html#fusion.algorithm.transformation.functions.transform.binary_version_synopsis">Binary
+=======
+<a name="id813101"></a>
+=======
+<a name="id775045"></a>
+=======
+<a name="id767421"></a>
+=======
+<a name="id790008"></a>
+=======
+<a name="id778671"></a>
+=======
+<a name="id775394"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.binary_version_synopsis">Binary
+>>>>>>> .merge-right.r57125
version synopsis</a>
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
@@ -133,8 +247,33 @@
<span class="identifier">Sequence1</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">Sequence2</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq2</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="id560785"></a><p class="title"><b>Table 1.56. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id813290"></a><p class="title"><b>Table 1.56. Parameters</b></p>
+=======
+<a name="id775235"></a><p class="title"><b>Table 1.60. Parameters</b></p>
+=======
+<a name="id767611"></a><p class="title"><b>Table 1.60. Parameters</b></p>
+=======
+<a name="id790198"></a><p class="title"><b>Table 1.60. Parameters</b></p>
+=======
+<a name="id778861"></a><p class="title"><b>Table 1.60. Parameters</b></p>
+=======
+<a name="id775584"></a><p class="title"><b>Table 1.60. 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>
@@ -207,22 +346,97 @@
within <tt class="computeroutput"><span class="identifier">seq1</span></tt> and <tt class="computeroutput"><span class="identifier">seq2</span></tt> respectively.
</p>
<a name="fusion.algorithm.transformation.functions.transform.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id561272"></a>
<a href="transform.html#fusion.algorithm.transformation.functions.transform.complexity">Complexity</a>
+=======
+<a name="id813917"></a>
+=======
+<a name="id775588"></a>
+=======
+<a name="id767963"></a>
+=======
+<a name="id790551"></a>
+=======
+<a name="id779214"></a>
+=======
+<a name="id775937"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant. Returns a view which is lazily evaluated.
</p>
<a name="fusion.algorithm.transformation.functions.transform.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id561300"></a>
<a href="transform.html#fusion.algorithm.transformation.functions.transform.header">Header</a>
+=======
+<a name="id813938"></a>
+=======
+<a name="id775609"></a>
+=======
+<a name="id767985"></a>
+=======
+<a name="id790572"></a>
+=======
+<a name="id779235"></a>
+=======
+<a name="id775958"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">transform</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">transform</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.algorithm.transformation.functions.transform.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id561466"></a>
<a href="transform.html#fusion.algorithm.transformation.functions.transform.example">Example</a>
+=======
+<a name="id814058"></a>
+=======
+<a name="id775729"></a>
+=======
+<a name="id768105"></a>
+=======
+<a name="id790692"></a>
+=======
+<a name="id779355"></a>
+=======
+<a name="id776078"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">triple</span>
<span class="special">{</span>
@@ -239,7 +453,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 © 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/zip.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/zip.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/zip.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>zip</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="join.html" title="join">
<link rel="next" href="pop_back.html" title="pop_back">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.functions.zip.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id573361"></a>
<a href="zip.html#fusion.algorithm.transformation.functions.zip.description">Description</a>
+=======
+<a name="id825843"></a>
+=======
+<a name="id787000"></a>
+=======
+<a name="id779376"></a>
+=======
+<a name="id803084"></a>
+=======
+<a name="id791474"></a>
+=======
+<a name="id788198"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Zips sequences together to form a single sequence, whos members are tuples
of the members of the component sequences.
</p>
<a name="fusion.algorithm.transformation.functions.zip.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id573392"></a>
<a href="zip.html#fusion.algorithm.transformation.functions.zip.synopsis">Synopsis</a>
+=======
+<a name="id825862"></a>
+=======
+<a name="id787020"></a>
+=======
+<a name="id779395"></a>
+=======
+<a name="id803104"></a>
+=======
+<a name="id791494"></a>
+=======
+<a name="id788217"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence1</span><span class="special">,</span>
@@ -51,8 +109,33 @@
<span class="identifier">zip</span><span class="special">(</span><span class="identifier">Sequence1</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">Sequence2</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq2</span><span class="special">,</span> <span class="special">...</span> <span class="identifier">SequenceN</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seqN</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id573673"></a><p class="title"><b>Table 1.68. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id826064"></a><p class="title"><b>Table 1.68. Parameters</b></p>
+=======
+<a name="id787221"></a><p class="title"><b>Table 1.72. Parameters</b></p>
+=======
+<a name="id779597"></a><p class="title"><b>Table 1.72. Parameters</b></p>
+=======
+<a name="id803305"></a><p class="title"><b>Table 1.72. Parameters</b></p>
+=======
+<a name="id791695"></a><p class="title"><b>Table 1.72. Parameters</b></p>
+=======
+<a name="id788418"></a><p class="title"><b>Table 1.72. 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>
@@ -84,9 +167,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.functions.zip.expression_semantics"></a><h6>
<a name="id573789"></a>
<a href="zip.html#fusion.algorithm.transformation.functions.zip.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.functions.zip.expression_semantics"></a><h6>
+<a name="id788508"></a>
+ <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">zip<span class="special">(</span><span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">seq2</span><span class="special">,</span> <span class="special">...</span> <span class="identifier">seqN</span><span class="special">);</span>
@@ -107,22 +196,97 @@
<span class="char">'c'</span><span class="special">))</span></tt>
</p>
<a name="fusion.algorithm.transformation.functions.zip.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id574094"></a>
<a href="zip.html#fusion.algorithm.transformation.functions.zip.complexity">Complexity</a>
+=======
+<a name="id826367"></a>
+=======
+<a name="id787525"></a>
+=======
+<a name="id779901"></a>
+=======
+<a name="id803609"></a>
+=======
+<a name="id791999"></a>
+=======
+<a name="id788722"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant. Returns a view which is lazily evaluated.
</p>
<a name="fusion.algorithm.transformation.functions.zip.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id574124"></a>
<a href="zip.html#fusion.algorithm.transformation.functions.zip.header">Header</a>
+=======
+<a name="id826386"></a>
+=======
+<a name="id787544"></a>
+=======
+<a name="id779920"></a>
+=======
+<a name="id803628"></a>
+=======
+<a name="id792018"></a>
+=======
+<a name="id788741"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">zip</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">zip</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.algorithm.transformation.functions.zip.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id574290"></a>
<a href="zip.html#fusion.algorithm.transformation.functions.zip.example">Example</a>
+=======
+<a name="id826502"></a>
+=======
+<a name="id787659"></a>
+=======
+<a name="id780035"></a>
+=======
+<a name="id803743"></a>
+=======
+<a name="id792133"></a>
+=======
+<a name="id788856"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">></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"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">></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>
@@ -131,7 +295,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 © 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/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/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="../transformation.html" title="Transformation">
<link rel="previous" href="functions/push_front.html" title="push_front">
Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/clear.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/clear.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="reverse.html" title="reverse">
<link rel="next" href="erase.html" title="erase">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.clear.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id585070"></a>
<a href="clear.html#fusion.algorithm.transformation.metafunctions.clear.description">Description</a>
+=======
+<a name="id836158"></a>
+=======
+<a name="id800323"></a>
+=======
+<a name="id792699"></a>
+=======
+<a name="id815343"></a>
+=======
+<a name="id805099"></a>
+=======
+<a name="id801822"></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.metafunctions.clear.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of clear, given the input sequence
type.
</p>
<a name="fusion.algorithm.transformation.metafunctions.clear.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id585117"></a>
<a href="clear.html#fusion.algorithm.transformation.metafunctions.clear.synopsis">Synopsis</a>
+=======
+<a name="id836189"></a>
+=======
+<a name="id800354"></a>
+=======
+<a name="id792730"></a>
+=======
+<a name="id815375"></a>
+=======
+<a name="id805130"></a>
+=======
+<a name="id801853"></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.metafunctions.clear.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -50,8 +108,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id585216"></a><p class="title"><b>Table 1.82. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id836264"></a><p class="title"><b>Table 1.82. Parameters</b></p>
+=======
+<a name="id800428"></a><p class="title"><b>Table 1.86. Parameters</b></p>
+=======
+<a name="id792804"></a><p class="title"><b>Table 1.86. Parameters</b></p>
+=======
+<a name="id815449"></a><p class="title"><b>Table 1.86. Parameters</b></p>
+=======
+<a name="id805204"></a><p class="title"><b>Table 1.86. Parameters</b></p>
+=======
+<a name="id801928"></a><p class="title"><b>Table 1.86. 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>
@@ -81,9 +164,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.clear.expression_semantics"></a><h6>
<a name="id585310"></a>
<a href="clear.html#fusion.algorithm.transformation.metafunctions.clear.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.clear.expression_semantics"></a><h6>
+<a name="id802006"></a>
+ <a class="link" href="clear.html#fusion.algorithm.transformation.metafunctions.clear.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::clear<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
@@ -97,15 +186,65 @@
<span class="bold"><b>Semantics</b></span>: Returns an empty sequence.
</p>
<a name="fusion.algorithm.transformation.metafunctions.clear.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id585422"></a>
<a href="clear.html#fusion.algorithm.transformation.metafunctions.clear.complexity">Complexity</a>
+=======
+<a name="id836414"></a>
+=======
+<a name="id800578"></a>
+=======
+<a name="id792954"></a>
+=======
+<a name="id815599"></a>
+=======
+<a name="id805354"></a>
+=======
+<a name="id802078"></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.metafunctions.clear.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.clear.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id585450"></a>
<a href="clear.html#fusion.algorithm.transformation.metafunctions.clear.header">Header</a>
+=======
+<a name="id836435"></a>
+=======
+<a name="id800600"></a>
+=======
+<a name="id792976"></a>
+=======
+<a name="id815621"></a>
+=======
+<a name="id805376"></a>
+=======
+<a name="id802099"></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.metafunctions.clear.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">clear</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -113,7 +252,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 © 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/metafunctions/erase.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="clear.html" title="clear">
<link rel="next" href="erase_key.html" title="erase_key">
@@ -34,12 +42,62 @@
and range delimiting iterator types.
</p>
<a name="fusion.algorithm.transformation.metafunctions.erase.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id585660"></a>
<a href="erase.html#fusion.algorithm.transformation.metafunctions.erase.description">Description</a>
+=======
+<a name="id836580"></a>
+=======
+<a name="id800744"></a>
+=======
+<a name="id793120"></a>
+=======
+<a name="id815765"></a>
+=======
+<a name="id805520"></a>
+=======
+<a name="id802243"></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.metafunctions.erase.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<a name="fusion.algorithm.transformation.metafunctions.erase.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id585683"></a>
<a href="erase.html#fusion.algorithm.transformation.metafunctions.erase.synopsis">Synopsis</a>
+=======
+<a name="id836598"></a>
+=======
+<a name="id800762"></a>
+=======
+<a name="id793138"></a>
+=======
+<a name="id815783"></a>
+=======
+<a name="id805538"></a>
+=======
+<a name="id802261"></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.metafunctions.erase.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</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="id585826"></a><p class="title"><b>Table 1.83. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id836706"></a><p class="title"><b>Table 1.83. Parameters</b></p>
+=======
+<a name="id800870"></a><p class="title"><b>Table 1.87. Parameters</b></p>
+=======
+<a name="id793246"></a><p class="title"><b>Table 1.87. Parameters</b></p>
+=======
+<a name="id815891"></a><p class="title"><b>Table 1.87. Parameters</b></p>
+=======
+<a name="id805646"></a><p class="title"><b>Table 1.87. Parameters</b></p>
+=======
+<a name="id802369"></a><p class="title"><b>Table 1.87. 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>
@@ -112,18 +195,40 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.erase.expression_semantics"></a><h6>
<a name="id586020"></a>
<a href="erase.html#fusion.algorithm.transformation.metafunctions.erase.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.erase.expression_semantics"></a><h6>
+<a name="id802524"></a>
+ <a class="link" href="erase.html#fusion.algorithm.transformation.metafunctions.erase.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::erase<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">It1</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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
the element at <tt class="computeroutput"><span class="identifier">It1</span></tt> removed.
@@ -141,15 +246,65 @@
and <tt class="computeroutput"><span class="identifier">It2</span></tt> removed.
</p>
<a name="fusion.algorithm.transformation.metafunctions.erase.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id586284"></a>
<a href="erase.html#fusion.algorithm.transformation.metafunctions.erase.complexity">Complexity</a>
+=======
+<a name="id837038"></a>
+=======
+<a name="id801230"></a>
+=======
+<a name="id793606"></a>
+=======
+<a name="id816251"></a>
+=======
+<a name="id806006"></a>
+=======
+<a name="id802729"></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.metafunctions.erase.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.erase.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id586312"></a>
<a href="erase.html#fusion.algorithm.transformation.metafunctions.erase.header">Header</a>
+=======
+<a name="id837060"></a>
+=======
+<a name="id801252"></a>
+=======
+<a name="id793627"></a>
+=======
+<a name="id816272"></a>
+=======
+<a name="id806028"></a>
+=======
+<a name="id802751"></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.metafunctions.erase.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">erase</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -157,7 +312,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 © 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/metafunctions/erase_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="erase.html" title="erase">
<link rel="next" href="insert.html" title="insert">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.erase_key.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id586501"></a>
<a href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.description">Description</a>
+=======
+<a name="id837188"></a>
+=======
+<a name="id801380"></a>
+=======
+<a name="id793756"></a>
+=======
+<a name="id816401"></a>
+=======
+<a name="id806156"></a>
+=======
+<a name="id802879"></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.metafunctions.erase_key.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of erase_key, given the sequence
and key types.
</p>
<a name="fusion.algorithm.transformation.metafunctions.erase_key.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id586549"></a>
<a href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.synopsis">Synopsis</a>
+=======
+<a name="id837216"></a>
+=======
+<a name="id801408"></a>
+=======
+<a name="id793783"></a>
+=======
+<a name="id816428"></a>
+=======
+<a name="id806184"></a>
+=======
+<a name="id802907"></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.metafunctions.erase_key.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</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="id586667"></a><p class="title"><b>Table 1.84. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id837301"></a><p class="title"><b>Table 1.84. Parameters</b></p>
+=======
+<a name="id801493"></a><p class="title"><b>Table 1.88. Parameters</b></p>
+=======
+<a name="id793869"></a><p class="title"><b>Table 1.88. Parameters</b></p>
+=======
+<a name="id816513"></a><p class="title"><b>Table 1.88. Parameters</b></p>
+=======
+<a name="id806269"></a><p class="title"><b>Table 1.88. Parameters</b></p>
+=======
+<a name="id802992"></a><p class="title"><b>Table 1.88. 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>
@@ -71,12 +154,24 @@
</tr></thead>
<tbody>
<tr>
+<<<<<<< .working
<td><p>
<tt class="computeroutput"><span class="identifier">Sequence</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">Sequence</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>
@@ -97,16 +192,27 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.erase_key.expression_semantics"></a><h6>
<a name="id586805"></a>
<a href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.erase_key.expression_semantics"></a><h6>
+<a name="id803110"></a>
+ <a class="link" href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::erase_key<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">>::</span><span class="identifier">type</span>
</pre>
<p>
+<<<<<<< .working
<span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/associative_sequence.html" title="Associative
Sequence">Associative
+=======
+ <span class="bold"><strong>Return type</strong></span>: 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>
<p>
@@ -115,15 +221,65 @@
except those with key <tt class="computeroutput"><span class="identifier">Key</span></tt>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.erase_key.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id586949"></a>
<a href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.complexity">Complexity</a>
+=======
+<a name="id837506"></a>
+=======
+<a name="id801708"></a>
+=======
+<a name="id794083"></a>
+=======
+<a name="id816728"></a>
+=======
+<a name="id807030"></a>
+=======
+<a name="id803753"></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.metafunctions.erase_key.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.erase_key.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id586979"></a>
<a href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.header">Header</a>
+=======
+<a name="id837525"></a>
+=======
+<a name="id801727"></a>
+=======
+<a name="id794103"></a>
+=======
+<a name="id816747"></a>
+=======
+<a name="id807049"></a>
+=======
+<a name="id803773"></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.metafunctions.erase_key.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">erase_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -131,7 +287,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 © 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/metafunctions/filter.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. 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="filter_if.html" title="filter_if">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.filter.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id578050"></a>
<a href="filter.html#fusion.algorithm.transformation.metafunctions.filter.description">Description</a>
+=======
+<a name="id829154"></a>
+=======
+<a name="id792061"></a>
+=======
+<a name="id784436"></a>
+=======
+<a name="id807052"></a>
+=======
+<a name="id796876"></a>
+=======
+<a name="id793600"></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.metafunctions.filter.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of filter given the sequence type
and type to retain.
</p>
<a name="fusion.algorithm.transformation.metafunctions.filter.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id578098"></a>
<a href="filter.html#fusion.algorithm.transformation.metafunctions.filter.synopsis">Synopsis</a>
+=======
+<a name="id829183"></a>
+=======
+<a name="id792089"></a>
+=======
+<a name="id784465"></a>
+=======
+<a name="id808788"></a>
+=======
+<a name="id796905"></a>
+=======
+<a name="id793628"></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.metafunctions.filter.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</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="id578214"></a><p class="title"><b>Table 1.73. Parameter</b></p>
<table class="table" summary="Parameter">
+=======
+<a name="id829270"></a><p class="title"><b>Table 1.73. Parameter</b></p>
+=======
+<a name="id792177"></a><p class="title"><b>Table 1.77. Parameter</b></p>
+=======
+<a name="id784553"></a><p class="title"><b>Table 1.77. Parameter</b></p>
+=======
+<a name="id808876"></a><p class="title"><b>Table 1.77. Parameter</b></p>
+=======
+<a name="id796993"></a><p class="title"><b>Table 1.77. Parameter</b></p>
+=======
+<a name="id793716"></a><p class="title"><b>Table 1.77. Parameter</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="Parameter">
+>>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
@@ -97,18 +180,40 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.filter.expression_semantics"></a><h6>
<a name="id578354"></a>
<a href="filter.html#fusion.algorithm.transformation.metafunctions.filter.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.filter.expression_semantics"></a><h6>
+<a name="id793829"></a>
+ <a class="link" href="filter.html#fusion.algorithm.transformation.metafunctions.filter.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::filter<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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
the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
@@ -117,15 +222,65 @@
<span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</span></tt>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.filter.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id578611"></a>
<a href="filter.html#fusion.algorithm.transformation.metafunctions.filter.complexity">Complexity</a>
+=======
+<a name="id829556"></a>
+=======
+<a name="id793105"></a>
+=======
+<a name="id785481"></a>
+=======
+<a name="id809189"></a>
+=======
+<a name="id797306"></a>
+=======
+<a name="id794029"></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.metafunctions.filter.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.filter.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id578640"></a>
<a href="filter.html#fusion.algorithm.transformation.metafunctions.filter.header">Header</a>
+=======
+<a name="id829578"></a>
+=======
+<a name="id793127"></a>
+=======
+<a name="id785502"></a>
+=======
+<a name="id809211"></a>
+=======
+<a name="id797328"></a>
+=======
+<a name="id794051"></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.metafunctions.filter.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">filter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -133,7 +288,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 © 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/metafunctions/filter_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<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.metafunctions.filter_if.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id578827"></a>
<a href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.description">Description</a>
+=======
+<a name="id829706"></a>
+=======
+<a name="id793255"></a>
+=======
+<a name="id785631"></a>
+=======
+<a name="id809339"></a>
+=======
+<a name="id797456"></a>
+=======
+<a name="id794179"></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.metafunctions.filter_if.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of filter_if given the sequence
@@ -39,8 +72,33 @@
Lambda Expression</a> predicate type.
</p>
<a name="fusion.algorithm.transformation.metafunctions.filter_if.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id578884"></a>
<a href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.synopsis">Synopsis</a>
+=======
+<a name="id829737"></a>
+=======
+<a name="id793286"></a>
+=======
+<a name="id785662"></a>
+=======
+<a name="id809370"></a>
+=======
+<a name="id797487"></a>
+=======
+<a name="id794210"></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.metafunctions.filter_if.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -52,8 +110,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id579002"></a><p class="title"><b>Table 1.74. Parameter</b></p>
<table class="table" summary="Parameter">
+=======
+<a name="id829822"></a><p class="title"><b>Table 1.74. Parameter</b></p>
+=======
+<a name="id793372"></a><p class="title"><b>Table 1.78. Parameter</b></p>
+=======
+<a name="id785747"></a><p class="title"><b>Table 1.78. Parameter</b></p>
+=======
+<a name="id809456"></a><p class="title"><b>Table 1.78. Parameter</b></p>
+=======
+<a name="id797572"></a><p class="title"><b>Table 1.78. Parameter</b></p>
+=======
+<a name="id794296"></a><p class="title"><b>Table 1.78. Parameter</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="Parameter">
+>>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
@@ -99,18 +182,40 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.filter_if.expression_semantics"></a><h6>
<a name="id579146"></a>
<a href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.filter_if.expression_semantics"></a><h6>
+<a name="id794413"></a>
+ <a class="link" href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::filter_if<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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
the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
@@ -118,15 +223,65 @@
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.metafunctions.filter_if.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id579326"></a>
<a href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.complexity">Complexity</a>
+=======
+<a name="id831489"></a>
+=======
+<a name="id793632"></a>
+=======
+<a name="id786008"></a>
+=======
+<a name="id809716"></a>
+=======
+<a name="id797833"></a>
+=======
+<a name="id794556"></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.metafunctions.filter_if.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.filter_if.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id579356"></a>
<a href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.header">Header</a>
+=======
+<a name="id831509"></a>
+=======
+<a name="id793651"></a>
+=======
+<a name="id786027"></a>
+=======
+<a name="id809735"></a>
+=======
+<a name="id797852"></a>
+=======
+<a name="id794575"></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.metafunctions.filter_if.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">filter_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -134,7 +289,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 © 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/metafunctions/insert.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="erase_key.html" title="erase_key">
<link rel="next" href="insert_range.html" title="insert_range">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.insert.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id587169"></a>
<a href="insert.html#fusion.algorithm.transformation.metafunctions.insert.description">Description</a>
+=======
+<a name="id837654"></a>
+=======
+<a name="id801855"></a>
+=======
+<a name="id794231"></a>
+=======
+<a name="id817422"></a>
+=======
+<a name="id807178"></a>
+=======
+<a name="id803901"></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.metafunctions.insert.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of insert, given the sequence,
position iterator and insertion types.
</p>
<a name="fusion.algorithm.transformation.metafunctions.insert.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id587219"></a>
<a href="insert.html#fusion.algorithm.transformation.metafunctions.insert.synopsis">Synopsis</a>
+=======
+<a name="id837682"></a>
+=======
+<a name="id801884"></a>
+=======
+<a name="id794260"></a>
+=======
+<a name="id817451"></a>
+=======
+<a name="id807207"></a>
+=======
+<a name="id803930"></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.metafunctions.insert.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -52,8 +110,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id587355"></a><p class="title"><b>Table 1.85. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id837783"></a><p class="title"><b>Table 1.85. Parameters</b></p>
+=======
+<a name="id802532"></a><p class="title"><b>Table 1.89. Parameters</b></p>
+=======
+<a name="id794907"></a><p class="title"><b>Table 1.89. Parameters</b></p>
+=======
+<a name="id817552"></a><p class="title"><b>Table 1.89. Parameters</b></p>
+=======
+<a name="id807307"></a><p class="title"><b>Table 1.89. Parameters</b></p>
+=======
+<a name="id804031"></a><p class="title"><b>Table 1.89. 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.metafunctions.insert.expression_semantics"></a><h6>
<a name="id587539"></a>
<a href="insert.html#fusion.algorithm.transformation.metafunctions.insert.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.insert.expression_semantics"></a><h6>
+<a name="id804181"></a>
+ <a class="link" href="insert.html#fusion.algorithm.transformation.metafunctions.insert.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::insert<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Position</span><span class="special">,</span> <span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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 with an
element of type <tt class="computeroutput"><span class="identifier">T</span></tt> inserted
@@ -130,15 +235,65 @@
in <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.insert.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id587707"></a>
<a href="insert.html#fusion.algorithm.transformation.metafunctions.insert.complexity">Complexity</a>
+=======
+<a name="id838045"></a>
+=======
+<a name="id802821"></a>
+=======
+<a name="id795196"></a>
+=======
+<a name="id817841"></a>
+=======
+<a name="id807597"></a>
+=======
+<a name="id804320"></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.metafunctions.insert.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.insert.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id587736"></a>
<a href="insert.html#fusion.algorithm.transformation.metafunctions.insert.header">Header</a>
+=======
+<a name="id838066"></a>
+=======
+<a name="id802842"></a>
+=======
+<a name="id795218"></a>
+=======
+<a name="id817863"></a>
+=======
+<a name="id807618"></a>
+=======
+<a name="id804341"></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.metafunctions.insert.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">insert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -146,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 © 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/metafunctions/insert_range.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<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.metafunctions.insert_range.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id587921"></a>
<a href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.description">Description</a>
+=======
+<a name="id838200"></a>
+=======
+<a name="id802976"></a>
+=======
+<a name="id795351"></a>
+=======
+<a name="id817996"></a>
+=======
+<a name="id807751"></a>
+=======
+<a name="id804475"></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.metafunctions.insert_range.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of insert_range, given the input
sequence, position iterator and insertion range types.
</p>
<a name="fusion.algorithm.transformation.metafunctions.insert_range.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id587970"></a>
<a href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.synopsis">Synopsis</a>
+=======
+<a name="id838226"></a>
+=======
+<a name="id803002"></a>
+=======
+<a name="id795378"></a>
+=======
+<a name="id818022"></a>
+=======
+<a name="id807778"></a>
+=======
+<a name="id804501"></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.metafunctions.insert_range.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -52,8 +110,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id588106"></a><p class="title"><b>Table 1.86. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id838324"></a><p class="title"><b>Table 1.86. Parameters</b></p>
+=======
+<a name="id803100"></a><p class="title"><b>Table 1.90. Parameters</b></p>
+=======
+<a name="id795476"></a><p class="title"><b>Table 1.90. Parameters</b></p>
+=======
+<a name="id818121"></a><p class="title"><b>Table 1.90. Parameters</b></p>
+=======
+<a name="id807876"></a><p class="title"><b>Table 1.90. Parameters</b></p>
+=======
+<a name="id804599"></a><p class="title"><b>Table 1.90. 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>
@@ -113,18 +196,40 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.insert_range.expression_semantics"></a><h6>
<a name="id588300"></a>
<a href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.insert_range.expression_semantics"></a><h6>
+<a name="id804754"></a>
+ <a class="link" href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::insert_range<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Position</span><span class="special">,</span> <span class="identifier">Range</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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 with the
elements of <tt class="computeroutput"><span class="identifier">Range</span></tt> inserted
@@ -132,15 +237,65 @@
into <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.insert_range.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id588469"></a>
<a href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.complexity">Complexity</a>
+=======
+<a name="id838590"></a>
+=======
+<a name="id803393"></a>
+=======
+<a name="id795769"></a>
+=======
+<a name="id818414"></a>
+=======
+<a name="id808169"></a>
+=======
+<a name="id804892"></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.metafunctions.insert_range.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.insert_range.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id588499"></a>
<a href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.header">Header</a>
+=======
+<a name="id838606"></a>
+=======
+<a name="id803410"></a>
+=======
+<a name="id795786"></a>
+=======
+<a name="id818430"></a>
+=======
+<a name="id808186"></a>
+=======
+<a name="id804909"></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.metafunctions.insert_range.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">insert_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -148,7 +303,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 © 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/metafunctions/join.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/join.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="insert_range.html" title="insert_range">
<link rel="next" href="zip.html" title="zip">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.join.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id588688"></a>
<a href="join.html#fusion.algorithm.transformation.metafunctions.join.description">Description</a>
+=======
+<a name="id840442"></a>
+=======
+<a name="id803538"></a>
+=======
+<a name="id795914"></a>
+=======
+<a name="id818559"></a>
+=======
+<a name="id808314"></a>
+=======
+<a name="id805037"></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.metafunctions.join.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result of joining 2 sequences, given the sequence types.
</p>
<a name="fusion.algorithm.transformation.metafunctions.join.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id588718"></a>
<a href="join.html#fusion.algorithm.transformation.metafunctions.join.synopsis">Synopsis</a>
+=======
+<a name="id840464"></a>
+=======
+<a name="id803560"></a>
+=======
+<a name="id795936"></a>
+=======
+<a name="id818580"></a>
+=======
+<a name="id808336"></a>
+=======
+<a name="id805059"></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.metafunctions.join.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">LhSequence</span><span class="special">,</span>
@@ -50,17 +108,59 @@
<span class="special">};</span>
</pre>
<a name="fusion.algorithm.transformation.metafunctions.join.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id588844"></a>
<a href="join.html#fusion.algorithm.transformation.metafunctions.join.expression_semantics">Expression
+=======
+<a name="id840555"></a>
+=======
+<a name="id803651"></a>
+=======
+<a name="id796027"></a>
+=======
+<a name="id818672"></a>
+=======
+<a name="id808427"></a>
+=======
+<a name="id805150"></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.metafunctions.join.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::join<span class="special"><</span><span class="identifier">LhSequence</span><span class="special">,</span> <span class="identifier">RhSequence</span><span class="special">>::</span><span class="identifier">type</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">LhSequence</span></code>
+ amd <code class="computeroutput"><span class="identifier">RhSequence</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
the elements of <tt class="computeroutput"><span class="identifier">LhSequence</span></tt>
@@ -68,15 +168,65 @@
The order of the elements in the 2 sequences is preserved.
</p>
<a name="fusion.algorithm.transformation.metafunctions.join.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id588991"></a>
<a href="join.html#fusion.algorithm.transformation.metafunctions.join.complexity">Complexity</a>
+=======
+<a name="id840651"></a>
+=======
+<a name="id803782"></a>
+=======
+<a name="id796158"></a>
+=======
+<a name="id818802"></a>
+=======
+<a name="id808558"></a>
+=======
+<a name="id805281"></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.metafunctions.join.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.join.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id589020"></a>
<a href="join.html#fusion.algorithm.transformation.metafunctions.join.header">Header</a>
+=======
+<a name="id840672"></a>
+=======
+<a name="id803804"></a>
+=======
+<a name="id796179"></a>
+=======
+<a name="id818824"></a>
+=======
+<a name="id808579"></a>
+=======
+<a name="id805303"></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.metafunctions.join.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">join</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -84,7 +234,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 © 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/metafunctions/pop_back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="zip.html" title="zip">
<link rel="next" href="pop_front.html" title="pop_front">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.pop_back.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id589911"></a>
<a href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.description">Description</a>
+=======
+<a name="id841304"></a>
+=======
+<a name="id804435"></a>
+=======
+<a name="id796810"></a>
+=======
+<a name="id819455"></a>
+=======
+<a name="id809279"></a>
+=======
+<a name="id806003"></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.metafunctions.pop_back.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of pop_back, given the input sequence
type.
</p>
<a name="fusion.algorithm.transformation.metafunctions.pop_back.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id589958"></a>
<a href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.synopsis">Synopsis</a>
+=======
+<a name="id841332"></a>
+=======
+<a name="id804464"></a>
+=======
+<a name="id796839"></a>
+=======
+<a name="id819484"></a>
+=======
+<a name="id809308"></a>
+=======
+<a name="id806031"></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.metafunctions.pop_back.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -50,8 +108,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id590058"></a><p class="title"><b>Table 1.87. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id841407"></a><p class="title"><b>Table 1.87. Parameters</b></p>
+=======
+<a name="id804538"></a><p class="title"><b>Table 1.91. Parameters</b></p>
+=======
+<a name="id796914"></a><p class="title"><b>Table 1.91. Parameters</b></p>
+=======
+<a name="id820720"></a><p class="title"><b>Table 1.91. Parameters</b></p>
+=======
+<a name="id809383"></a><p class="title"><b>Table 1.91. Parameters</b></p>
+=======
+<a name="id806106"></a><p class="title"><b>Table 1.91. 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>
@@ -83,41 +166,113 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.pop_back.expression_semantics"></a><h6>
<a name="id590163"></a>
<a href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.pop_back.expression_semantics"></a><h6>
+<a name="id806189"></a>
+ <a class="link" href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::pop_back<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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 with all
the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
except the last element.
</p>
<a name="fusion.algorithm.transformation.metafunctions.pop_back.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id590286"></a>
<a href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.complexity">Complexity</a>
+=======
+<a name="id841568"></a>
+=======
+<a name="id805887"></a>
+=======
+<a name="id798263"></a>
+=======
+<a name="id820908"></a>
+=======
+<a name="id809571"></a>
+=======
+<a name="id806294"></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.metafunctions.pop_back.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.pop_back.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id590316"></a>
<a href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.header">Header</a>
+=======
+<a name="id841587"></a>
+=======
+<a name="id805907"></a>
+=======
+<a name="id798282"></a>
+=======
+<a name="id820927"></a>
+=======
+<a name="id809590"></a>
+=======
+<a name="id806313"></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.metafunctions.pop_back.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
-<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">tranformation</span><span class="special">/</span><span class="identifier">pop_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">pop_back</span><span class="special">.</span><span class="identifier">hpp</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 © 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/metafunctions/pop_front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="pop_back.html" title="pop_back">
<link rel="next" href="push_back.html" title="push_back">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.pop_front.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id590503"></a>
<a href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.description">Description</a>
+=======
+<a name="id841715"></a>
+=======
+<a name="id806035"></a>
+=======
+<a name="id798411"></a>
+=======
+<a name="id821056"></a>
+=======
+<a name="id809719"></a>
+=======
+<a name="id806442"></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.metafunctions.pop_front.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of pop_front, given the input sequence
type.
</p>
<a name="fusion.algorithm.transformation.metafunctions.pop_front.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id590551"></a>
<a href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.synopsis">Synopsis</a>
+=======
+<a name="id841742"></a>
+=======
+<a name="id806061"></a>
+=======
+<a name="id798437"></a>
+=======
+<a name="id821082"></a>
+=======
+<a name="id809745"></a>
+=======
+<a name="id806468"></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.metafunctions.pop_front.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -50,8 +108,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id590651"></a><p class="title"><b>Table 1.88. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id841814"></a><p class="title"><b>Table 1.88. Parameters</b></p>
+=======
+<a name="id806133"></a><p class="title"><b>Table 1.92. Parameters</b></p>
+=======
+<a name="id798509"></a><p class="title"><b>Table 1.92. Parameters</b></p>
+=======
+<a name="id821154"></a><p class="title"><b>Table 1.92. Parameters</b></p>
+=======
+<a name="id809817"></a><p class="title"><b>Table 1.92. Parameters</b></p>
+=======
+<a name="id806540"></a><p class="title"><b>Table 1.92. 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>
@@ -83,37 +166,88 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.pop_front.expression_semantics"></a><h6>
<a name="id590754"></a>
<a href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.pop_front.expression_semantics"></a><h6>
+<a name="id806623"></a>
+ <a class="link" href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::pop_front<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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 with all
the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
except the first element.
</p>
<a name="fusion.algorithm.transformation.metafunctions.pop_front.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id590877"></a>
<a href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.complexity">Complexity</a>
+=======
+<a name="id841974"></a>
+=======
+<a name="id806322"></a>
+=======
+<a name="id798698"></a>
+=======
+<a name="id821342"></a>
+=======
+<a name="id810005"></a>
+=======
+<a name="id806729"></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.metafunctions.pop_front.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
-<p>
- /algorithm/transformation/pop_front.hpp>
- </p>
+<a name="fusion.algorithm.transformation.metafunctions.pop_front.header"></a><h6>
+<a name="id806748"></a>
+ <a class="link" href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">pop_front</span><span class="special">.</span><span class="identifier">hpp</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 © 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/metafunctions/push_back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="pop_front.html" title="pop_front">
<link rel="next" href="push_front.html" title="push_front">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.push_back.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id590932"></a>
<a href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.description">Description</a>
+=======
+<a name="id842006"></a>
+=======
+<a name="id806469"></a>
+=======
+<a name="id798845"></a>
+=======
+<a name="id821490"></a>
+=======
+<a name="id810153"></a>
+=======
+<a name="id806876"></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.metafunctions.push_back.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of push_back, given the types of
the input sequence and element to push.
</p>
<a name="fusion.algorithm.transformation.metafunctions.push_back.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id590982"></a>
<a href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.synopsis">Synopsis</a>
+=======
+<a name="id842032"></a>
+=======
+<a name="id806496"></a>
+=======
+<a name="id798872"></a>
+=======
+<a name="id821516"></a>
+=======
+<a name="id810179"></a>
+=======
+<a name="id806903"></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.metafunctions.push_back.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</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="id591099"></a><p class="title"><b>Table 1.89. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id842117"></a><p class="title"><b>Table 1.89. Parameters</b></p>
+=======
+<a name="id806581"></a><p class="title"><b>Table 1.93. Parameters</b></p>
+=======
+<a name="id798957"></a><p class="title"><b>Table 1.93. Parameters</b></p>
+=======
+<a name="id821602"></a><p class="title"><b>Table 1.93. Parameters</b></p>
+=======
+<a name="id810265"></a><p class="title"><b>Table 1.93. Parameters</b></p>
+=======
+<a name="id806988"></a><p class="title"><b>Table 1.93. 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,18 +180,40 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.push_back.expression_semantics"></a><h6>
<a name="id591239"></a>
<a href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.push_back.expression_semantics"></a><h6>
+<a name="id807102"></a>
+ <a class="link" href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::push_back<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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 with the
elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
@@ -116,19 +221,48 @@
added to the end.
</p>
<a name="fusion.algorithm.transformation.metafunctions.push_back.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id591384"></a>
<a href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.complexity">Complexity</a>
+=======
+<a name="id842324"></a>
+=======
+<a name="id806815"></a>
+=======
+<a name="id799191"></a>
+=======
+<a name="id821836"></a>
+=======
+<a name="id810499"></a>
+=======
+<a name="id807222"></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.metafunctions.push_back.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
-<p>
- /algorithm/transformation/push_back.hpp>
- </p>
+<a name="fusion.algorithm.transformation.metafunctions.push_back.header"></a><h6>
+<a name="id807241"></a>
+ <a class="link" href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">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">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">push_back</span><span class="special">.</span><span class="identifier">hpp</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 © 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/metafunctions/push_front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="push_back.html" title="push_back">
<link rel="next" href="../../../tuple.html" title="Tuple">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.push_front.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id591438"></a>
<a href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.description">Description</a>
+=======
+<a name="id842360"></a>
+=======
+<a name="id806967"></a>
+=======
+<a name="id799343"></a>
+=======
+<a name="id821988"></a>
+=======
+<a name="id810651"></a>
+=======
+<a name="id807374"></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.metafunctions.push_front.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of push_front, given the types
of the input sequence and element to push.
</p>
<a name="fusion.algorithm.transformation.metafunctions.push_front.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id591488"></a>
<a href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.synopsis">Synopsis</a>
+=======
+<a name="id842386"></a>
+=======
+<a name="id806994"></a>
+=======
+<a name="id799370"></a>
+=======
+<a name="id822014"></a>
+=======
+<a name="id810677"></a>
+=======
+<a name="id807401"></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.metafunctions.push_front.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</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="id591605"></a><p class="title"><b>Table 1.90. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id842471"></a><p class="title"><b>Table 1.90. Parameters</b></p>
+=======
+<a name="id807079"></a><p class="title"><b>Table 1.94. Parameters</b></p>
+=======
+<a name="id799455"></a><p class="title"><b>Table 1.94. Parameters</b></p>
+=======
+<a name="id822100"></a><p class="title"><b>Table 1.94. Parameters</b></p>
+=======
+<a name="id810763"></a><p class="title"><b>Table 1.94. Parameters</b></p>
+=======
+<a name="id807486"></a><p class="title"><b>Table 1.94. 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,18 +180,40 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.push_front.expression_semantics"></a><h6>
<a name="id591745"></a>
<a href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.push_front.expression_semantics"></a><h6>
+<a name="id807600"></a>
+ <a class="link" href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::push_front<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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 with the
elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
@@ -116,19 +221,48 @@
added to the beginning.
</p>
<a name="fusion.algorithm.transformation.metafunctions.push_front.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id591890"></a>
<a href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.complexity">Complexity</a>
+=======
+<a name="id843841"></a>
+=======
+<a name="id807315"></a>
+=======
+<a name="id799691"></a>
+=======
+<a name="id822336"></a>
+=======
+<a name="id810999"></a>
+=======
+<a name="id807722"></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.metafunctions.push_front.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
-<p>
- /algorithm/transformation/push_front.hpp>
- </p>
+<a name="fusion.algorithm.transformation.metafunctions.push_front.header"></a><h6>
+<a name="id807741"></a>
+ <a class="link" href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">push_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">push_front</span><span class="special">.</span><span class="identifier">hpp</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 © 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/metafunctions/remove.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove.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>remove</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="replace_if.html" title="replace_if">
<link rel="next" href="remove_if.html" title="remove_if">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.remove.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id582961"></a>
<a href="remove.html#fusion.algorithm.transformation.metafunctions.remove.description">Description</a>
+=======
+<a name="id834671"></a>
+=======
+<a name="id798411"></a>
+=======
+<a name="id790787"></a>
+=======
+<a name="id812311"></a>
+=======
+<a name="id802066"></a>
+=======
+<a name="id798789"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove.html#fusion.algorithm.transformation.metafunctions.remove.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of remove, given the sequence and
removal types.
</p>
<a name="fusion.algorithm.transformation.metafunctions.remove.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id583010"></a>
<a href="remove.html#fusion.algorithm.transformation.metafunctions.remove.synopsis">Synopsis</a>
+=======
+<a name="id834701"></a>
+=======
+<a name="id798441"></a>
+=======
+<a name="id790817"></a>
+=======
+<a name="id812341"></a>
+=======
+<a name="id802096"></a>
+=======
+<a name="id798819"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove.html#fusion.algorithm.transformation.metafunctions.remove.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</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="id583126"></a><p class="title"><b>Table 1.79. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id834789"></a><p class="title"><b>Table 1.79. Parameters</b></p>
+=======
+<a name="id798529"></a><p class="title"><b>Table 1.83. Parameters</b></p>
+=======
+<a name="id790905"></a><p class="title"><b>Table 1.83. Parameters</b></p>
+=======
+<a name="id812428"></a><p class="title"><b>Table 1.83. Parameters</b></p>
+=======
+<a name="id802184"></a><p class="title"><b>Table 1.83. Parameters</b></p>
+=======
+<a name="id798907"></a><p class="title"><b>Table 1.83. 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,18 +180,40 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.remove.expression_semantics"></a><h6>
<a name="id583263"></a>
<a href="remove.html#fusion.algorithm.transformation.metafunctions.remove.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.remove.expression_semantics"></a><h6>
+<a name="id799020"></a>
+ <a class="link" href="remove.html#fusion.algorithm.transformation.metafunctions.remove.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::remove<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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
the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
@@ -117,15 +222,65 @@
<span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</span></tt>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.remove.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id583520"></a>
<a href="remove.html#fusion.algorithm.transformation.metafunctions.remove.complexity">Complexity</a>
+=======
+<a name="id835077"></a>
+=======
+<a name="id798845"></a>
+=======
+<a name="id791220"></a>
+=======
+<a name="id812744"></a>
+=======
+<a name="id802499"></a>
+=======
+<a name="id799223"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove.html#fusion.algorithm.transformation.metafunctions.remove.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.remove.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id583549"></a>
<a href="remove.html#fusion.algorithm.transformation.metafunctions.remove.header">Header</a>
+=======
+<a name="id835098"></a>
+=======
+<a name="id798866"></a>
+=======
+<a name="id791242"></a>
+=======
+<a name="id812766"></a>
+=======
+<a name="id802521"></a>
+=======
+<a name="id799244"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove.html#fusion.algorithm.transformation.metafunctions.remove.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">remove</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">remove</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -133,7 +288,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 © 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/metafunctions/remove_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove_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>remove_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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="remove.html" title="remove">
<link rel="next" href="reverse.html" title="reverse">
@@ -30,8 +38,33 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.remove_if.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id583737"></a>
<a href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.description">Description</a>
+=======
+<a name="id835227"></a>
+=======
+<a name="id798995"></a>
+=======
+<a name="id791370"></a>
+=======
+<a name="id812894"></a>
+=======
+<a name="id802649"></a>
+=======
+<a name="id799373"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of remove_if, given the input sequence
@@ -39,8 +72,33 @@
Lambda Expression</a> predicate types.
</p>
<a name="fusion.algorithm.transformation.metafunctions.remove_if.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id583793"></a>
<a href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.synopsis">Synopsis</a>
+=======
+<a name="id835258"></a>
+=======
+<a name="id799026"></a>
+=======
+<a name="id791402"></a>
+=======
+<a name="id812925"></a>
+=======
+<a name="id802681"></a>
+=======
+<a name="id799404"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -52,8 +110,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id583911"></a><p class="title"><b>Table 1.80. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id835343"></a><p class="title"><b>Table 1.80. Parameters</b></p>
+=======
+<a name="id799111"></a><p class="title"><b>Table 1.84. Parameters</b></p>
+=======
+<a name="id791487"></a><p class="title"><b>Table 1.84. Parameters</b></p>
+=======
+<a name="id813010"></a><p class="title"><b>Table 1.84. Parameters</b></p>
+=======
+<a name="id802766"></a><p class="title"><b>Table 1.84. Parameters</b></p>
+=======
+<a name="id799489"></a><p class="title"><b>Table 1.84. 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,18 +182,40 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.remove_if.expression_semantics"></a><h6>
<a name="id584087"></a>
<a href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.remove_if.expression_semantics"></a><h6>
+<a name="id801062"></a>
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::remove_if<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">>::</span><span class="identifier">type</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">Sequence</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
the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
@@ -118,15 +223,65 @@
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">false_</span></tt>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.remove_if.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id584268"></a>
<a href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.complexity">Complexity</a>
+=======
+<a name="id835598"></a>
+=======
+<a name="id799393"></a>
+=======
+<a name="id791769"></a>
+=======
+<a name="id814727"></a>
+=======
+<a name="id804482"></a>
+=======
+<a name="id801205"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.remove_if.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id584298"></a>
<a href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.header">Header</a>
+=======
+<a name="id835617"></a>
+=======
+<a name="id799412"></a>
+=======
+<a name="id792130"></a>
+=======
+<a name="id814746"></a>
+=======
+<a name="id804501"></a>
+=======
+<a name="id801224"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">remove_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">remove_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -134,7 +289,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 © 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/metafunctions/replace.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace.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>replace</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="transform.html" title="transform">
<link rel="next" href="replace_if.html" title="replace_if">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.replace.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id581560"></a>
<a href="replace.html#fusion.algorithm.transformation.metafunctions.replace.description">Description</a>
+=======
+<a name="id833067"></a>
+=======
+<a name="id797423"></a>
+=======
+<a name="id789798"></a>
+=======
+<a name="id811322"></a>
+=======
+<a name="id801077"></a>
+=======
+<a name="id797801"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace.html#fusion.algorithm.transformation.metafunctions.replace.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of replace, given the types of
the input sequence and element to replace.
</p>
<a name="fusion.algorithm.transformation.metafunctions.replace.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id581610"></a>
<a href="replace.html#fusion.algorithm.transformation.metafunctions.replace.synopsis">Synopsis</a>
+=======
+<a name="id833096"></a>
+=======
+<a name="id797451"></a>
+=======
+<a name="id789827"></a>
+=======
+<a name="id811351"></a>
+=======
+<a name="id801106"></a>
+=======
+<a name="id797829"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace.html#fusion.algorithm.transformation.metafunctions.replace.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</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="id581727"></a><p class="title"><b>Table 1.77. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id833184"></a><p class="title"><b>Table 1.77. Parameters</b></p>
+=======
+<a name="id797539"></a><p class="title"><b>Table 1.81. Parameters</b></p>
+=======
+<a name="id789915"></a><p class="title"><b>Table 1.81. Parameters</b></p>
+=======
+<a name="id811438"></a><p class="title"><b>Table 1.81. Parameters</b></p>
+=======
+<a name="id801194"></a><p class="title"><b>Table 1.81. Parameters</b></p>
+=======
+<a name="id797917"></a><p class="title"><b>Table 1.81. 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.transformation.metafunctions.replace.expression_semantics"></a><h6>
<a name="id581868"></a>
<a href="replace.html#fusion.algorithm.transformation.metafunctions.replace.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.replace.expression_semantics"></a><h6>
+<a name="id798030"></a>
+ <a class="link" href="replace.html#fusion.algorithm.transformation.metafunctions.replace.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::replace<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</span>
@@ -114,15 +203,65 @@
<a href="../functions/replace.html" title="replace"><tt class="computeroutput"><span class="identifier">replace</span></tt></a>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.replace.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id582006"></a>
<a href="replace.html#fusion.algorithm.transformation.metafunctions.replace.complexity">Complexity</a>
+=======
+<a name="id833383"></a>
+=======
+<a name="id797738"></a>
+=======
+<a name="id790114"></a>
+=======
+<a name="id811638"></a>
+=======
+<a name="id801393"></a>
+=======
+<a name="id798116"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace.html#fusion.algorithm.transformation.metafunctions.replace.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.replace.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id582036"></a>
<a href="replace.html#fusion.algorithm.transformation.metafunctions.replace.header">Header</a>
+=======
+<a name="id833402"></a>
+=======
+<a name="id797757"></a>
+=======
+<a name="id790133"></a>
+=======
+<a name="id811657"></a>
+=======
+<a name="id801412"></a>
+=======
+<a name="id798135"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace.html#fusion.algorithm.transformation.metafunctions.replace.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">replace</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">replace</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -130,7 +269,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 © 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/metafunctions/replace_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace_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>replace_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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="replace.html" title="replace">
<link rel="next" href="remove.html" title="remove">
@@ -30,8 +38,33 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.replace_if.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id582222"></a>
<a href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.description">Description</a>
+=======
+<a name="id833535"></a>
+=======
+<a name="id797891"></a>
+=======
+<a name="id790266"></a>
+=======
+<a name="id811790"></a>
+=======
+<a name="id801545"></a>
+=======
+<a name="id798269"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of replace_if, given the types
@@ -40,8 +73,33 @@
Function Object</a> predicate and replacement object.
</p>
<a name="fusion.algorithm.transformation.metafunctions.replace_if.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id582281"></a>
<a href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.synopsis">Synopsis</a>
+=======
+<a name="id833567"></a>
+=======
+<a name="id797922"></a>
+=======
+<a name="id790298"></a>
+=======
+<a name="id811821"></a>
+=======
+<a name="id801577"></a>
+=======
+<a name="id798300"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -53,8 +111,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id582414"></a><p class="title"><b>Table 1.78. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id833664"></a><p class="title"><b>Table 1.78. Parameters</b></p>
+=======
+<a name="id798019"></a><p class="title"><b>Table 1.82. Parameters</b></p>
+=======
+<a name="id790395"></a><p class="title"><b>Table 1.82. Parameters</b></p>
+=======
+<a name="id811918"></a><p class="title"><b>Table 1.82. Parameters</b></p>
+=======
+<a name="id801674"></a><p class="title"><b>Table 1.82. Parameters</b></p>
+=======
+<a name="id798397"></a><p class="title"><b>Table 1.82. 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>
@@ -112,9 +195,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.replace_if.expression_semantics"></a><h6>
<a name="id582597"></a>
<a href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.replace_if.expression_semantics"></a><h6>
+<a name="id798546"></a>
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::replace_if<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">F</span><span class="special">,</span><span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</span>
@@ -129,15 +218,65 @@
<a href="../functions/replace_if.html" title="replace_if"><tt class="computeroutput"><span class="identifier">replace_if</span></tt></a>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.replace_if.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id582746"></a>
<a href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.complexity">Complexity</a>
+=======
+<a name="id834524"></a>
+=======
+<a name="id798264"></a>
+=======
+<a name="id790640"></a>
+=======
+<a name="id812163"></a>
+=======
+<a name="id801919"></a>
+=======
+<a name="id798642"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.replace_if.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id582775"></a>
<a href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.header">Header</a>
+=======
+<a name="id834543"></a>
+=======
+<a name="id798283"></a>
+=======
+<a name="id790659"></a>
+=======
+<a name="id812182"></a>
+=======
+<a name="id801938"></a>
+=======
+<a name="id798661"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">replace_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">replace_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -145,7 +284,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 © 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/metafunctions/reverse.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/reverse.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>reverse</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="remove_if.html" title="remove_if">
<link rel="next" href="clear.html" title="clear">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.reverse.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id584483"></a>
<a href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.description">Description</a>
+=======
+<a name="id835745"></a>
+=======
+<a name="id799882"></a>
+=======
+<a name="id792258"></a>
+=======
+<a name="id814874"></a>
+=======
+<a name="id804630"></a>
+=======
+<a name="id801353"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of reverse, given the input sequence
type.
</p>
<a name="fusion.algorithm.transformation.metafunctions.reverse.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id584530"></a>
<a href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.synopsis">Synopsis</a>
+=======
+<a name="id835774"></a>
+=======
+<a name="id799911"></a>
+=======
+<a name="id792287"></a>
+=======
+<a name="id814903"></a>
+=======
+<a name="id804658"></a>
+=======
+<a name="id801382"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -50,8 +108,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id584629"></a><p class="title"><b>Table 1.81. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id835848"></a><p class="title"><b>Table 1.81. Parameters</b></p>
+=======
+<a name="id799986"></a><p class="title"><b>Table 1.85. Parameters</b></p>
+=======
+<a name="id792361"></a><p class="title"><b>Table 1.85. Parameters</b></p>
+=======
+<a name="id814977"></a><p class="title"><b>Table 1.85. Parameters</b></p>
+=======
+<a name="id804733"></a><p class="title"><b>Table 1.85. Parameters</b></p>
+=======
+<a name="id801456"></a><p class="title"><b>Table 1.85. 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>
@@ -83,32 +166,109 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.reverse.expression_semantics"></a><h6>
<a name="id584731"></a>
<a href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.reverse.expression_semantics"></a><h6>
+<a name="id801539"></a>
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::reverse<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
</pre>
<p>
+<<<<<<< .working
<span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
Sequence">Bidirectional
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/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> if <code class="computeroutput"><span class="identifier">Sequence</span></code>
+ is a <a class="link" href="../../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> else, <a class="link" href="../../../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+ Access Sequence</a> if <code class="computeroutput"><span class="identifier">Sequence</span></code>
+ is a <a class="link" href="../../../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+ Access 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">Sequence</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 with the
elements in the reverse order to <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.reverse.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id584854"></a>
<a href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.complexity">Complexity</a>
+=======
+<a name="id836008"></a>
+=======
+<a name="id800173"></a>
+=======
+<a name="id792549"></a>
+=======
+<a name="id815193"></a>
+=======
+<a name="id804949"></a>
+=======
+<a name="id801672"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.reverse.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id584884"></a>
<a href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.header">Header</a>
+=======
+<a name="id836027"></a>
+=======
+<a name="id800192"></a>
+=======
+<a name="id792568"></a>
+=======
+<a name="id815213"></a>
+=======
+<a name="id804968"></a>
+=======
+<a name="id801691"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">reverse</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">reverse</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -116,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 © 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/metafunctions/transform.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/transform.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/transform.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>transform</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="filter_if.html" title="filter_if">
<link rel="next" href="replace.html" title="replace">
@@ -30,8 +38,33 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.transform.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id579541"></a>
<a href="transform.html#fusion.algorithm.transformation.metafunctions.transform.description">Description</a>
+=======
+<a name="id831637"></a>
+=======
+<a name="id793780"></a>
+=======
+<a name="id786155"></a>
+=======
+<a name="id809864"></a>
+=======
+<a name="id797980"></a>
+=======
+<a name="id794704"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.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 @@
of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.transform.unary_version_synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id579655"></a>
<a href="transform.html#fusion.algorithm.transformation.metafunctions.transform.unary_version_synopsis">Unary
+=======
+<a name="id831708"></a>
+=======
+<a name="id793850"></a>
+=======
+<a name="id786226"></a>
+=======
+<a name="id809934"></a>
+=======
+<a name="id798051"></a>
+=======
+<a name="id794774"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.unary_version_synopsis">Unary
+>>>>>>> .merge-right.r57125
version synopsis</a>
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
@@ -53,8 +111,33 @@
<span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</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="id579855"></a><p class="title"><b>Table 1.75. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id831849"></a><p class="title"><b>Table 1.75. Parameters</b></p>
+=======
+<a name="id793992"></a><p class="title"><b>Table 1.79. Parameters</b></p>
+=======
+<a name="id786368"></a><p class="title"><b>Table 1.79. Parameters</b></p>
+=======
+<a name="id810076"></a><p class="title"><b>Table 1.79. Parameters</b></p>
+=======
+<a name="id798193"></a><p class="title"><b>Table 1.79. Parameters</b></p>
+=======
+<a name="id794916"></a><p class="title"><b>Table 1.79. 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,26 +185,73 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.algorithm.transformation.metafunctions.transform.expression_semantics"></a><h6>
<a name="id580126"></a>
<a href="transform.html#fusion.algorithm.transformation.metafunctions.transform.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.transform.expression_semantics"></a><h6>
+<a name="id795119"></a>
+ <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">transform<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</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">Sequence</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
the return values of <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
within <tt class="computeroutput"><span class="identifier">seq</span></tt>.
</p>
<a name="fusion.algorithm.transformation.metafunctions.transform.binary_version_synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id580282"></a>
<a href="transform.html#fusion.algorithm.transformation.metafunctions.transform.binary_version_synopsis">Binary
+=======
+<a name="id832152"></a>
+=======
+<a name="id794322"></a>
+=======
+<a name="id786698"></a>
+=======
+<a name="id810406"></a>
+=======
+<a name="id798523"></a>
+=======
+<a name="id795246"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.binary_version_synopsis">Binary
+>>>>>>> .merge-right.r57125
version synopsis</a>
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
@@ -133,8 +263,33 @@
<span class="identifier">Sequence1</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">Sequence2</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq2</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="id580547"></a><p class="title"><b>Table 1.76. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id832341"></a><p class="title"><b>Table 1.76. Parameters</b></p>
+=======
+<a name="id794512"></a><p class="title"><b>Table 1.80. Parameters</b></p>
+=======
+<a name="id786887"></a><p class="title"><b>Table 1.80. Parameters</b></p>
+=======
+<a name="id810596"></a><p class="title"><b>Table 1.80. Parameters</b></p>
+=======
+<a name="id798712"></a><p class="title"><b>Table 1.80. Parameters</b></p>
+=======
+<a name="id795436"></a><p class="title"><b>Table 1.80. 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>
@@ -207,22 +362,97 @@
within <tt class="computeroutput"><span class="identifier">seq1</span></tt> and <tt class="computeroutput"><span class="identifier">seq2</span></tt> respectively.
</p>
<a name="fusion.algorithm.transformation.metafunctions.transform.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id581034"></a>
<a href="transform.html#fusion.algorithm.transformation.metafunctions.transform.complexity">Complexity</a>
+=======
+<a name="id832692"></a>
+=======
+<a name="id794862"></a>
+=======
+<a name="id787238"></a>
+=======
+<a name="id810946"></a>
+=======
+<a name="id800702"></a>
+=======
+<a name="id797425"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant. Returns a view which is lazily evaluated.
</p>
<a name="fusion.algorithm.transformation.metafunctions.transform.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id581061"></a>
<a href="transform.html#fusion.algorithm.transformation.metafunctions.transform.header">Header</a>
+=======
+<a name="id832711"></a>
+=======
+<a name="id794881"></a>
+=======
+<a name="id787257"></a>
+=======
+<a name="id810965"></a>
+=======
+<a name="id800721"></a>
+=======
+<a name="id797444"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">transform</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">transform</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.algorithm.transformation.metafunctions.transform.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id581227"></a>
<a href="transform.html#fusion.algorithm.transformation.metafunctions.transform.example">Example</a>
+=======
+<a name="id832831"></a>
+=======
+<a name="id795001"></a>
+=======
+<a name="id787377"></a>
+=======
+<a name="id811086"></a>
+=======
+<a name="id800841"></a>
+=======
+<a name="id797564"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">triple</span>
<span class="special">{</span>
@@ -239,7 +469,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 © 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/metafunctions/zip.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/zip.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/zip.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>zip</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="join.html" title="join">
<link rel="next" href="pop_back.html" title="pop_back">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.algorithm.transformation.metafunctions.zip.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id589205"></a>
<a href="zip.html#fusion.algorithm.transformation.metafunctions.zip.description">Description</a>
+=======
+<a name="id840803"></a>
+=======
+<a name="id803934"></a>
+=======
+<a name="id796310"></a>
+=======
+<a name="id818955"></a>
+=======
+<a name="id808710"></a>
+=======
+<a name="id805433"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="zip.html#fusion.algorithm.transformation.metafunctions.zip.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Zips sequences together to form a single sequence, whos members are tuples
of the members of the component sequences.
</p>
<a name="fusion.algorithm.transformation.metafunctions.zip.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id589236"></a>
<a href="zip.html#fusion.algorithm.transformation.metafunctions.zip.synopsis">Synopsis</a>
+=======
+<a name="id840825"></a>
+=======
+<a name="id803956"></a>
+=======
+<a name="id796332"></a>
+=======
+<a name="id818976"></a>
+=======
+<a name="id808732"></a>
+=======
+<a name="id805455"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="zip.html#fusion.algorithm.transformation.metafunctions.zip.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Sequence1</span><span class="special">,</span>
@@ -53,8 +111,33 @@
<span class="special">};</span>
</pre>
<a name="fusion.algorithm.transformation.metafunctions.zip.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id589385"></a>
<a href="zip.html#fusion.algorithm.transformation.metafunctions.zip.expression_semantics">Expression
+=======
+<a name="id840934"></a>
+=======
+<a name="id804065"></a>
+=======
+<a name="id796441"></a>
+=======
+<a name="id819086"></a>
+=======
+<a name="id808841"></a>
+=======
+<a name="id805564"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="zip.html#fusion.algorithm.transformation.metafunctions.zip.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting">result_of::zip<span class="special"><</span><span class="identifier">Sequence1</span><span class="special">,</span> <span class="identifier">Sequence2</span><span class="special">,</span> <span class="special">...</span> <span class="identifier">SequenceN</span><span class="special">>::</span><span class="identifier">type</span>
@@ -75,15 +158,65 @@
<span class="char">'c'</span><span class="special">))</span></tt>
</p>
<a name="fusion.algorithm.transformation.metafunctions.zip.complexity"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id589698"></a>
<a href="zip.html#fusion.algorithm.transformation.metafunctions.zip.complexity">Complexity</a>
+=======
+<a name="id841154"></a>
+=======
+<a name="id804285"></a>
+=======
+<a name="id796660"></a>
+=======
+<a name="id819305"></a>
+=======
+<a name="id809061"></a>
+=======
+<a name="id805784"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="zip.html#fusion.algorithm.transformation.metafunctions.zip.complexity">Complexity</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constant.
</p>
<a name="fusion.algorithm.transformation.metafunctions.zip.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id589725"></a>
<a href="zip.html#fusion.algorithm.transformation.metafunctions.zip.header">Header</a>
+=======
+<a name="id841175"></a>
+=======
+<a name="id804306"></a>
+=======
+<a name="id796682"></a>
+=======
+<a name="id819327"></a>
+=======
+<a name="id809082"></a>
+=======
+<a name="id805805"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="zip.html#fusion.algorithm.transformation.metafunctions.zip.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">zip</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">zip</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -91,7 +224,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 © 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/change_log.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/change_log.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/change_log.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>Change log</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="notes.html" title="Notes">
Modified: branches/release/libs/fusion/doc/html/fusion/container.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container.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>Container</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="sequence/operator/comparison/greater_than_equal.html" title="greater
@@ -52,10 +56,17 @@
actually hold heterogenously typed data; unlike Views.
These containers are more or less counterparts of those in STL.
</p>
+<<<<<<< .working
<a name="fusion.container.header"></a><h3>
<a name="id478616"></a>
<a href="container.html#fusion.container.header">Header</a>
</h3>
+=======
+<a name="fusion.container.header"></a><h4>
+<a name="id684983"></a>
+ <a class="link" href="container.html#fusion.container.header">Header</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">container</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
Modified: branches/release/libs/fusion/doc/html/fusion/container/cons.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/cons.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/cons.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>cons</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="../container.html" title="Container">
<link rel="previous" href="vector.html" title="vector">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="vector.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.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="list.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="id481484"></a>
<a href="cons.html#fusion.container.cons.description">Description</a>
</h4>
+=======
+<div class="section" title="cons">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.container.cons"></a><a class="link" href="cons.html" title="cons">cons</a>
+</h3></div></div></div>
+<a name="fusion.container.cons.description"></a><h5>
+<a name="id687663"></a>
+ <a class="link" href="cons.html#fusion.container.cons.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
<tt class="computeroutput"><span class="identifier">cons</span></tt> is a simple <a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward
@@ -45,24 +60,45 @@
each element is peculiarly constant (see <a href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive
Inlined Functions</a>).
</p>
+<<<<<<< .working
<a name="fusion.container.cons.header"></a><h4>
<a name="id481626"></a>
<a href="cons.html#fusion.container.cons.header">Header</a>
</h4>
+=======
+<a name="fusion.container.cons.header"></a><h5>
+<a name="id687744"></a>
+ <a class="link" href="cons.html#fusion.container.cons.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">/</span><span class="identifier">cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.container.cons.synopsis"></a><h4>
<a name="id481791"></a>
<a href="cons.html#fusion.container.cons.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.container.cons.synopsis"></a><h5>
+<a name="id687860"></a>
+ <a class="link" href="cons.html#fusion.container.cons.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Car</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Cdr</span> <span class="special">=</span> <span class="identifier">nil</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">cons</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.container.cons.template_parameters"></a><h4>
<a name="id481898"></a>
<a href="cons.html#fusion.container.cons.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.container.cons.template_parameters"></a><h5>
+<a name="id687934"></a>
+ <a class="link" href="cons.html#fusion.container.cons.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -104,6 +140,7 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.container.cons.model_of"></a><h4>
<a name="id482046"></a>
<a href="cons.html#fusion.container.cons.model_of">Model of</a>
@@ -111,6 +148,14 @@
<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward Sequence</a></li></ul></div>
<div class="variablelist">
+=======
+<a name="fusion.container.cons.model_of"></a><h5>
+<a name="id688054"></a>
+ <a class="link" href="cons.html#fusion.container.cons.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>
+<div class="variablelist" title="Notation">
+>>>>>>> .merge-right.r57125
<p class="title"><b>Notation</b></p>
<dl>
<dt><span class="term"><tt class="computeroutput"><span class="identifier">nil</span></tt></span></dt>
@@ -146,10 +191,17 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.container.cons.expression_semantics"></a><h4>
<a name="id482328"></a>
<a href="cons.html#fusion.container.cons.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.container.cons.expression_semantics"></a><h5>
+<a name="id688258"></a>
+ <a class="link" href="cons.html#fusion.container.cons.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Semantics of an expression is defined only where it differs from, or is not
defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
@@ -248,11 +300,20 @@
Access Sequence">Random
Access Sequence</a> requirement). The runtime complexity of at is constant (see <a href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive
Inlined Functions</a>).
+<<<<<<< .working
</p></div>
<a name="fusion.container.cons.example"></a><h4>
<a name="id482977"></a>
<a href="cons.html#fusion.container.cons.example">Example</a>
</h4>
+=======
+ </p>
+</div>
+<a name="fusion.container.cons.example"></a><h5>
+<a name="id688721"></a>
+ <a class="link" href="cons.html#fusion.container.cons.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="identifier">cons</span><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="identifier">cons</span><span class="special"><</span><span class="keyword">float</span><span class="special">></span> <span class="special">></span> <span class="identifier">l</span><span class="special">(</span><span class="number">12</span><span class="special">,</span> <span class="identifier">cons</span><span class="special"><</span><span class="keyword">float</span><span class="special">>(</span><span class="number">5.5f</span><span class="special">));</span>
<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special"><<</span> at_c<span class="special"><</span><span class="number">0</span><span class="special">>(</span><span class="identifier">l</span><span class="special">)</span> <span class="special"><<</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"><<</span> at_c<span class="special"><</span><span class="number">1</span><span class="special">>(</span><span class="identifier">l</span><span class="special">)</span> <span class="special"><<</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion.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>Conversion</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="../container.html" title="Container">
<link rel="previous" href="generation/metafunctions/map_tie.html" title="map_tie">
@@ -37,10 +41,17 @@
All fusion sequences can be converted to one of the Container
types using one of these conversion functions.
</p>
+<<<<<<< .working
<a name="fusion.container.conversion.header"></a><h4>
<a name="id511157"></a>
<a href="conversion.html#fusion.container.conversion.header">Header</a>
</h4>
+=======
+<a name="fusion.container.conversion.header"></a><h5>
+<a name="id717528"></a>
+ <a class="link" href="conversion.html#fusion.container.conversion.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
</div>
Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/functions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/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="../conversion.html" title="Conversion">
<link rel="previous" href="../conversion.html" title="Conversion">
Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_list.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_list.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_list.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>as_list</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 1. 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="as_vector.html" title="as_vector">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.conversion.functions.as_list.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id511286"></a>
<a href="as_list.html#fusion.container.conversion.functions.as_list.description">Description</a>
+=======
+<a name="id762982"></a>
+=======
+<a name="id725258"></a>
+=======
+<a name="id717612"></a>
+=======
+<a name="id739995"></a>
+=======
+<a name="id728662"></a>
+=======
+<a name="id725385"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Convert a fusion sequence to a list.
</p>
<a name="fusion.container.conversion.functions.as_list.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id511333"></a>
<a href="as_list.html#fusion.container.conversion.functions.as_list.synopsis">Synopsis</a>
+=======
+<a name="id763010"></a>
+=======
+<a name="id725287"></a>
+=======
+<a name="id717641"></a>
+=======
+<a name="id740024"></a>
+=======
+<a name="id728690"></a>
+=======
+<a name="id725414"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_list</span><span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">as_list</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.container.conversion.functions.as_list.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id511589"></a>
<a href="as_list.html#fusion.container.conversion.functions.as_list.parameters">Parameters</a>
+=======
+<a name="id763193"></a>
+=======
+<a name="id725470"></a>
+=======
+<a name="id717824"></a>
+=======
+<a name="id740207"></a>
+=======
+<a name="id728873"></a>
+=======
+<a name="id725596"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -82,8 +165,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.conversion.functions.as_list.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id511694"></a>
<a href="as_list.html#fusion.container.conversion.functions.as_list.expression_semantics">Expression
+=======
+<a name="id763279"></a>
+=======
+<a name="id725556"></a>
+=======
+<a name="id717910"></a>
+=======
+<a name="id740293"></a>
+=======
+<a name="id728959"></a>
+=======
+<a name="id725682"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">as_list</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -96,22 +204,72 @@
<tt class="computeroutput"><span class="identifier">seq</span></tt>, to a list.
</p>
<a name="fusion.container.conversion.functions.as_list.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id511852"></a>
<a href="as_list.html#fusion.container.conversion.functions.as_list.header">Header</a>
+=======
+<a name="id763379"></a>
+=======
+<a name="id725656"></a>
+=======
+<a name="id718010"></a>
+=======
+<a name="id740393"></a>
+=======
+<a name="id729059"></a>
+=======
+<a name="id725782"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">as_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.conversion.functions.as_list.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id512018"></a>
<a href="as_list.html#fusion.container.conversion.functions.as_list.example">Example</a>
+=======
+<a name="id763494"></a>
+=======
+<a name="id725771"></a>
+=======
+<a name="id718125"></a>
+=======
+<a name="id740508"></a>
+=======
+<a name="id729174"></a>
+=======
+<a name="id725897"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">as_list</span><span class="special">(</span>make_vector<span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="string">"hello"</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 © 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/container/conversion/functions/as_map.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_map.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_map.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>as_map</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="as_set.html" title="as_set">
<link rel="next" href="../metafunctions.html" title="Metafunctions">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.conversion.functions.as_map.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id513836"></a>
<a href="as_map.html#fusion.container.conversion.functions.as_map.description">Description</a>
+=======
+<a name="id764820"></a>
+=======
+<a name="id727097"></a>
+=======
+<a name="id719451"></a>
+=======
+<a name="id742858"></a>
+=======
+<a name="id730500"></a>
+=======
+<a name="id727224"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Convert a fusion sequence to a map.
</p>
<a name="fusion.container.conversion.functions.as_map.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id513883"></a>
<a href="as_map.html#fusion.container.conversion.functions.as_map.synopsis">Synopsis</a>
+=======
+<a name="id764849"></a>
+=======
+<a name="id727126"></a>
+=======
+<a name="id719480"></a>
+=======
+<a name="id742887"></a>
+=======
+<a name="id730529"></a>
+=======
+<a name="id727252"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_map</span><span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">as_map</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.container.conversion.functions.as_map.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id514138"></a>
<a href="as_map.html#fusion.container.conversion.functions.as_map.parameters">Parameters</a>
+=======
+<a name="id765029"></a>
+=======
+<a name="id727306"></a>
+=======
+<a name="id719660"></a>
+=======
+<a name="id743067"></a>
+=======
+<a name="id730709"></a>
+=======
+<a name="id727432"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -82,8 +165,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.conversion.functions.as_map.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id514243"></a>
<a href="as_map.html#fusion.container.conversion.functions.as_map.expression_semantics">Expression
+=======
+<a name="id765113"></a>
+=======
+<a name="id727390"></a>
+=======
+<a name="id719744"></a>
+=======
+<a name="id743151"></a>
+=======
+<a name="id730793"></a>
+=======
+<a name="id727516"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">as_map</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -101,15 +209,65 @@
There may be no duplicate fusion::pair key types.
</p>
<a name="fusion.container.conversion.functions.as_map.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id514447"></a>
<a href="as_map.html#fusion.container.conversion.functions.as_map.header">Header</a>
+=======
+<a name="id765243"></a>
+=======
+<a name="id727520"></a>
+=======
+<a name="id719874"></a>
+=======
+<a name="id743281"></a>
+=======
+<a name="id730923"></a>
+=======
+<a name="id727646"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">map</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">as_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.conversion.functions.as_map.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id514613"></a>
<a href="as_map.html#fusion.container.conversion.functions.as_map.example">Example</a>
+=======
+<a name="id765358"></a>
+=======
+<a name="id727635"></a>
+=======
+<a name="id719989"></a>
+=======
+<a name="id743396"></a>
+=======
+<a name="id731038"></a>
+=======
+<a name="id727761"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">as_map</span><span class="special">(</span>make_vector<span class="special">(</span>
<a href="../../../support/pair.html" title="pair"><tt class="computeroutput"><span class="identifier">make_pair</span></tt></a><span class="special"><</span><span class="keyword">int</span><span class="special">>(</span><span class="char">'X'</span><span class="special">)</span>
@@ -118,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 © 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/container/conversion/functions/as_set.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_set.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_set.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>as_set</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="as_vector.html" title="as_vector">
<link rel="next" href="as_map.html" title="as_map">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.conversion.functions.as_set.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id512981"></a>
<a href="as_set.html#fusion.container.conversion.functions.as_set.description">Description</a>
+=======
+<a name="id764160"></a>
+=======
+<a name="id726506"></a>
+=======
+<a name="id718860"></a>
+=======
+<a name="id742267"></a>
+=======
+<a name="id729909"></a>
+=======
+<a name="id726632"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Convert a fusion sequence to a set.
</p>
<a name="fusion.container.conversion.functions.as_set.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id513027"></a>
<a href="as_set.html#fusion.container.conversion.functions.as_set.synopsis">Synopsis</a>
+=======
+<a name="id764189"></a>
+=======
+<a name="id726534"></a>
+=======
+<a name="id718888"></a>
+=======
+<a name="id742295"></a>
+=======
+<a name="id729938"></a>
+=======
+<a name="id726661"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_set</span><span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">as_set</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.container.conversion.functions.as_set.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id513282"></a>
<a href="as_set.html#fusion.container.conversion.functions.as_set.parameters">Parameters</a>
+=======
+<a name="id764438"></a>
+=======
+<a name="id726714"></a>
+=======
+<a name="id719068"></a>
+=======
+<a name="id742475"></a>
+=======
+<a name="id730118"></a>
+=======
+<a name="id726841"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -82,8 +165,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.conversion.functions.as_set.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id513387"></a>
<a href="as_set.html#fusion.container.conversion.functions.as_set.expression_semantics">Expression
+=======
+<a name="id764522"></a>
+=======
+<a name="id726798"></a>
+=======
+<a name="id719152"></a>
+=======
+<a name="id742559"></a>
+=======
+<a name="id730202"></a>
+=======
+<a name="id726925"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">as_set</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -100,22 +208,72 @@
key types.
</p>
<a name="fusion.container.conversion.functions.as_set.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id513556"></a>
<a href="as_set.html#fusion.container.conversion.functions.as_set.header">Header</a>
+=======
+<a name="id764631"></a>
+=======
+<a name="id726908"></a>
+=======
+<a name="id719262"></a>
+=======
+<a name="id742669"></a>
+=======
+<a name="id730311"></a>
+=======
+<a name="id727034"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">set</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">as_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.conversion.functions.as_set.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id513722"></a>
<a href="as_set.html#fusion.container.conversion.functions.as_set.example">Example</a>
+=======
+<a name="id764746"></a>
+=======
+<a name="id727023"></a>
+=======
+<a name="id719377"></a>
+=======
+<a name="id742784"></a>
+=======
+<a name="id730426"></a>
+=======
+<a name="id727149"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">as_set</span><span class="special">(</span>make_vector<span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="string">"hello"</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 © 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/container/conversion/functions/as_vector.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_vector.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_vector.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>as_vector</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="as_list.html" title="as_list">
<link rel="next" href="as_set.html" title="as_set">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.conversion.functions.as_vector.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id512133"></a>
<a href="as_vector.html#fusion.container.conversion.functions.as_vector.description">Description</a>
+=======
+<a name="id763568"></a>
+=======
+<a name="id725845"></a>
+=======
+<a name="id718199"></a>
+=======
+<a name="id740582"></a>
+=======
+<a name="id729248"></a>
+=======
+<a name="id725972"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Convert a fusion sequence to a vector.
</p>
<a name="fusion.container.conversion.functions.as_vector.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id512180"></a>
<a href="as_vector.html#fusion.container.conversion.functions.as_vector.synopsis">Synopsis</a>
+=======
+<a name="id763600"></a>
+=======
+<a name="id725876"></a>
+=======
+<a name="id718230"></a>
+=======
+<a name="id740613"></a>
+=======
+<a name="id729280"></a>
+=======
+<a name="id726003"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_vector</span><span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">as_vector</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.container.conversion.functions.as_vector.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id512435"></a>
<a href="as_vector.html#fusion.container.conversion.functions.as_vector.parameters">Parameters</a>
+=======
+<a name="id763784"></a>
+=======
+<a name="id726061"></a>
+=======
+<a name="id718415"></a>
+=======
+<a name="id740798"></a>
+=======
+<a name="id729464"></a>
+=======
+<a name="id726188"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -82,8 +165,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.conversion.functions.as_vector.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id512541"></a>
<a href="as_vector.html#fusion.container.conversion.functions.as_vector.expression_semantics">Expression
+=======
+<a name="id763871"></a>
+=======
+<a name="id726148"></a>
+=======
+<a name="id718502"></a>
+=======
+<a name="id740885"></a>
+=======
+<a name="id729551"></a>
+=======
+<a name="id726274"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">as_vector</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -96,22 +204,72 @@
<tt class="computeroutput"><span class="identifier">seq</span></tt>, to a vector.
</p>
<a name="fusion.container.conversion.functions.as_vector.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id512700"></a>
<a href="as_vector.html#fusion.container.conversion.functions.as_vector.header">Header</a>
+=======
+<a name="id763970"></a>
+=======
+<a name="id726247"></a>
+=======
+<a name="id718601"></a>
+=======
+<a name="id742077"></a>
+=======
+<a name="id729719"></a>
+=======
+<a name="id726442"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">vector</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">as_vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.conversion.functions.as_vector.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id512866"></a>
<a href="as_vector.html#fusion.container.conversion.functions.as_vector.example">Example</a>
+=======
+<a name="id764086"></a>
+=======
+<a name="id726431"></a>
+=======
+<a name="id718785"></a>
+=======
+<a name="id742192"></a>
+=======
+<a name="id729834"></a>
+=======
+<a name="id726558"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">as_vector</span><span class="special">(</span>make_list<span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="string">"hello"</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 © 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/container/conversion/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/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="../conversion.html" title="Conversion">
<link rel="previous" href="functions/as_map.html" title="as_map">
Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_list.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_list.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_list.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>as_list</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 1. 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="as_vector.html" title="as_vector">
@@ -30,22 +38,97 @@
<div></div>
</div>
<a name="fusion.container.conversion.metafunctions.as_list.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id514801"></a>
<a href="as_list.html#fusion.container.conversion.metafunctions.as_list.description">Description</a>
+=======
+<a name="id765479"></a>
+=======
+<a name="id727756"></a>
+=======
+<a name="id720110"></a>
+=======
+<a name="id743517"></a>
+=======
+<a name="id731159"></a>
+=======
+<a name="id727882"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of as_list.
</p>
<a name="fusion.container.conversion.metafunctions.as_list.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id514849"></a>
<a href="as_list.html#fusion.container.conversion.metafunctions.as_list.synopsis">Synopsis</a>
+=======
+<a name="id765510"></a>
+=======
+<a name="id727787"></a>
+=======
+<a name="id720141"></a>
+=======
+<a name="id743548"></a>
+=======
+<a name="id731190"></a>
+=======
+<a name="id727914"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">as_list</span><span class="special">;</span>
</pre>
<a name="fusion.container.conversion.metafunctions.as_list.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id514927"></a>
<a href="as_list.html#fusion.container.conversion.metafunctions.as_list.parameters">Parameters</a>
+=======
+<a name="id765567"></a>
+=======
+<a name="id727844"></a>
+=======
+<a name="id720198"></a>
+=======
+<a name="id743605"></a>
+=======
+<a name="id731247"></a>
+=======
+<a name="id727970"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -77,8 +160,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.conversion.metafunctions.as_list.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id515042"></a>
<a href="as_list.html#fusion.container.conversion.metafunctions.as_list.expression_semantics">Expression
+=======
+<a name="id765657"></a>
+=======
+<a name="id727934"></a>
+=======
+<a name="id720288"></a>
+=======
+<a name="id743695"></a>
+=======
+<a name="id731337"></a>
+=======
+<a name="id728060"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_list</span><span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span><span class="special">;</span>
@@ -92,22 +200,72 @@
<tt class="computeroutput"><span class="identifier">Sequence</span></tt>, to a list.
</p>
<a name="fusion.container.conversion.metafunctions.as_list.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id515196"></a>
<a href="as_list.html#fusion.container.conversion.metafunctions.as_list.header">Header</a>
+=======
+<a name="id765756"></a>
+=======
+<a name="id728033"></a>
+=======
+<a name="id720387"></a>
+=======
+<a name="id743794"></a>
+=======
+<a name="id731436"></a>
+=======
+<a name="id728160"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">as_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.conversion.metafunctions.as_list.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id515362"></a>
<a href="as_list.html#fusion.container.conversion.metafunctions.as_list.example">Example</a>
+=======
+<a name="id765876"></a>
+=======
+<a name="id728153"></a>
+=======
+<a name="id720507"></a>
+=======
+<a name="id743914"></a>
+=======
+<a name="id731556"></a>
+=======
+<a name="id728280"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_list</span><span class="special"><</span>vector<span class="special"><</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">int</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</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 © 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/container/conversion/metafunctions/as_map.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_map.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_map.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>as_map</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="as_set.html" title="as_set">
<link rel="next" href="../../../view.html" title="View">
@@ -30,22 +38,97 @@
<div></div>
</div>
<a name="fusion.container.conversion.metafunctions.as_map.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id516868"></a>
<a href="as_map.html#fusion.container.conversion.metafunctions.as_map.description">Description</a>
+=======
+<a name="id768703"></a>
+=======
+<a name="id729888"></a>
+=======
+<a name="id722242"></a>
+=======
+<a name="id745717"></a>
+=======
+<a name="id734247"></a>
+=======
+<a name="id730970"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of as_map.
</p>
<a name="fusion.container.conversion.metafunctions.as_map.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id516916"></a>
<a href="as_map.html#fusion.container.conversion.metafunctions.as_map.synopsis">Synopsis</a>
+=======
+<a name="id768734"></a>
+=======
+<a name="id729919"></a>
+=======
+<a name="id722273"></a>
+=======
+<a name="id745748"></a>
+=======
+<a name="id734278"></a>
+=======
+<a name="id731001"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">as_map</span><span class="special">;</span>
</pre>
<a name="fusion.container.conversion.metafunctions.as_map.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id516994"></a>
<a href="as_map.html#fusion.container.conversion.metafunctions.as_map.parameters">Parameters</a>
+=======
+<a name="id768791"></a>
+=======
+<a name="id729975"></a>
+=======
+<a name="id722329"></a>
+=======
+<a name="id745804"></a>
+=======
+<a name="id734334"></a>
+=======
+<a name="id731057"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -77,8 +160,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.conversion.metafunctions.as_map.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id517108"></a>
<a href="as_map.html#fusion.container.conversion.metafunctions.as_map.expression_semantics">Expression
+=======
+<a name="id768881"></a>
+=======
+<a name="id730065"></a>
+=======
+<a name="id722419"></a>
+=======
+<a name="id745894"></a>
+=======
+<a name="id734424"></a>
+=======
+<a name="id731147"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_map</span><span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span><span class="special">;</span>
@@ -97,15 +205,65 @@
There may be no duplicate fusion::pair key types.
</p>
<a name="fusion.container.conversion.metafunctions.as_map.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id517307"></a>
<a href="as_map.html#fusion.container.conversion.metafunctions.as_map.header">Header</a>
+=======
+<a name="id769008"></a>
+=======
+<a name="id730192"></a>
+=======
+<a name="id722546"></a>
+=======
+<a name="id746022"></a>
+=======
+<a name="id734551"></a>
+=======
+<a name="id731275"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">map</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">as_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.conversion.metafunctions.as_map.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id517474"></a>
<a href="as_map.html#fusion.container.conversion.metafunctions.as_map.example">Example</a>
+=======
+<a name="id769126"></a>
+=======
+<a name="id730310"></a>
+=======
+<a name="id722664"></a>
+=======
+<a name="id746139"></a>
+=======
+<a name="id734669"></a>
+=======
+<a name="id731392"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_map</span><span class="special"><</span>vector<span class="special"><</span>
<a href="../../../support/pair.html" title="pair"><tt class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></tt></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">></span>
@@ -114,7 +272,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 © 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/container/conversion/metafunctions/as_set.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_set.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_set.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>as_set</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="as_vector.html" title="as_vector">
<link rel="next" href="as_map.html" title="as_map">
@@ -30,22 +38,97 @@
<div></div>
</div>
<a name="fusion.container.conversion.metafunctions.as_set.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id516171"></a>
<a href="as_set.html#fusion.container.conversion.metafunctions.as_set.description">Description</a>
+=======
+<a name="id766442"></a>
+=======
+<a name="id729402"></a>
+=======
+<a name="id721756"></a>
+=======
+<a name="id745231"></a>
+=======
+<a name="id733761"></a>
+=======
+<a name="id730484"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of as_set.
</p>
<a name="fusion.container.conversion.metafunctions.as_set.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id516219"></a>
<a href="as_set.html#fusion.container.conversion.metafunctions.as_set.synopsis">Synopsis</a>
+=======
+<a name="id768248"></a>
+=======
+<a name="id729433"></a>
+=======
+<a name="id721787"></a>
+=======
+<a name="id745262"></a>
+=======
+<a name="id733792"></a>
+=======
+<a name="id730515"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">as_set</span><span class="special">;</span>
</pre>
<a name="fusion.container.conversion.metafunctions.as_set.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id516297"></a>
<a href="as_set.html#fusion.container.conversion.metafunctions.as_set.parameters">Parameters</a>
+=======
+<a name="id768305"></a>
+=======
+<a name="id729489"></a>
+=======
+<a name="id721843"></a>
+=======
+<a name="id745318"></a>
+=======
+<a name="id733848"></a>
+=======
+<a name="id730571"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -77,8 +160,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.conversion.metafunctions.as_set.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id516412"></a>
<a href="as_set.html#fusion.container.conversion.metafunctions.as_set.expression_semantics">Expression
+=======
+<a name="id768395"></a>
+=======
+<a name="id729579"></a>
+=======
+<a name="id721933"></a>
+=======
+<a name="id745408"></a>
+=======
+<a name="id733938"></a>
+=======
+<a name="id730661"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_set</span><span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span><span class="special">;</span>
@@ -96,22 +204,72 @@
key types.
</p>
<a name="fusion.container.conversion.metafunctions.as_set.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id516578"></a>
<a href="as_set.html#fusion.container.conversion.metafunctions.as_set.header">Header</a>
+=======
+<a name="id768502"></a>
+=======
+<a name="id729686"></a>
+=======
+<a name="id722040"></a>
+=======
+<a name="id745515"></a>
+=======
+<a name="id734045"></a>
+=======
+<a name="id730768"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">set</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">as_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.conversion.metafunctions.as_set.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id516744"></a>
<a href="as_set.html#fusion.container.conversion.metafunctions.as_set.example">Example</a>
+=======
+<a name="id768619"></a>
+=======
+<a name="id729804"></a>
+=======
+<a name="id722158"></a>
+=======
+<a name="id745633"></a>
+=======
+<a name="id734163"></a>
+=======
+<a name="id730886"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_set</span><span class="special"><</span>vector<span class="special"><</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">int</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</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 © 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/container/conversion/metafunctions/as_vector.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_vector.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_vector.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>as_vector</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="as_list.html" title="as_list">
<link rel="next" href="as_set.html" title="as_set">
@@ -30,22 +38,97 @@
<div></div>
</div>
<a name="fusion.container.conversion.metafunctions.as_vector.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id515486"></a>
<a href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.description">Description</a>
+=======
+<a name="id765960"></a>
+=======
+<a name="id728237"></a>
+=======
+<a name="id720591"></a>
+=======
+<a name="id743998"></a>
+=======
+<a name="id731640"></a>
+=======
+<a name="id728364"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of as_vector.
</p>
<a name="fusion.container.conversion.metafunctions.as_vector.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id515533"></a>
<a href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.synopsis">Synopsis</a>
+=======
+<a name="id765992"></a>
+=======
+<a name="id728268"></a>
+=======
+<a name="id720622"></a>
+=======
+<a name="id744029"></a>
+=======
+<a name="id731672"></a>
+=======
+<a name="id728395"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">as_vector</span><span class="special">;</span>
</pre>
<a name="fusion.container.conversion.metafunctions.as_vector.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id515612"></a>
<a href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.parameters">Parameters</a>
+=======
+<a name="id766048"></a>
+=======
+<a name="id728325"></a>
+=======
+<a name="id720679"></a>
+=======
+<a name="id744086"></a>
+=======
+<a name="id731728"></a>
+=======
+<a name="id728451"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -77,8 +160,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.conversion.metafunctions.as_vector.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id515724"></a>
<a href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.expression_semantics">Expression
+=======
+<a name="id766138"></a>
+=======
+<a name="id728415"></a>
+=======
+<a name="id720769"></a>
+=======
+<a name="id744176"></a>
+=======
+<a name="id731818"></a>
+=======
+<a name="id728541"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_vector</span><span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span><span class="special">;</span>
@@ -92,22 +200,72 @@
<tt class="computeroutput"><span class="identifier">Sequence</span></tt>, to a vector.
</p>
<a name="fusion.container.conversion.metafunctions.as_vector.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id515879"></a>
<a href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.header">Header</a>
+=======
+<a name="id766238"></a>
+=======
+<a name="id728514"></a>
+=======
+<a name="id720868"></a>
+=======
+<a name="id745027"></a>
+=======
+<a name="id733557"></a>
+=======
+<a name="id730280"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">vector</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">as_vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.conversion.metafunctions.as_vector.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id516046"></a>
<a href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.example">Example</a>
+=======
+<a name="id766358"></a>
+=======
+<a name="id729318"></a>
+=======
+<a name="id721672"></a>
+=======
+<a name="id745147"></a>
+=======
+<a name="id733677"></a>
+=======
+<a name="id730400"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_vector</span><span class="special"><</span>list<span class="special"><</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">int</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</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 © 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/container/generation.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation.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>Generation</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="../container.html" title="Container">
<link rel="previous" href="map.html" title="map">
@@ -36,10 +40,17 @@
<p>
These are the functions that you can use to generate various forms of Container from elemental values.
</p>
+<<<<<<< .working
<a name="fusion.container.generation.header"></a><h4>
<a name="id488901"></a>
<a href="generation.html#fusion.container.generation.header">Header</a>
</h4>
+=======
+<a name="fusion.container.generation.header"></a><h5>
+<a name="id695384"></a>
+ <a class="link" href="generation.html#fusion.container.generation.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">generation</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/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="../generation.html" title="Generation">
<link rel="previous" href="../generation.html" title="Generation">
Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions/list_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/list_tie.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/list_tie.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>list_tie</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="tiers.html" title="Tiers">
<link rel="next" href="vector_tie.html" title="vector_tie">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.generation.functions.list_tie.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id495882"></a>
<a href="list_tie.html#fusion.container.generation.functions.list_tie.description">Description</a>
+=======
+<a name="id747130"></a>
+=======
+<a name="id709543"></a>
+=======
+<a name="id701897"></a>
+=======
+<a name="id723167"></a>
+=======
+<a name="id712942"></a>
+=======
+<a name="id709666"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constructs a tie using a list sequence.
</p>
<a name="fusion.container.generation.functions.list_tie.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id495928"></a>
<a href="list_tie.html#fusion.container.generation.functions.list_tie.synopsis">Synopsis</a>
+=======
+<a name="id747159"></a>
+=======
+<a name="id709572"></a>
+=======
+<a name="id701926"></a>
+=======
+<a name="id723196"></a>
+=======
+<a name="id719018"></a>
+=======
+<a name="id715741"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<a href="../../list.html" title="list"><tt class="computeroutput"><span class="identifier">list</span></tt></a><span class="special"><</span><span class="identifier">T0</span><span class="special">&,</span> <span class="identifier">T1</span><span class="special">&,...</span> <span class="identifier">TN</span><span class="special">&></span>
@@ -55,8 +113,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.functions.list_tie.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id496242"></a>
<a href="list_tie.html#fusion.container.generation.functions.list_tie.parameters">Parameters</a>
+=======
+<a name="id747378"></a>
+=======
+<a name="id714742"></a>
+=======
+<a name="id707096"></a>
+=======
+<a name="id730571"></a>
+=======
+<a name="id719238"></a>
+=======
+<a name="id715961"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -90,8 +173,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.generation.functions.list_tie.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id496416"></a>
<a href="list_tie.html#fusion.container.generation.functions.list_tie.expression_semantics">Expression
+=======
+<a name="id748878"></a>
+=======
+<a name="id714875"></a>
+=======
+<a name="id707229"></a>
+=======
+<a name="id730705"></a>
+=======
+<a name="id719371"></a>
+=======
+<a name="id716094"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">list_tie</span><span class="special">(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
@@ -104,15 +212,65 @@
<span class="bold"><b>Semantics</b></span>: Create a list of references from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt>.
</p>
<a name="fusion.container.generation.functions.list_tie.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id496583"></a>
<a href="list_tie.html#fusion.container.generation.functions.list_tie.header">Header</a>
+=======
+<a name="id748987"></a>
+=======
+<a name="id714984"></a>
+=======
+<a name="id707339"></a>
+=======
+<a name="id730814"></a>
+=======
+<a name="id719480"></a>
+=======
+<a name="id716203"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">list_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">list_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.functions.list_tie.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id496750"></a>
<a href="list_tie.html#fusion.container.generation.functions.list_tie.example">Example</a>
+=======
+<a name="id749102"></a>
+=======
+<a name="id715100"></a>
+=======
+<a name="id707454"></a>
+=======
+<a name="id730929"></a>
+=======
+<a name="id719595"></a>
+=======
+<a name="id716318"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">123</span><span class="special">;</span>
<span class="keyword">double</span> <span class="identifier">d</span> <span class="special">=</span> <span class="number">123.456</span><span class="special">;</span>
@@ -121,7 +279,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 © 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/container/generation/functions/make_cons.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_cons.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_cons.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>make_cons</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="make_list.html" title="make_list">
<link rel="next" href="make_vector.html" title="make_vector">
@@ -30,8 +38,33 @@
<div></div>
</div>
<a name="fusion.container.generation.functions.make_cons.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id490215"></a>
<a href="make_cons.html#fusion.container.generation.functions.make_cons.description">Description</a>
+=======
+<a name="id741938"></a>
+=======
+<a name="id703942"></a>
+=======
+<a name="id696296"></a>
+=======
+<a name="id718658"></a>
+=======
+<a name="id708433"></a>
+=======
+<a name="id705156"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Create a cons
@@ -39,8 +72,33 @@
and optional <tt class="computeroutput"><span class="identifier">cdr</span></tt> (<span class="emphasis"><em>tail</em></span>).
</p>
<a name="fusion.container.generation.functions.make_cons.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id490293"></a>
<a href="make_cons.html#fusion.container.generation.functions.make_cons.synopsis">Synopsis</a>
+=======
+<a name="id741991"></a>
+=======
+<a name="id703995"></a>
+=======
+<a name="id696349"></a>
+=======
+<a name="id718710"></a>
+=======
+<a name="id708486"></a>
+=======
+<a name="id705209"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Car</span><span class="special">></span>
<span class="keyword">typename</span> result_of::make_cons<span class="special"><</span><span class="identifier">Car</span><span class="special">>::</span><span class="identifier">type</span>
@@ -51,8 +109,33 @@
<span class="identifier">make_cons</span><span class="special">(</span><span class="identifier">Car</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">car</span><span class="special">,</span> <span class="identifier">Cdr</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">cdr</span><span class="special">);</span>
</pre>
<a name="fusion.container.generation.functions.make_cons.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id490624"></a>
<a href="make_cons.html#fusion.container.generation.functions.make_cons.parameters">Parameters</a>
+=======
+<a name="id742229"></a>
+=======
+<a name="id704232"></a>
+=======
+<a name="id696586"></a>
+=======
+<a name="id718948"></a>
+=======
+<a name="id708724"></a>
+=======
+<a name="id705447"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -97,8 +180,33 @@
</tbody>
</table></div>
<a name="fusion.container.generation.functions.make_cons.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id490788"></a>
<a href="make_cons.html#fusion.container.generation.functions.make_cons.expression_semantics">Expression
+=======
+<a name="id742358"></a>
+=======
+<a name="id704362"></a>
+=======
+<a name="id696716"></a>
+=======
+<a name="id719078"></a>
+=======
+<a name="id708853"></a>
+=======
+<a name="id705576"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">make_cons</span><span class="special">(</span><span class="identifier">car</span><span class="special">,</span> <span class="identifier">cdr</span><span class="special">);</span>
@@ -112,21 +220,96 @@
(<span class="emphasis"><em>tail</em></span>).
</p>
<a name="fusion.container.generation.functions.make_cons.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id491040"></a>
<a href="make_cons.html#fusion.container.generation.functions.make_cons.header">Header</a>
+=======
+<a name="id742523"></a>
+=======
+<a name="id704526"></a>
+=======
+<a name="id696880"></a>
+=======
+<a name="id719242"></a>
+=======
+<a name="id709018"></a>
+=======
+<a name="id705741"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.functions.make_cons.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id491206"></a>
<a href="make_cons.html#fusion.container.generation.functions.make_cons.example">Example</a>
+=======
+<a name="id742638"></a>
+=======
+<a name="id704642"></a>
+=======
+<a name="id696996"></a>
+=======
+<a name="id719357"></a>
+=======
+<a name="id709133"></a>
+=======
+<a name="id705856"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">make_cons</span><span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="identifier">make_cons</span><span class="special">(</span><span class="number">123</span><span class="special">))</span>
</pre>
<a name="fusion.container.generation.functions.make_cons.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id491279"></a>
<a href="make_cons.html#fusion.container.generation.functions.make_cons.see_also">See
+=======
+<a name="id742688"></a>
+=======
+<a name="id704692"></a>
+=======
+<a name="id697046"></a>
+=======
+<a name="id719408"></a>
+=======
+<a name="id709183"></a>
+=======
+<a name="id705906"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<p>
@@ -135,7 +318,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 © 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/container/generation/functions/make_list.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_list.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_list.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>make_list</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 1. 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="make_cons.html" title="make_cons">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.container.generation.functions.make_list.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id489095"></a>
<a href="make_list.html#fusion.container.generation.functions.make_list.description">Description</a>
+=======
+<a name="id741155"></a>
+=======
+<a name="id703159"></a>
+=======
+<a name="id695513"></a>
+=======
+<a name="id717875"></a>
+=======
+<a name="id707646"></a>
+=======
+<a name="id704369"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Create a list
from one or more values.
</p>
<a name="fusion.container.generation.functions.make_list.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id489141"></a>
<a href="make_list.html#fusion.container.generation.functions.make_list.synopsis">Synopsis</a>
+=======
+<a name="id741187"></a>
+=======
+<a name="id703190"></a>
+=======
+<a name="id695544"></a>
+=======
+<a name="id717906"></a>
+=======
+<a name="id707677"></a>
+=======
+<a name="id704400"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<span class="keyword">typename</span> result_of::make_list<span class="special"><</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">>::</span><span class="identifier">type</span>
@@ -56,8 +114,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.functions.make_list.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id489503"></a>
<a href="make_list.html#fusion.container.generation.functions.make_list.parameters">Parameters</a>
+=======
+<a name="id741439"></a>
+=======
+<a name="id703442"></a>
+=======
+<a name="id695796"></a>
+=======
+<a name="id718158"></a>
+=======
+<a name="id707929"></a>
+=======
+<a name="id704652"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -91,8 +174,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.generation.functions.make_list.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id489676"></a>
<a href="make_list.html#fusion.container.generation.functions.make_list.expression_semantics">Expression
+=======
+<a name="id741572"></a>
+=======
+<a name="id703575"></a>
+=======
+<a name="id695930"></a>
+=======
+<a name="id718291"></a>
+=======
+<a name="id708067"></a>
+=======
+<a name="id704790"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">make_list</span><span class="special">(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
@@ -104,21 +212,96 @@
<span class="bold"><b>Semantics</b></span>: Create a list from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt>.
</p>
<a name="fusion.container.generation.functions.make_list.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id489899"></a>
<a href="make_list.html#fusion.container.generation.functions.make_list.header">Header</a>
+=======
+<a name="id741722"></a>
+=======
+<a name="id703726"></a>
+=======
+<a name="id696080"></a>
+=======
+<a name="id718442"></a>
+=======
+<a name="id708217"></a>
+=======
+<a name="id704940"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.functions.make_list.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id490065"></a>
<a href="make_list.html#fusion.container.generation.functions.make_list.example">Example</a>
+=======
+<a name="id741837"></a>
+=======
+<a name="id703841"></a>
+=======
+<a name="id696195"></a>
+=======
+<a name="id718557"></a>
+=======
+<a name="id708332"></a>
+=======
+<a name="id705056"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">make_list</span><span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">,</span> <span class="number">12.5</span><span class="special">)</span>
</pre>
<a name="fusion.container.generation.functions.make_list.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id490139"></a>
<a href="make_list.html#fusion.container.generation.functions.make_list.see_also">See
+=======
+<a name="id741889"></a>
+=======
+<a name="id703893"></a>
+=======
+<a name="id696247"></a>
+=======
+<a name="id718608"></a>
+=======
+<a name="id708384"></a>
+=======
+<a name="id705107"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<p>
@@ -127,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 © 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/container/generation/functions/make_map.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_map.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_map.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>make_map</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="make_set.html" title="make_set">
<link rel="next" href="tiers.html" title="Tiers">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.container.generation.functions.make_map.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id493601"></a>
<a href="make_map.html#fusion.container.generation.functions.make_map.description">Description</a>
+=======
+<a name="id745541"></a>
+=======
+<a name="id707954"></a>
+=======
+<a name="id700309"></a>
+=======
+<a name="id721578"></a>
+=======
+<a name="id711354"></a>
+=======
+<a name="id708077"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Create a map
from one or more key/data pairs.
</p>
<a name="fusion.container.generation.functions.make_map.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id493648"></a>
<a href="make_map.html#fusion.container.generation.functions.make_map.synopsis">Synopsis</a>
+=======
+<a name="id745571"></a>
+=======
+<a name="id707984"></a>
+=======
+<a name="id700339"></a>
+=======
+<a name="id721608"></a>
+=======
+<a name="id711384"></a>
+=======
+<a name="id708107"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">K0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">KN</span>
@@ -58,8 +116,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_MAP_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.functions.make_map.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id494095"></a>
<a href="make_map.html#fusion.container.generation.functions.make_map.parameters">Parameters</a>
+=======
+<a name="id745888"></a>
+=======
+<a name="id708301"></a>
+=======
+<a name="id700655"></a>
+=======
+<a name="id721925"></a>
+=======
+<a name="id711700"></a>
+=======
+<a name="id708424"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -108,8 +191,33 @@
</tbody>
</table></div>
<a name="fusion.container.generation.functions.make_map.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id494360"></a>
<a href="make_map.html#fusion.container.generation.functions.make_map.expression_semantics">Expression
+=======
+<a name="id746092"></a>
+=======
+<a name="id708505"></a>
+=======
+<a name="id700859"></a>
+=======
+<a name="id722129"></a>
+=======
+<a name="id711904"></a>
+=======
+<a name="id708628"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">make_map</span><span class="special"><</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">>(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
@@ -128,21 +236,96 @@
key types.
</p>
<a name="fusion.container.generation.functions.make_map.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id494693"></a>
<a href="make_map.html#fusion.container.generation.functions.make_map.header">Header</a>
+=======
+<a name="id746325"></a>
+=======
+<a name="id708738"></a>
+=======
+<a name="id701092"></a>
+=======
+<a name="id722362"></a>
+=======
+<a name="id712137"></a>
+=======
+<a name="id708860"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.functions.make_map.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id494860"></a>
<a href="make_map.html#fusion.container.generation.functions.make_map.example">Example</a>
+=======
+<a name="id746440"></a>
+=======
+<a name="id708853"></a>
+=======
+<a name="id701207"></a>
+=======
+<a name="id722477"></a>
+=======
+<a name="id712252"></a>
+=======
+<a name="id708976"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">make_map</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="char">'X'</span><span class="special">,</span> <span class="string">"Men"</span><span class="special">)</span>
</pre>
<a name="fusion.container.generation.functions.make_map.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id494945"></a>
<a href="make_map.html#fusion.container.generation.functions.make_map.see_also">See
+=======
+<a name="id746496"></a>
+=======
+<a name="id708910"></a>
+=======
+<a name="id701264"></a>
+=======
+<a name="id722533"></a>
+=======
+<a name="id712309"></a>
+=======
+<a name="id709032"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<p>
@@ -152,7 +335,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 © 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/container/generation/functions/make_set.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_set.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_set.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>make_set</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="make_vector.html" title="make_vector">
<link rel="next" href="make_map.html" title="make_map">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.container.generation.functions.make_set.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id492472"></a>
<a href="make_set.html#fusion.container.generation.functions.make_set.description">Description</a>
+=======
+<a name="id743530"></a>
+=======
+<a name="id705533"></a>
+=======
+<a name="id697887"></a>
+=======
+<a name="id720249"></a>
+=======
+<a name="id710024"></a>
+=======
+<a name="id706748"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Create a set
from one or more values.
</p>
<a name="fusion.container.generation.functions.make_set.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id492518"></a>
<a href="make_set.html#fusion.container.generation.functions.make_set.synopsis">Synopsis</a>
+=======
+<a name="id743558"></a>
+=======
+<a name="id705562"></a>
+=======
+<a name="id697916"></a>
+=======
+<a name="id720278"></a>
+=======
+<a name="id710053"></a>
+=======
+<a name="id706776"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<span class="keyword">typename</span> result_of::make_set<span class="special"><</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">>::</span><span class="identifier">type</span>
@@ -56,8 +114,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_SET_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.functions.make_set.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id492877"></a>
<a href="make_set.html#fusion.container.generation.functions.make_set.parameters">Parameters</a>
+=======
+<a name="id743808"></a>
+=======
+<a name="id705812"></a>
+=======
+<a name="id698166"></a>
+=======
+<a name="id721074"></a>
+=======
+<a name="id710850"></a>
+=======
+<a name="id707573"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -91,8 +174,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.generation.functions.make_set.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id493051"></a>
<a href="make_set.html#fusion.container.generation.functions.make_set.expression_semantics">Expression
+=======
+<a name="id743941"></a>
+=======
+<a name="id707584"></a>
+=======
+<a name="id699938"></a>
+=======
+<a name="id721207"></a>
+=======
+<a name="id710983"></a>
+=======
+<a name="id707706"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">make_set</span><span class="special">(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
@@ -108,21 +216,96 @@
key types.
</p>
<a name="fusion.container.generation.functions.make_set.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id493285"></a>
<a href="make_set.html#fusion.container.generation.functions.make_set.header">Header</a>
+=======
+<a name="id745330"></a>
+=======
+<a name="id707743"></a>
+=======
+<a name="id700097"></a>
+=======
+<a name="id721367"></a>
+=======
+<a name="id711142"></a>
+=======
+<a name="id707866"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.functions.make_set.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id493452"></a>
<a href="make_set.html#fusion.container.generation.functions.make_set.example">Example</a>
+=======
+<a name="id745445"></a>
+=======
+<a name="id707858"></a>
+=======
+<a name="id700213"></a>
+=======
+<a name="id721482"></a>
+=======
+<a name="id711258"></a>
+=======
+<a name="id707981"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">make_set</span><span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">,</span> <span class="number">12.5</span><span class="special">)</span>
</pre>
<a name="fusion.container.generation.functions.make_set.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id493526"></a>
<a href="make_set.html#fusion.container.generation.functions.make_set.see_also">See
+=======
+<a name="id745494"></a>
+=======
+<a name="id707908"></a>
+=======
+<a name="id700262"></a>
+=======
+<a name="id721531"></a>
+=======
+<a name="id711307"></a>
+=======
+<a name="id708030"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<p>
@@ -131,7 +314,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 © 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/container/generation/functions/make_vector.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_vector.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_vector.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>make_vector</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="make_cons.html" title="make_cons">
<link rel="next" href="make_set.html" title="make_set">
@@ -30,16 +38,66 @@
<div></div>
</div>
<a name="fusion.container.generation.functions.make_vector.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id491353"></a>
<a href="make_vector.html#fusion.container.generation.functions.make_vector.description">Description</a>
+=======
+<a name="id742738"></a>
+=======
+<a name="id704741"></a>
+=======
+<a name="id697095"></a>
+=======
+<a name="id719457"></a>
+=======
+<a name="id709232"></a>
+=======
+<a name="id705956"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Create a vector
from one or more values.
</p>
<a name="fusion.container.generation.functions.make_vector.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id491399"></a>
<a href="make_vector.html#fusion.container.generation.functions.make_vector.synopsis">Synopsis</a>
+=======
+<a name="id742769"></a>
+=======
+<a name="id704772"></a>
+=======
+<a name="id697126"></a>
+=======
+<a name="id719488"></a>
+=======
+<a name="id709264"></a>
+=======
+<a name="id705987"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<span class="keyword">typename</span> result_of::make_vector<span class="special"><</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">>::</span><span class="identifier">type</span>
@@ -56,8 +114,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_VECTOR_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.functions.make_vector.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id491757"></a>
<a href="make_vector.html#fusion.container.generation.functions.make_vector.parameters">Parameters</a>
+=======
+<a name="id743021"></a>
+=======
+<a name="id705024"></a>
+=======
+<a name="id697378"></a>
+=======
+<a name="id719740"></a>
+=======
+<a name="id709516"></a>
+=======
+<a name="id706239"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -91,8 +174,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.generation.functions.make_vector.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id491931"></a>
<a href="make_vector.html#fusion.container.generation.functions.make_vector.expression_semantics">Expression
+=======
+<a name="id743154"></a>
+=======
+<a name="id705158"></a>
+=======
+<a name="id697512"></a>
+=======
+<a name="id719873"></a>
+=======
+<a name="id709649"></a>
+=======
+<a name="id706372"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">make_vector</span><span class="special">(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
@@ -104,21 +212,96 @@
<span class="bold"><b>Semantics</b></span>: Create a vector from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt>.
</p>
<a name="fusion.container.generation.functions.make_vector.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id492155"></a>
<a href="make_vector.html#fusion.container.generation.functions.make_vector.header">Header</a>
+=======
+<a name="id743306"></a>
+=======
+<a name="id705310"></a>
+=======
+<a name="id697664"></a>
+=======
+<a name="id720026"></a>
+=======
+<a name="id709801"></a>
+=======
+<a name="id706524"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.functions.make_vector.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id492322"></a>
<a href="make_vector.html#fusion.container.generation.functions.make_vector.example">Example</a>
+=======
+<a name="id743426"></a>
+=======
+<a name="id705430"></a>
+=======
+<a name="id697784"></a>
+=======
+<a name="id720146"></a>
+=======
+<a name="id709921"></a>
+=======
+<a name="id706644"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">make_vector</span><span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">,</span> <span class="number">12.5</span><span class="special">)</span>
</pre>
<a name="fusion.container.generation.functions.make_vector.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id492397"></a>
<a href="make_vector.html#fusion.container.generation.functions.make_vector.see_also">See
+=======
+<a name="id743480"></a>
+=======
+<a name="id705484"></a>
+=======
+<a name="id697838"></a>
+=======
+<a name="id720200"></a>
+=======
+<a name="id709975"></a>
+=======
+<a name="id706698"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<p>
@@ -127,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 © 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/container/generation/functions/map_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/map_tie.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/map_tie.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>map_tie</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="vector_tie.html" title="vector_tie">
<link rel="next" href="../metafunctions.html" title="MetaFunctions">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.generation.functions.map_tie.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id497901"></a>
<a href="map_tie.html#fusion.container.generation.functions.map_tie.description">Description</a>
+=======
+<a name="id749917"></a>
+=======
+<a name="id715914"></a>
+=======
+<a name="id708269"></a>
+=======
+<a name="id731744"></a>
+=======
+<a name="id720410"></a>
+=======
+<a name="id717133"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constructs a tie using a map sequence.
</p>
<a name="fusion.container.generation.functions.map_tie.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id497948"></a>
<a href="map_tie.html#fusion.container.generation.functions.map_tie.synopsis">Synopsis</a>
+=======
+<a name="id749946"></a>
+=======
+<a name="id715943"></a>
+=======
+<a name="id708297"></a>
+=======
+<a name="id731773"></a>
+=======
+<a name="id720439"></a>
+=======
+<a name="id717162"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">K0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">KN</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">D0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">D1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">DN</span><span class="special">></span>
<a href="../../map.html" title="map"><tt class="computeroutput"><span class="identifier">map</span></tt></a><span class="special"><</span><a href="../../../support/pair.html" title="pair"><tt class="computeroutput"><span class="identifier">pair</span></tt></a><span class="special"><</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">D0</span><span class="special">&>,</span> <a href="../../../support/pair.html" title="pair"><tt class="computeroutput"><span class="identifier">pair</span></tt></a><span class="special"><</span><span class="identifier">K1</span><span class="special">,</span> <span class="identifier">D1</span><span class="special">&>,...</span> <a href="../../../support/pair.html" title="pair"><tt class="computeroutput"><span class="identifier">pair</span></tt></a><span class="special"><</span><span class="identifier">KN</span><span class="special">,</span> <span class="identifier">DN</span><span class="special">&></spa
n> <span class="special">></span>
@@ -55,8 +113,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_MAP_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.functions.map_tie.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id498415"></a>
<a href="map_tie.html#fusion.container.generation.functions.map_tie.parameters">Parameters</a>
+=======
+<a name="id750271"></a>
+=======
+<a name="id716268"></a>
+=======
+<a name="id708623"></a>
+=======
+<a name="id732098"></a>
+=======
+<a name="id720764"></a>
+=======
+<a name="id717487"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -106,8 +189,33 @@
</tbody>
</table></div>
<a name="fusion.container.generation.functions.map_tie.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id498679"></a>
<a href="map_tie.html#fusion.container.generation.functions.map_tie.expression_semantics">Expression
+=======
+<a name="id750474"></a>
+=======
+<a name="id716471"></a>
+=======
+<a name="id708825"></a>
+=======
+<a name="id732301"></a>
+=======
+<a name="id720967"></a>
+=======
+<a name="id717690"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">map_tie</span><span class="special"><</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">>(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
@@ -121,15 +229,65 @@
<span class="bold"><b>Semantics</b></span>: Create a map of references from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt> with keys <tt class="computeroutput"><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span></tt>
</p>
<a name="fusion.container.generation.functions.map_tie.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id498961"></a>
<a href="map_tie.html#fusion.container.generation.functions.map_tie.header">Header</a>
+=======
+<a name="id750660"></a>
+=======
+<a name="id716657"></a>
+=======
+<a name="id709011"></a>
+=======
+<a name="id732487"></a>
+=======
+<a name="id721153"></a>
+=======
+<a name="id717876"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">map_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">map_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.functions.map_tie.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id499127"></a>
<a href="map_tie.html#fusion.container.generation.functions.map_tie.example">Example</a>
+=======
+<a name="id750775"></a>
+=======
+<a name="id716772"></a>
+=======
+<a name="id709127"></a>
+=======
+<a name="id732602"></a>
+=======
+<a name="id721337"></a>
+=======
+<a name="id718060"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">int_key</span><span class="special">;</span>
<span class="keyword">struct</span> <span class="identifier">double_key</span><span class="special">;</span>
@@ -141,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 © 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/container/generation/functions/tiers.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/tiers.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/tiers.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>Tiers</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="make_map.html" title="make_map">
<link rel="next" href="list_tie.html" title="list_tie">
@@ -48,11 +56,19 @@
<a href="vector_tie.html" title="vector_tie"><tt class="computeroutput"><span class="identifier">vector_tie</span></tt></a><span class="special">(</span><span class="identifier">i</span><span class="special">,</span> <span class="identifier">c</span><span class="special">,</span> <span class="identifier">a</span><span class="special">);</span>
</pre>
<p>
+<<<<<<< .working
The vector_tie function creates
a vector
of type <tt class="computeroutput">vector<span class="special"><</span><span class="keyword">int</span><span class="special">&,</span> <span class="keyword">char</span><span class="special">&,</span> <span class="keyword">double</span><span class="special">&></span></tt>. The same result could be achieved
with the call make_vector(ref(i), ref(c), ref(a))
<sup>[<a name="id495412" href="#ftn.id495412">9</a>]</sup>
+=======
+ The <a class="link" href="vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">vector_tie</span></code></a> function creates
+ a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>
+ of type <code class="computeroutput"><a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">&,</span> <span class="keyword">char</span><span class="special">&,</span> <span class="keyword">double</span><span class="special">&></span></code>. The same result could be achieved
+ with the call <a class="link" href="make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a>(ref(i), ref(c), ref(a))
+ <sup>[<a name="id709333" href="#ftn.id709333" class="footnote">9</a>]</sup>
+>>>>>>> .merge-right.r57125
.
</p>
<p>
@@ -69,8 +85,33 @@
when calling functions which return sequences.
</p>
<a name="fusion.container.generation.functions.tiers.ignore"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id495712"></a>
<a href="tiers.html#fusion.container.generation.functions.tiers.ignore">Ignore</a>
+=======
+<a name="id747017"></a>
+=======
+<a name="id709430"></a>
+=======
+<a name="id701785"></a>
+=======
+<a name="id723054"></a>
+=======
+<a name="id712830"></a>
+=======
+<a name="id709553"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="tiers.html#fusion.container.generation.functions.tiers.ignore">Ignore</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
There is also an object called <span class="emphasis"><em>ignore</em></span> which allows
@@ -83,7 +124,31 @@
</pre>
<div class="footnotes">
<br><hr width="100" align="left">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<div class="footnote"><p><sup>[<a name="ftn.id495412" href="#id495412">9</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id746798" href="#id746798" class="para">9</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id709211" href="#id709211" class="para">9</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id701565" href="#id701565" class="para">9</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id722834" href="#id722834" class="para">9</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id712610" href="#id712610" class="para">9</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id709333" href="#id709333" class="para">9</a>] </sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
see Boost.Ref
for details about <tt class="computeroutput"><span class="identifier">ref</span></tt>
</p></div>
@@ -91,7 +156,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 © 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/container/generation/functions/vector_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/vector_tie.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/vector_tie.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>vector_tie</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="list_tie.html" title="list_tie">
<link rel="next" href="map_tie.html" title="map_tie">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.generation.functions.vector_tie.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id496890"></a>
<a href="vector_tie.html#fusion.container.generation.functions.vector_tie.description">Description</a>
+=======
+<a name="id749202"></a>
+=======
+<a name="id715199"></a>
+=======
+<a name="id707553"></a>
+=======
+<a name="id731029"></a>
+=======
+<a name="id719695"></a>
+=======
+<a name="id716418"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Constructs a tie using a vector sequence.
</p>
<a name="fusion.container.generation.functions.vector_tie.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id496938"></a>
<a href="vector_tie.html#fusion.container.generation.functions.vector_tie.synopsis">Synopsis</a>
+=======
+<a name="id749233"></a>
+=======
+<a name="id715230"></a>
+=======
+<a name="id707585"></a>
+=======
+<a name="id731060"></a>
+=======
+<a name="id719726"></a>
+=======
+<a name="id716449"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<a href="../../vector.html" title="vector"><tt class="computeroutput"><span class="identifier">vector</span></tt></a><span class="special"><</span><span class="identifier">T0</span><span class="special">&,</span> <span class="identifier">T1</span><span class="special">&,...</span> <span class="identifier">TN</span><span class="special">&></span>
@@ -55,8 +113,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_VECTOR_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.functions.vector_tie.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id497252"></a>
<a href="vector_tie.html#fusion.container.generation.functions.vector_tie.parameters">Parameters</a>
+=======
+<a name="id749455"></a>
+=======
+<a name="id715452"></a>
+=======
+<a name="id707807"></a>
+=======
+<a name="id731282"></a>
+=======
+<a name="id719948"></a>
+=======
+<a name="id716671"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -90,8 +173,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.generation.functions.vector_tie.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id497426"></a>
<a href="vector_tie.html#fusion.container.generation.functions.vector_tie.expression_semantics">Expression
+=======
+<a name="id749588"></a>
+=======
+<a name="id715586"></a>
+=======
+<a name="id707940"></a>
+=======
+<a name="id731415"></a>
+=======
+<a name="id720081"></a>
+=======
+<a name="id716804"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">vector_tie</span><span class="special">(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
@@ -104,15 +212,65 @@
<span class="bold"><b>Semantics</b></span>: Create a vector of references from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt>.
</p>
<a name="fusion.container.generation.functions.vector_tie.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id497592"></a>
<a href="vector_tie.html#fusion.container.generation.functions.vector_tie.header">Header</a>
+=======
+<a name="id749697"></a>
+=======
+<a name="id715695"></a>
+=======
+<a name="id708049"></a>
+=======
+<a name="id731524"></a>
+=======
+<a name="id720190"></a>
+=======
+<a name="id716914"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">vector_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">vector_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.functions.vector_tie.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id497759"></a>
<a href="vector_tie.html#fusion.container.generation.functions.vector_tie.example">Example</a>
+=======
+<a name="id749815"></a>
+=======
+<a name="id715812"></a>
+=======
+<a name="id708167"></a>
+=======
+<a name="id731642"></a>
+=======
+<a name="id720308"></a>
+=======
+<a name="id717031"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">123</span><span class="special">;</span>
<span class="keyword">double</span> <span class="identifier">d</span> <span class="special">=</span> <span class="number">123.456</span><span class="special">;</span>
@@ -121,7 +279,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 © 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/container/generation/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/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="../generation.html" title="Generation">
<link rel="previous" href="functions/map_tie.html" title="map_tie">
Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/list_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/list_tie.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/list_tie.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>list_tie</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="MetaFunctions">
<link rel="previous" href="make_map.html" title="make_map">
<link rel="next" href="vector_tie.html" title="vector_tie">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.generation.metafunctions.list_tie.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id508299"></a>
<a href="list_tie.html#fusion.container.generation.metafunctions.list_tie.description">Description</a>
+=======
+<a name="id760890"></a>
+=======
+<a name="id721528"></a>
+=======
+<a name="id713882"></a>
+=======
+<a name="id737221"></a>
+=======
+<a name="id725887"></a>
+=======
+<a name="id722610"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of list_tie.
</p>
<a name="fusion.container.generation.metafunctions.list_tie.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id508347"></a>
<a href="list_tie.html#fusion.container.generation.metafunctions.list_tie.synopsis">Synopsis</a>
+=======
+<a name="id760921"></a>
+=======
+<a name="id721559"></a>
+=======
+<a name="id713913"></a>
+=======
+<a name="id737252"></a>
+=======
+<a name="id725918"></a>
+=======
+<a name="id722641"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">list_tie</span><span class="special">;</span>
@@ -54,8 +112,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.metafunctions.list_tie.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id508550"></a>
<a href="list_tie.html#fusion.container.generation.metafunctions.list_tie.parameters">Parameters</a>
+=======
+<a name="id761061"></a>
+=======
+<a name="id721699"></a>
+=======
+<a name="id714054"></a>
+=======
+<a name="id737392"></a>
+=======
+<a name="id726058"></a>
+=======
+<a name="id722782"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -89,8 +172,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.generation.metafunctions.list_tie.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id508691"></a>
<a href="list_tie.html#fusion.container.generation.metafunctions.list_tie.expression_semantics">Expression
+=======
+<a name="id761170"></a>
+=======
+<a name="id721809"></a>
+=======
+<a name="id714163"></a>
+=======
+<a name="id737501"></a>
+=======
+<a name="id726168"></a>
+=======
+<a name="id722891"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">list_tie</span><span class="special"><</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">>::</span><span class="identifier">type</span><span class="special">;</span>
@@ -103,22 +211,72 @@
<span class="bold"><b>Semantics</b></span>: Create a list of references from <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>.
</p>
<a name="fusion.container.generation.metafunctions.list_tie.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id508877"></a>
<a href="list_tie.html#fusion.container.generation.metafunctions.list_tie.header">Header</a>
+=======
+<a name="id761296"></a>
+=======
+<a name="id721935"></a>
+=======
+<a name="id714289"></a>
+=======
+<a name="id737627"></a>
+=======
+<a name="id726294"></a>
+=======
+<a name="id723017"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">list_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">list_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.metafunctions.list_tie.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id509045"></a>
<a href="list_tie.html#fusion.container.generation.metafunctions.list_tie.example">Example</a>
+=======
+<a name="id761416"></a>
+=======
+<a name="id722055"></a>
+=======
+<a name="id714409"></a>
+=======
+<a name="id737747"></a>
+=======
+<a name="id726414"></a>
+=======
+<a name="id723137"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">list_tie</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="identifier">type</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 © 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/container/generation/metafunctions/make_cons.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_cons.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_cons.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>make_cons</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="MetaFunctions">
<link rel="previous" href="make_list.html" title="make_list">
<link rel="next" href="make_vector.html" title="make_vector">
@@ -30,22 +38,97 @@
<div></div>
</div>
<a name="fusion.container.generation.metafunctions.make_cons.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id500230"></a>
<a href="make_cons.html#fusion.container.generation.metafunctions.make_cons.description">Description</a>
+=======
+<a name="id752300"></a>
+=======
+<a name="id718708"></a>
+=======
+<a name="id711062"></a>
+=======
+<a name="id733376"></a>
+=======
+<a name="id722111"></a>
+=======
+<a name="id718834"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of make_cons.
</p>
<a name="fusion.container.generation.metafunctions.make_cons.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id500278"></a>
<a href="make_cons.html#fusion.container.generation.metafunctions.make_cons.synopsis">Synopsis</a>
+=======
+<a name="id752331"></a>
+=======
+<a name="id718739"></a>
+=======
+<a name="id711093"></a>
+=======
+<a name="id733408"></a>
+=======
+<a name="id722142"></a>
+=======
+<a name="id718865"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Car</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Cdr</span> <span class="special">=</span> <span class="identifier">nil</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">make_cons</span><span class="special">;</span>
</pre>
<a name="fusion.container.generation.metafunctions.make_cons.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id500386"></a>
<a href="make_cons.html#fusion.container.generation.metafunctions.make_cons.parameters">Parameters</a>
+=======
+<a name="id752411"></a>
+=======
+<a name="id718818"></a>
+=======
+<a name="id711172"></a>
+=======
+<a name="id733487"></a>
+=======
+<a name="id722221"></a>
+=======
+<a name="id718944"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -90,8 +173,33 @@
</tbody>
</table></div>
<a name="fusion.container.generation.metafunctions.make_cons.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id500538"></a>
<a href="make_cons.html#fusion.container.generation.metafunctions.make_cons.expression_semantics">Expression
+=======
+<a name="id752534"></a>
+=======
+<a name="id718942"></a>
+=======
+<a name="id711296"></a>
+=======
+<a name="id733610"></a>
+=======
+<a name="id722345"></a>
+=======
+<a name="id719068"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_cons</span><span class="special"><</span><span class="identifier">Car</span><span class="special">,</span> <span class="identifier">Cdr</span><span class="special">>::</span><span class="identifier">type</span>
@@ -107,22 +215,72 @@
(<span class="emphasis"><em>tail</em></span>).
</p>
<a name="fusion.container.generation.metafunctions.make_cons.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id500740"></a>
<a href="make_cons.html#fusion.container.generation.metafunctions.make_cons.header">Header</a>
+=======
+<a name="id752667"></a>
+=======
+<a name="id719075"></a>
+=======
+<a name="id711429"></a>
+=======
+<a name="id733744"></a>
+=======
+<a name="id722478"></a>
+=======
+<a name="id719201"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.metafunctions.make_cons.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id500907"></a>
<a href="make_cons.html#fusion.container.generation.metafunctions.make_cons.example">Example</a>
+=======
+<a name="id752787"></a>
+=======
+<a name="id719195"></a>
+=======
+<a name="id711549"></a>
+=======
+<a name="id733864"></a>
+=======
+<a name="id722598"></a>
+=======
+<a name="id719321"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_cons</span><span class="special"><</span><span class="keyword">char</span><span class="special">,</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_cons</span><span class="special"><</span><span class="keyword">int</span><span class="special">>::</span><span class="identifier">type</span><span class="special">>::</span><span class="identifier">type</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 © 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/container/generation/metafunctions/make_list.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_list.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_list.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>make_list</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 1. 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="make_cons.html" title="make_cons">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.generation.metafunctions.make_list.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id499351"></a>
<a href="make_list.html#fusion.container.generation.metafunctions.make_list.description">Description</a>
+=======
+<a name="id750932"></a>
+=======
+<a name="id718091"></a>
+=======
+<a name="id710445"></a>
+=======
+<a name="id732760"></a>
+=======
+<a name="id721494"></a>
+=======
+<a name="id718217"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of make_list.
</p>
<a name="fusion.container.generation.metafunctions.make_list.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id499398"></a>
<a href="make_list.html#fusion.container.generation.metafunctions.make_list.synopsis">Synopsis</a>
+=======
+<a name="id750963"></a>
+=======
+<a name="id718122"></a>
+=======
+<a name="id710476"></a>
+=======
+<a name="id732791"></a>
+=======
+<a name="id721525"></a>
+=======
+<a name="id718248"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">make_list</span><span class="special">;</span>
@@ -54,8 +112,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.metafunctions.make_list.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id499601"></a>
<a href="make_list.html#fusion.container.generation.metafunctions.make_list.parameters">Parameters</a>
+=======
+<a name="id751855"></a>
+=======
+<a name="id718262"></a>
+=======
+<a name="id710616"></a>
+=======
+<a name="id732931"></a>
+=======
+<a name="id721666"></a>
+=======
+<a name="id718389"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -89,8 +172,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.generation.metafunctions.make_list.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id499743"></a>
<a href="make_list.html#fusion.container.generation.metafunctions.make_list.expression_semantics">Expression
+=======
+<a name="id751964"></a>
+=======
+<a name="id718372"></a>
+=======
+<a name="id710726"></a>
+=======
+<a name="id733040"></a>
+=======
+<a name="id721775"></a>
+=======
+<a name="id718498"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_list</span><span class="special"><</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">>::</span><span class="identifier">type</span>
@@ -104,22 +212,72 @@
<span class="bold"><b>Semantics</b></span>: Create a list from <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>.
</p>
<a name="fusion.container.generation.metafunctions.make_list.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id499935"></a>
<a href="make_list.html#fusion.container.generation.metafunctions.make_list.header">Header</a>
+=======
+<a name="id752093"></a>
+=======
+<a name="id718500"></a>
+=======
+<a name="id710854"></a>
+=======
+<a name="id733169"></a>
+=======
+<a name="id721903"></a>
+=======
+<a name="id718626"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.metafunctions.make_list.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id500103"></a>
<a href="make_list.html#fusion.container.generation.metafunctions.make_list.example">Example</a>
+=======
+<a name="id752213"></a>
+=======
+<a name="id718620"></a>
+=======
+<a name="id710974"></a>
+=======
+<a name="id733289"></a>
+=======
+<a name="id722023"></a>
+=======
+<a name="id718746"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_list</span><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">(&)[</span><span class="number">7</span><span class="special">],</span> <span class="keyword">double</span><span class="special">>::</span><span class="identifier">type</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 © 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/container/generation/metafunctions/make_map.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_map.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_map.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>make_map</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="MetaFunctions">
<link rel="previous" href="make_set.html" title="make_set">
<link rel="next" href="list_tie.html" title="list_tie">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.generation.metafunctions.make_map.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id507053"></a>
<a href="make_map.html#fusion.container.generation.metafunctions.make_map.description">Description</a>
+=======
+<a name="id760004"></a>
+=======
+<a name="id720642"></a>
+=======
+<a name="id712996"></a>
+=======
+<a name="id736335"></a>
+=======
+<a name="id725001"></a>
+=======
+<a name="id721724"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of make_map.
</p>
<a name="fusion.container.generation.metafunctions.make_map.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id507101"></a>
<a href="make_map.html#fusion.container.generation.metafunctions.make_map.synopsis">Synopsis</a>
+=======
+<a name="id760035"></a>
+=======
+<a name="id720673"></a>
+=======
+<a name="id713028"></a>
+=======
+<a name="id736366"></a>
+=======
+<a name="id725032"></a>
+=======
+<a name="id721756"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">K0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">KN</span>
@@ -56,8 +114,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_MAP_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.metafunctions.make_map.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id507362"></a>
<a href="make_map.html#fusion.container.generation.metafunctions.make_map.parameters">Parameters</a>
+=======
+<a name="id760218"></a>
+=======
+<a name="id720856"></a>
+=======
+<a name="id713210"></a>
+=======
+<a name="id736549"></a>
+=======
+<a name="id725215"></a>
+=======
+<a name="id721938"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -106,8 +189,33 @@
</tbody>
</table></div>
<a name="fusion.container.generation.metafunctions.make_map.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id507615"></a>
<a href="make_map.html#fusion.container.generation.metafunctions.make_map.expression_semantics">Expression
+=======
+<a name="id760414"></a>
+=======
+<a name="id721053"></a>
+=======
+<a name="id713407"></a>
+=======
+<a name="id736745"></a>
+=======
+<a name="id725412"></a>
+=======
+<a name="id722135"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">resulf_of</span><span class="special">::</span><span class="identifier">make_map</span><span class="special"><</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">,</span> <span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">>::</span><span class="identifier">type</span><span class="special">;</span>
@@ -125,21 +233,96 @@
key types.
</p>
<a name="fusion.container.generation.metafunctions.make_map.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id507952"></a>
<a href="make_map.html#fusion.container.generation.metafunctions.make_map.header">Header</a>
+=======
+<a name="id760647"></a>
+=======
+<a name="id721285"></a>
+=======
+<a name="id713640"></a>
+=======
+<a name="id736978"></a>
+=======
+<a name="id725644"></a>
+=======
+<a name="id722368"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.metafunctions.make_map.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id508120"></a>
<a href="make_map.html#fusion.container.generation.metafunctions.make_map.example">Example</a>
+=======
+<a name="id760767"></a>
+=======
+<a name="id721405"></a>
+=======
+<a name="id713760"></a>
+=======
+<a name="id737098"></a>
+=======
+<a name="id725764"></a>
+=======
+<a name="id722488"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_map</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">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">>::</span><span class="identifier">type</span>
</pre>
<a name="fusion.container.generation.metafunctions.make_map.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id508222"></a>
<a href="make_map.html#fusion.container.generation.metafunctions.make_map.see_also">See
+=======
+<a name="id760840"></a>
+=======
+<a name="id721479"></a>
+=======
+<a name="id713833"></a>
+=======
+<a name="id737171"></a>
+=======
+<a name="id725838"></a>
+=======
+<a name="id722561"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<p>
@@ -148,7 +331,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 © 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/container/generation/metafunctions/make_set.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_set.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_set.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>make_set</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="MetaFunctions">
<link rel="previous" href="make_vector.html" title="make_vector">
<link rel="next" href="make_map.html" title="make_map">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.generation.metafunctions.make_set.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id506183"></a>
<a href="make_set.html#fusion.container.generation.metafunctions.make_set.description">Description</a>
+=======
+<a name="id753483"></a>
+=======
+<a name="id719891"></a>
+=======
+<a name="id712245"></a>
+=======
+<a name="id734560"></a>
+=======
+<a name="id723294"></a>
+=======
+<a name="id720017"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of make_set.
</p>
<a name="fusion.container.generation.metafunctions.make_set.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id506230"></a>
<a href="make_set.html#fusion.container.generation.metafunctions.make_set.synopsis">Synopsis</a>
+=======
+<a name="id753515"></a>
+=======
+<a name="id719922"></a>
+=======
+<a name="id712276"></a>
+=======
+<a name="id734591"></a>
+=======
+<a name="id723325"></a>
+=======
+<a name="id720048"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">make_set</span><span class="special">;</span>
@@ -54,8 +112,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_SET_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.metafunctions.make_set.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id506434"></a>
<a href="make_set.html#fusion.container.generation.metafunctions.make_set.parameters">Parameters</a>
+=======
+<a name="id753655"></a>
+=======
+<a name="id720062"></a>
+=======
+<a name="id712416"></a>
+=======
+<a name="id734731"></a>
+=======
+<a name="id724558"></a>
+=======
+<a name="id721282"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -89,8 +172,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.generation.metafunctions.make_set.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id506575"></a>
<a href="make_set.html#fusion.container.generation.metafunctions.make_set.expression_semantics">Expression
+=======
+<a name="id753764"></a>
+=======
+<a name="id720172"></a>
+=======
+<a name="id712526"></a>
+=======
+<a name="id736001"></a>
+=======
+<a name="id724668"></a>
+=======
+<a name="id721391"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_set</span><span class="special"><</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">>::</span><span class="identifier">type</span>
@@ -108,22 +216,72 @@
key types.
</p>
<a name="fusion.container.generation.metafunctions.make_set.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id506775"></a>
<a href="make_set.html#fusion.container.generation.metafunctions.make_set.header">Header</a>
+=======
+<a name="id753902"></a>
+=======
+<a name="id720447"></a>
+=======
+<a name="id712801"></a>
+=======
+<a name="id736139"></a>
+=======
+<a name="id724806"></a>
+=======
+<a name="id721529"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.metafunctions.make_set.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id506942"></a>
<a href="make_set.html#fusion.container.generation.metafunctions.make_set.example">Example</a>
+=======
+<a name="id759928"></a>
+=======
+<a name="id720567"></a>
+=======
+<a name="id712921"></a>
+=======
+<a name="id736259"></a>
+=======
+<a name="id724926"></a>
+=======
+<a name="id721649"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_set</span><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">>::</span><span class="identifier">type</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 © 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/container/generation/metafunctions/make_vector.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_vector.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_vector.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>make_vector</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="MetaFunctions">
<link rel="previous" href="make_cons.html" title="make_cons">
<link rel="next" href="make_set.html" title="make_set">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.generation.metafunctions.make_vector.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id501039"></a>
<a href="make_vector.html#fusion.container.generation.metafunctions.make_vector.description">Description</a>
+=======
+<a name="id752874"></a>
+=======
+<a name="id719281"></a>
+=======
+<a name="id711635"></a>
+=======
+<a name="id733950"></a>
+=======
+<a name="id722684"></a>
+=======
+<a name="id719408"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of make_vector.
</p>
<a name="fusion.container.generation.metafunctions.make_vector.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id501087"></a>
<a href="make_vector.html#fusion.container.generation.metafunctions.make_vector.synopsis">Synopsis</a>
+=======
+<a name="id752903"></a>
+=======
+<a name="id719310"></a>
+=======
+<a name="id711664"></a>
+=======
+<a name="id733979"></a>
+=======
+<a name="id722713"></a>
+=======
+<a name="id719436"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">make_vector</span><span class="special">;</span>
@@ -54,8 +112,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_VECTOR_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.metafunctions.make_vector.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id501291"></a>
<a href="make_vector.html#fusion.container.generation.metafunctions.make_vector.parameters">Parameters</a>
+=======
+<a name="id753041"></a>
+=======
+<a name="id719448"></a>
+=======
+<a name="id711802"></a>
+=======
+<a name="id734117"></a>
+=======
+<a name="id722851"></a>
+=======
+<a name="id719574"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -89,8 +172,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.generation.metafunctions.make_vector.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id501431"></a>
<a href="make_vector.html#fusion.container.generation.metafunctions.make_vector.expression_semantics">Expression
+=======
+<a name="id753147"></a>
+=======
+<a name="id719555"></a>
+=======
+<a name="id711909"></a>
+=======
+<a name="id734224"></a>
+=======
+<a name="id722958"></a>
+=======
+<a name="id719681"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_vector</span><span class="special"><</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">>::</span><span class="identifier">type</span>
@@ -104,22 +212,72 @@
<span class="bold"><b>Semantics</b></span>: Create a vector from <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>.
</p>
<a name="fusion.container.generation.metafunctions.make_vector.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id505889"></a>
<a href="make_vector.html#fusion.container.generation.metafunctions.make_vector.header">Header</a>
+=======
+<a name="id753276"></a>
+=======
+<a name="id719683"></a>
+=======
+<a name="id712037"></a>
+=======
+<a name="id734352"></a>
+=======
+<a name="id723086"></a>
+=======
+<a name="id719810"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.metafunctions.make_vector.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id506056"></a>
<a href="make_vector.html#fusion.container.generation.metafunctions.make_vector.example">Example</a>
+=======
+<a name="id753396"></a>
+=======
+<a name="id719803"></a>
+=======
+<a name="id712157"></a>
+=======
+<a name="id734472"></a>
+=======
+<a name="id723206"></a>
+=======
+<a name="id719930"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_vector</span><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">(&)[</span><span class="number">7</span><span class="special">],</span> <span class="keyword">double</span><span class="special">>::</span><span class="identifier">type</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 © 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/container/generation/metafunctions/map_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/map_tie.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/map_tie.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>map_tie</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="MetaFunctions">
<link rel="previous" href="vector_tie.html" title="vector_tie">
<link rel="next" href="../../conversion.html" title="Conversion">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.generation.metafunctions.map_tie.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id509992"></a>
<a href="map_tie.html#fusion.container.generation.metafunctions.map_tie.description">Description</a>
+=======
+<a name="id762073"></a>
+=======
+<a name="id724350"></a>
+=======
+<a name="id716704"></a>
+=======
+<a name="id739087"></a>
+=======
+<a name="id727753"></a>
+=======
+<a name="id724476"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of map_tie.
</p>
<a name="fusion.container.generation.metafunctions.map_tie.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id510041"></a>
<a href="map_tie.html#fusion.container.generation.metafunctions.map_tie.synopsis">Synopsis</a>
+=======
+<a name="id762104"></a>
+=======
+<a name="id724381"></a>
+=======
+<a name="id716735"></a>
+=======
+<a name="id739118"></a>
+=======
+<a name="id727784"></a>
+=======
+<a name="id724508"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">K0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">KN</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">D0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">D1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">DN</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">map_tie</span><span class="special">;</span>
@@ -54,8 +112,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_MAP_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.metafunctions.map_tie.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id510297"></a>
<a href="map_tie.html#fusion.container.generation.metafunctions.map_tie.parameters">Parameters</a>
+=======
+<a name="id762284"></a>
+=======
+<a name="id724561"></a>
+=======
+<a name="id716915"></a>
+=======
+<a name="id739298"></a>
+=======
+<a name="id727964"></a>
+=======
+<a name="id724688"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -104,8 +187,33 @@
</tbody>
</table></div>
<a name="fusion.container.generation.metafunctions.map_tie.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id510508"></a>
<a href="map_tie.html#fusion.container.generation.metafunctions.map_tie.expression_semantics">Expression
+=======
+<a name="id762448"></a>
+=======
+<a name="id724724"></a>
+=======
+<a name="id717078"></a>
+=======
+<a name="id739461"></a>
+=======
+<a name="id728128"></a>
+=======
+<a name="id724851"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">map_tie</span><span class="special"><</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">,</span> <span class="identifier">D0</span><span class="special">,</span> <span class="identifier">D1</span><span class="special">,...</span> <span class="identifier">DN</span><span class="special">>::</span><span class="identifier">type</span><span class="special">;</span>
@@ -119,15 +227,65 @@
<span class="bold"><b>Semantics</b></span>: Create a map of references from <tt class="computeroutput"><span class="identifier">D0</span><span class="special">,</span> <span class="identifier">D1</span><span class="special">,...</span> <span class="identifier">DN</span></tt> with keys <tt class="computeroutput"><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span></tt>
</p>
<a name="fusion.container.generation.metafunctions.map_tie.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id510810"></a>
<a href="map_tie.html#fusion.container.generation.metafunctions.map_tie.header">Header</a>
+=======
+<a name="id762652"></a>
+=======
+<a name="id724928"></a>
+=======
+<a name="id717282"></a>
+=======
+<a name="id739665"></a>
+=======
+<a name="id728332"></a>
+=======
+<a name="id725055"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">map_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">map_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.metafunctions.map_tie.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id510978"></a>
<a href="map_tie.html#fusion.container.generation.metafunctions.map_tie.example">Example</a>
+=======
+<a name="id762772"></a>
+=======
+<a name="id725048"></a>
+=======
+<a name="id717402"></a>
+=======
+<a name="id739785"></a>
+=======
+<a name="id728452"></a>
+=======
+<a name="id725175"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">int_key</span><span class="special">;</span>
<span class="keyword">struct</span> <span class="identifier">double_key</span><span class="special">;</span>
@@ -137,7 +295,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 © 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/container/generation/metafunctions/vector_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/vector_tie.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/vector_tie.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>vector_tie</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="MetaFunctions">
<link rel="previous" href="list_tie.html" title="list_tie">
<link rel="next" href="map_tie.html" title="map_tie">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.container.generation.metafunctions.vector_tie.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id509147"></a>
<a href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.description">Description</a>
+=======
+<a name="id761481"></a>
+=======
+<a name="id722119"></a>
+=======
+<a name="id714474"></a>
+=======
+<a name="id737812"></a>
+=======
+<a name="id726478"></a>
+=======
+<a name="id723202"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of vector_tie.
</p>
<a name="fusion.container.generation.metafunctions.vector_tie.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id509194"></a>
<a href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.synopsis">Synopsis</a>
+=======
+<a name="id761510"></a>
+=======
+<a name="id722148"></a>
+=======
+<a name="id714502"></a>
+=======
+<a name="id737841"></a>
+=======
+<a name="id726507"></a>
+=======
+<a name="id723230"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">vector_tie</span><span class="special">;</span>
@@ -54,8 +112,33 @@
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_VECTOR_SIZE</span> <span class="number">20</span>
</pre>
<a name="fusion.container.generation.metafunctions.vector_tie.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id509397"></a>
<a href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.parameters">Parameters</a>
+=======
+<a name="id761650"></a>
+=======
+<a name="id722289"></a>
+=======
+<a name="id714643"></a>
+=======
+<a name="id737981"></a>
+=======
+<a name="id726648"></a>
+=======
+<a name="id723371"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -89,8 +172,33 @@
</tr></tbody>
</table></div>
<a name="fusion.container.generation.metafunctions.vector_tie.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id509537"></a>
<a href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.expression_semantics">Expression
+=======
+<a name="id761760"></a>
+=======
+<a name="id722398"></a>
+=======
+<a name="id714752"></a>
+=======
+<a name="id738091"></a>
+=======
+<a name="id727440"></a>
+=======
+<a name="id724163"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">vector_tie</span><span class="special"><</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">>::</span><span class="identifier">type</span><span class="special">;</span>
@@ -103,22 +211,72 @@
<span class="bold"><b>Semantics</b></span>: Create a vector of references from <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>.
</p>
<a name="fusion.container.generation.metafunctions.vector_tie.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id509724"></a>
<a href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.header">Header</a>
+=======
+<a name="id761886"></a>
+=======
+<a name="id724163"></a>
+=======
+<a name="id716517"></a>
+=======
+<a name="id738900"></a>
+=======
+<a name="id727566"></a>
+=======
+<a name="id724289"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">vector_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">vector_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.container.generation.metafunctions.vector_tie.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id509891"></a>
<a href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.example">Example</a>
+=======
+<a name="id762006"></a>
+=======
+<a name="id724283"></a>
+=======
+<a name="id716637"></a>
+=======
+<a name="id739020"></a>
+=======
+<a name="id727686"></a>
+=======
+<a name="id724409"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">vector_tie</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="identifier">type</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 © 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/container/list.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/list.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/list.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>list</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="../container.html" title="Container">
<link rel="previous" href="cons.html" title="cons">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="cons.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.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="set.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="id483306"></a>
<a href="list.html#fusion.container.list.description">Description</a>
</h4>
+=======
+<div class="section" title="list">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.container.list"></a><a class="link" href="list.html" title="list">list</a>
+</h3></div></div></div>
+<a name="fusion.container.list.description"></a><h5>
+<a name="id688953"></a>
+ <a class="link" href="list.html#fusion.container.list.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
<tt class="computeroutput"><span class="identifier">list</span></tt> is a <a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward
@@ -41,19 +56,33 @@
when the target sequence is constructed piecemeal (a data at a time). The
runtime cost of access to each element is peculiarly constant (see Recursive Inlined Functions).
</p>
+<<<<<<< .working
<a name="fusion.container.list.header"></a><h4>
<a name="id483401"></a>
<a href="list.html#fusion.container.list.header">Header</a>
</h4>
+=======
+<a name="fusion.container.list.header"></a><h5>
+<a name="id689006"></a>
+ <a class="link" href="list.html#fusion.container.list.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">/</span><span class="identifier">list_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">list_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.container.list.synopsis"></a><h4>
<a name="id483692"></a>
<a href="list.html#fusion.container.list.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.container.list.synopsis"></a><h5>
+<a name="id689212"></a>
+ <a class="link" href="list.html#fusion.container.list.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">T0</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
<span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
@@ -78,10 +107,17 @@
</p>
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
</pre>
+<<<<<<< .working
<a name="fusion.container.list.template_parameters"></a><h4>
<a name="id484018"></a>
<a href="list.html#fusion.container.list.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.container.list.template_parameters"></a><h5>
+<a name="id690538"></a>
+ <a class="link" href="list.html#fusion.container.list.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -111,6 +147,7 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.container.list.model_of"></a><h4>
<a name="id484136"></a>
<a href="list.html#fusion.container.list.model_of">Model of</a>
@@ -118,6 +155,14 @@
<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward Sequence</a></li></ul></div>
<div class="variablelist">
+=======
+<a name="fusion.container.list.model_of"></a><h5>
+<a name="id690631"></a>
+ <a class="link" href="list.html#fusion.container.list.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>
+<div class="variablelist" title="Notation">
+>>>>>>> .merge-right.r57125
<p class="title"><b>Notation</b></p>
<dl>
<dt><span class="term"><tt class="computeroutput"><span class="identifier">L</span></tt></span></dt>
@@ -144,10 +189,17 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.container.list.expression_semantics"></a><h4>
<a name="id484349"></a>
<a href="list.html#fusion.container.list.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.container.list.expression_semantics"></a><h5>
+<a name="id690785"></a>
+ <a class="link" href="list.html#fusion.container.list.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Semantics of an expression is defined only where it differs from, or is not
defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
@@ -227,11 +279,20 @@
Access Sequence">Random
Access Sequence</a> requirement). The runtime complexity of at is constant (see <a href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive
Inlined Functions</a>).
+<<<<<<< .working
</p></div>
<a name="fusion.container.list.example"></a><h4>
<a name="id484925"></a>
<a href="list.html#fusion.container.list.example">Example</a>
</h4>
+=======
+ </p>
+</div>
+<a name="fusion.container.list.example"></a><h5>
+<a name="id691189"></a>
+ <a class="link" href="list.html#fusion.container.list.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="identifier">list</span><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">l</span><span class="special">(</span><span class="number">12</span><span class="special">,</span> <span class="number">5.5f</span><span class="special">);</span>
<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special"><<</span> at_c<span class="special"><</span><span class="number">0</span><span class="special">>(</span><span class="identifier">l</span><span class="special">)</span> <span class="special"><<</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"><<</span> at_c<span class="special"><</span><span class="number">1</span><span class="special">>(</span><span class="identifier">l</span><span class="special">)</span> <span class="special"><<</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
Modified: branches/release/libs/fusion/doc/html/fusion/container/map.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/map.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/map.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>map</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="../container.html" title="Container">
<link rel="previous" href="set.html" title="set">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="set.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.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="generation.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="id486951"></a>
<a href="map.html#fusion.container.map.description">Description</a>
</h4>
+=======
+<div class="section" title="map">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.container.map"></a><a class="link" href="map.html" title="map">map</a>
+</h3></div></div></div>
+<a name="fusion.container.map.description"></a><h5>
+<a name="id694005"></a>
+ <a class="link" href="map.html#fusion.container.map.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
map is an <a href="../sequence/concepts/associative_sequence.html" title="Associative
Sequence">Associative
@@ -43,19 +58,33 @@
key. Membership testing and element key lookup has constant runtime complexity
(see Overloaded Functions).
</p>
+<<<<<<< .working
<a name="fusion.container.map.header"></a><h4>
<a name="id487031"></a>
<a href="map.html#fusion.container.map.header">Header</a>
</h4>
+=======
+<a name="fusion.container.map.header"></a><h5>
+<a name="id694048"></a>
+ <a class="link" href="map.html#fusion.container.map.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">map_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">map_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.container.map.synopsis"></a><h4>
<a name="id487311"></a>
<a href="map.html#fusion.container.map.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.container.map.synopsis"></a><h5>
+<a name="id694247"></a>
+ <a class="link" href="map.html#fusion.container.map.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">T0</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
<span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
@@ -80,10 +109,17 @@
</p>
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_MAP_SIZE</span> <span class="number">20</span>
</pre>
+<<<<<<< .working
<a name="fusion.container.map.template_parameters"></a><h4>
<a name="id487736"></a>
<a href="map.html#fusion.container.map.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.container.map.template_parameters"></a><h5>
+<a name="id694546"></a>
+ <a class="link" href="map.html#fusion.container.map.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -113,6 +149,7 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.container.map.model_of"></a><h4>
<a name="id487853"></a>
<a href="map.html#fusion.container.map.model_of">Model of</a>
@@ -120,6 +157,14 @@
<div class="itemizedlist"><ul type="disc">
<li><a href="../sequence/concepts/associative_sequence.html" title="Associative
Sequence">Associative
+=======
+<a name="fusion.container.map.model_of"></a><h5>
+<a name="id694640"></a>
+ <a class="link" href="map.html#fusion.container.map.model_of">Model of</a>
+ </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+>>>>>>> .merge-right.r57125
Sequence</a></li>
<li><a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward Sequence</a></li>
@@ -146,10 +191,17 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.container.map.expression_semantics"></a><h4>
<a name="id488074"></a>
<a href="map.html#fusion.container.map.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.container.map.expression_semantics"></a><h5>
+<a name="id694796"></a>
+ <a class="link" href="map.html#fusion.container.map.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Semantics of an expression is defined only where it differs from, or is not
defined in <a href="../sequence/concepts/random_access_sequence.html" title="Random
@@ -213,10 +265,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.container.map.example"></a><h4>
<a name="id488420"></a>
<a href="map.html#fusion.container.map.example">Example</a>
</h4>
+=======
+<a name="fusion.container.map.example"></a><h5>
+<a name="id695049"></a>
+ <a class="link" href="map.html#fusion.container.map.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">map</span><span class="special"><</span>
<a href="../support/pair.html" title="pair"><tt class="computeroutput"><span class="identifier">pair</span></tt></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">></span>
<span class="special">,</span> pair<span class="special"><</span><span class="keyword">double</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">></span> <span class="special">></span>
Modified: branches/release/libs/fusion/doc/html/fusion/container/set.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/set.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/set.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>set</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="../container.html" title="Container">
<link rel="previous" href="list.html" title="list">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="list.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.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="map.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="id485216"></a>
<a href="set.html#fusion.container.set.description">Description</a>
</h4>
+=======
+<div class="section" title="set">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.container.set"></a><a class="link" href="set.html" title="set">set</a>
+</h3></div></div></div>
+<a name="fusion.container.set.description"></a><h5>
+<a name="id691394"></a>
+ <a class="link" href="set.html#fusion.container.set.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
set is an <a href="../sequence/concepts/associative_sequence.html" title="Associative
Sequence">Associative
@@ -42,19 +57,33 @@
element key lookup has constant runtime complexity (see <a href="../notes.html#fusion.notes.overloaded_functions">Overloaded
Functions</a>).
</p>
+<<<<<<< .working
<a name="fusion.container.set.header"></a><h4>
<a name="id485264"></a>
<a href="set.html#fusion.container.set.header">Header</a>
</h4>
+=======
+<a name="fusion.container.set.header"></a><h5>
+<a name="id691421"></a>
+ <a class="link" href="set.html#fusion.container.set.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">set_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">set_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.container.set.synopsis"></a><h4>
<a name="id485545"></a>
<a href="set.html#fusion.container.set.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.container.set.synopsis"></a><h5>
+<a name="id691620"></a>
+ <a class="link" href="set.html#fusion.container.set.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">T0</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
<span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
@@ -79,10 +108,17 @@
</p>
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_SET_SIZE</span> <span class="number">20</span>
</pre>
+<<<<<<< .working
<a name="fusion.container.set.template_parameters"></a><h4>
<a name="id485872"></a>
<a href="set.html#fusion.container.set.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.container.set.template_parameters"></a><h5>
+<a name="id691853"></a>
+ <a class="link" href="set.html#fusion.container.set.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -112,6 +148,7 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.container.set.model_of"></a><h4>
<a name="id485989"></a>
<a href="set.html#fusion.container.set.model_of">Model of</a>
@@ -119,6 +156,14 @@
<div class="itemizedlist"><ul type="disc">
<li><a href="../sequence/concepts/associative_sequence.html" title="Associative
Sequence">Associative
+=======
+<a name="fusion.container.set.model_of"></a><h5>
+<a name="id691946"></a>
+ <a class="link" href="set.html#fusion.container.set.model_of">Model of</a>
+ </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+>>>>>>> .merge-right.r57125
Sequence</a></li>
<li><a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward Sequence</a></li>
@@ -145,10 +190,17 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.container.set.expression_semantics"></a><h4>
<a name="id486183"></a>
<a href="set.html#fusion.container.set.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.container.set.expression_semantics"></a><h5>
+<a name="id692086"></a>
+ <a class="link" href="set.html#fusion.container.set.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Semantics of an expression is defined only where it differs from, or is not
defined in <a href="../sequence/concepts/random_access_sequence.html" title="Random
@@ -212,10 +264,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.container.set.example"></a><h4>
<a name="id486530"></a>
<a href="set.html#fusion.container.set.example">Example</a>
</h4>
+=======
+<a name="fusion.container.set.example"></a><h5>
+<a name="id692339"></a>
+ <a class="link" href="set.html#fusion.container.set.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">set</span><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">S</span><span class="special">;</span>
<span class="identifier">S</span> <span class="identifier">s</span><span class="special">(</span><span class="number">12</span><span class="special">,</span> <span class="number">5.5f</span><span class="special">);</span>
<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special"><<</span> at_key<span class="special"><</span><span class="keyword">int</span><span class="special">>(</span><span class="identifier">s</span><span class="special">)</span> <span class="special"><<</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
Modified: branches/release/libs/fusion/doc/html/fusion/container/vector.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/vector.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/container/vector.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>vector</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="../container.html" title="Container">
<link rel="previous" href="../container.html" title="Container">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="../container.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.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="cons.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="id478776"></a>
<a href="vector.html#fusion.container.vector.description">Description</a>
</h4>
+=======
+<div class="section" title="vector">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.container.vector"></a><a class="link" href="vector.html" title="vector">vector</a>
+</h3></div></div></div>
+<a name="fusion.container.vector.description"></a><h5>
+<a name="id685093"></a>
+ <a class="link" href="vector.html#fusion.container.vector.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
<tt class="computeroutput"><span class="identifier">vector</span></tt> is a <a href="../sequence/concepts/random_access_sequence.html" title="Random
Access Sequence">Random
@@ -42,10 +57,17 @@
is the simplest of the Fusion sequence container, and in many cases the most
efficient.
</p>
+<<<<<<< .working
<a name="fusion.container.vector.header"></a><h4>
<a name="id478852"></a>
<a href="vector.html#fusion.container.vector.header">Header</a>
</h4>
+=======
+<a name="fusion.container.vector.header"></a><h5>
+<a name="id685139"></a>
+ <a class="link" href="vector.html#fusion.container.vector.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">vector</span><span class="special">/</span><span class="identifier">vector_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
@@ -63,10 +85,17 @@
<span class="preprocessor">#include</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">container</span><span class="special">/</span><span class="identifier">vector</span><span class="special">/</span><span class="identifier">vector50</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">vector50</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.container.vector.synopsis"></a><h4>
<a name="id479828"></a>
<a href="vector.html#fusion.container.vector.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.container.vector.synopsis"></a><h5>
+<a name="id685841"></a>
+ <a class="link" href="vector.html#fusion.container.vector.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
<span class="bold"><b>Numbered forms</b></span>
</p>
@@ -118,10 +147,17 @@
</p>
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_VECTOR_SIZE</span> <span class="number">20</span>
</pre>
+<<<<<<< .working
<a name="fusion.container.vector.template_parameters"></a><h4>
<a name="id480553"></a>
<a href="vector.html#fusion.container.vector.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.container.vector.template_parameters"></a><h5>
+<a name="id686370"></a>
+ <a class="link" href="vector.html#fusion.container.vector.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -151,12 +187,20 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.container.vector.model_of"></a><h4>
<a name="id480672"></a>
<a href="vector.html#fusion.container.vector.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.container.vector.model_of"></a><h5>
+<a name="id687078"></a>
+ <a class="link" href="vector.html#fusion.container.vector.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>
<div class="variablelist">
<p class="title"><b>Notation</b></p>
@@ -180,10 +224,17 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.container.vector.expression_semantics"></a><h4>
<a name="id480855"></a>
<a href="vector.html#fusion.container.vector.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.container.vector.expression_semantics"></a><h5>
+<a name="id687209"></a>
+ <a class="link" href="vector.html#fusion.container.vector.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Semantics of an expression is defined only where it differs from, or is not
defined in <a href="../sequence/concepts/random_access_sequence.html" title="Random
@@ -245,10 +296,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.container.vector.example"></a><h4>
<a name="id481192"></a>
<a href="vector.html#fusion.container.vector.example">Example</a>
</h4>
+=======
+<a name="fusion.container.vector.example"></a><h5>
+<a name="id687458"></a>
+ <a class="link" href="vector.html#fusion.container.vector.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="identifier">vector</span><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">v</span><span class="special">(</span><span class="number">12</span><span class="special">,</span> <span class="number">5.5f</span><span class="special">);</span>
<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special"><<</span> at_c<span class="special"><</span><span class="number">0</span><span class="special">>(</span><span class="identifier">v</span><span class="special">)</span> <span class="special"><<</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"><<</span> at_c<span class="special"><</span><span class="number">1</span><span class="special">>(</span><span class="identifier">v</span><span class="special">)</span> <span class="special"><<</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
Modified: branches/release/libs/fusion/doc/html/fusion/extension.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/extension.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/extension.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>Extension</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="tuple/pairs.html" title="Pairs">
Modified: branches/release/libs/fusion/doc/html/fusion/extension/ext_full.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/extension/ext_full.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/extension/ext_full.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> The Full Extension Mechanism</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../extension.html" title="Extension">
<link rel="previous" href="../extension.html" title="Extension">
<link rel="next" href="sequence_facade.html" title="Sequence Facade">
@@ -51,10 +59,17 @@
sequence
</li>
</ol></div>
+<<<<<<< .working
<a name="fusion.extension.ext_full.our_example"></a><h4>
<a name="id599358"></a>
<a href="ext_full.html#fusion.extension.ext_full.our_example">Our example</a>
</h4>
+=======
+<a name="fusion.extension.ext_full.our_example"></a><h5>
+<a name="id831346"></a>
+ <a class="link" href="ext_full.html#fusion.extension.ext_full.our_example">Our example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
In order to illustrate enabling a new sequence type for use with Fusion,
we are going to use the type:
@@ -82,9 +97,15 @@
Sequence</a> as described in the <a href="../quick_start.html" title="Quick Start">Quick
Start</a> guide.
</p>
+<<<<<<< .working
<a name="fusion.extension.ext_full.enabling_tag_dispatching"></a><h4>
<a name="id599647"></a>
<a href="ext_full.html#fusion.extension.ext_full.enabling_tag_dispatching">Enabling
+=======
+<a name="fusion.extension.ext_full.enabling_tag_dispatching"></a><h5>
+<a name="id831550"></a>
+ <a class="link" href="ext_full.html#fusion.extension.ext_full.enabling_tag_dispatching">Enabling
+>>>>>>> .merge-right.r57125
Tag Dispatching</a>
</h4>
<p>
@@ -123,9 +144,15 @@
<pre class="programlisting"><span class="preprocessor">#include</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">adapted</span><span class="special">/</span><span class="identifier">array</span><span class="special">/</span><span class="identifier">tag_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">tag_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.extension.ext_full.designing_a_suitable_iterator"></a><h4>
<a name="id600268"></a>
<a href="ext_full.html#fusion.extension.ext_full.designing_a_suitable_iterator">Designing
+=======
+<a name="fusion.extension.ext_full.designing_a_suitable_iterator"></a><h5>
+<a name="id831986"></a>
+ <a class="link" href="ext_full.html#fusion.extension.ext_full.designing_a_suitable_iterator">Designing
+>>>>>>> .merge-right.r57125
a suitable iterator</a>
</h4>
<p>
@@ -185,9 +212,15 @@
In isolation, the iterator implementation is pretty dry. Things should become
clearer as we add features to our implementation.
</p>
+<<<<<<< .working
<a name="fusion.extension.ext_full.a_first_couple_of_instructive_features"></a><h4>
<a name="id600925"></a>
<a href="ext_full.html#fusion.extension.ext_full.a_first_couple_of_instructive_features">A
+=======
+<a name="fusion.extension.ext_full.a_first_couple_of_instructive_features"></a><h5>
+<a name="id832444"></a>
+ <a class="link" href="ext_full.html#fusion.extension.ext_full.a_first_couple_of_instructive_features">A
+>>>>>>> .merge-right.r57125
first couple of instructive features</a>
</h4>
<p>
@@ -220,19 +253,33 @@
based on the index of the iterator.
</p>
<p>
+<<<<<<< .working
To understand how <tt class="computeroutput"><span class="identifier">value_of_impl</span></tt>
is used by the library we will look at the implementation of value_of:
+=======
+ To understand how <code class="computeroutput"><span class="identifier">value_of_impl</span></code>
+ is used by the library we will look at the implementation of __value<span class="underline">of</span>_:
+>>>>>>> .merge-right.r57242
</p>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Iterator</span><span class="special">></span>
+<<<<<<< .working
<span class="keyword">struct</span> value_of
+=======
+<span class="keyword">struct</span> <span class="identifier">__value_of__</span>
+>>>>>>> .merge-right.r57242
<span class="special">:</span> <span class="identifier">extension</span><span class="special">::</span><span class="identifier">value_of_impl</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">detail</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special"><</span><span class="identifier">Iterator</span><span class="special">>::</span><span class="identifier">type</span><span class="special">>::</span>
<span class="keyword">template</span> <span class="identifier">apply</span><span class="special"><</span><span class="identifier">Iterator</span><span class="special">></span>
<span class="special">{};</span>
</pre>
<p>
+<<<<<<< .working
So value_of
uses tag dispatching
to select an <a href="http://www.boost.org/libs/mpl/doc/refmanual/metafunction-class.html" target="_top">MPL
+=======
+ So __value<span class="underline">of</span>_ uses <a class="link" href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
+ dispatching</em></span></a> to select an <a href="http://www.boost.org/libs/mpl/doc/refmanual/metafunction-class.html" target="_top">MPL
+>>>>>>> .merge-right.r57242
Metafunction Class</a> to provide its functionality. You will notice
this pattern throughout the implementation of Fusion.
</p>
@@ -299,9 +346,17 @@
<span class="special">}</span>
</pre>
<p>
+<<<<<<< .working
So again result_of::deref uses <a href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
dispatching</em></span></a> in exactly the same way as the value_of implementation. The runtime
functionality used by deref is provided by the <tt class="computeroutput"><span class="identifier">call</span></tt> static function of the selected <a href="http://www.boost.org/libs/mpl/doc/refmanual/metafunction-class.html" target="_top">MPL
+=======
+ So again <a class="link" href="../iterator/metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a> uses <a class="link" href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
+ dispatching</em></span></a> in exactly the same way as the __value<span class="underline">of</span>_ implementation. The runtime functionality
+ used by <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a>
+ is provided by the <code class="computeroutput"><span class="identifier">call</span></code> static
+ function of the selected <a href="http://www.boost.org/libs/mpl/doc/refmanual/metafunction-class.html" target="_top">MPL
+>>>>>>> .merge-right.r57242
Metafunction Class</a>.
</p>
<p>
@@ -319,21 +374,41 @@
</tr>
<tr><td colspan="2" align="left" valign="top"><p>
Although there is a fair amount of left to do to produce a fully fledged
+<<<<<<< .working
Fusion sequence, value_of and deref illustrate all the signficant
concepts required. The remainder of the process is very repetitive, simply
requiring implementation of a suitable <tt class="computeroutput"><span class="identifier">xxxx_impl</span></tt>
for each feature <tt class="computeroutput"><span class="identifier">xxxx</span></tt>.
+=======
+ Fusion sequence, __value<span class="underline">of</span>_ and
+ <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a>
+ illustrate all the signficant concepts required. The remainder of the process
+ is very repetitive, simply requiring implementation of a suitable <code class="computeroutput"><span class="identifier">xxxx_impl</span></code> for each feature <code class="computeroutput"><span class="identifier">xxxx</span></code>.
+>>>>>>> .merge-right.r57242
</p></td></tr>
</table></div>
+<<<<<<< .working
<a name="fusion.extension.ext_full.implementing_the_remaining_iterator_functionality"></a><h4>
<a name="id603230"></a>
<a href="ext_full.html#fusion.extension.ext_full.implementing_the_remaining_iterator_functionality">Implementing
+=======
+<a name="fusion.extension.ext_full.implementing_the_remaining_iterator_functionality"></a><h5>
+<a name="id834035"></a>
+ <a class="link" href="ext_full.html#fusion.extension.ext_full.implementing_the_remaining_iterator_functionality">Implementing
+>>>>>>> .merge-right.r57125
the remaining iterator functionality</a>
</h4>
<p>
+<<<<<<< .working
Ok, now we have seen the way value_of and deref work, everything else will
work in pretty much the same way. Lets start with forward iteration, by providing
a <tt class="computeroutput"><span class="identifier">next_impl</span></tt>:
+=======
+ Ok, now we have seen the way __value<span class="underline">of</span>_
+ and <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a>
+ work, everything else will work in pretty much the same way. Lets start with
+ forward iteration, by providing a <code class="computeroutput"><span class="identifier">next_impl</span></code>:
+>>>>>>> .merge-right.r57242
</p>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><></span>
<span class="keyword">struct</span> <span class="identifier">next_impl</span><span class="special"><</span><span class="identifier">example</span><span class="special">::</span><span class="identifier">example_struct_iterator_tag</span><span class="special">></span>
@@ -379,9 +454,15 @@
<tt class="computeroutput"><span class="identifier">advance_impl</span></tt>, <tt class="computeroutput"><span class="identifier">distance_impl</span></tt> and <tt class="computeroutput"><span class="identifier">equal_to_impl</span></tt>
are provided in the example code.
</p>
+<<<<<<< .working
<a name="fusion.extension.ext_full.implementing_the_intrinsic_functions_of_the_sequence"></a><h4>
<a name="id603878"></a>
<a href="ext_full.html#fusion.extension.ext_full.implementing_the_intrinsic_functions_of_the_sequence">Implementing
+=======
+<a name="fusion.extension.ext_full.implementing_the_intrinsic_functions_of_the_sequence"></a><h5>
+<a name="id834467"></a>
+ <a class="link" href="ext_full.html#fusion.extension.ext_full.implementing_the_intrinsic_functions_of_the_sequence">Implementing
+>>>>>>> .merge-right.r57125
the intrinsic functions of the sequence</a>
</h4>
<p>
@@ -436,9 +517,15 @@
Access Sequence</a> we will also need to implement <tt class="computeroutput"><span class="identifier">size_impl</span></tt>,
<tt class="computeroutput"><span class="identifier">value_at_impl</span></tt> and <tt class="computeroutput"><span class="identifier">at_impl</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.extension.ext_full.enabling_our_type_as_an_associative_container"></a><h4>
<a name="id604481"></a>
<a href="ext_full.html#fusion.extension.ext_full.enabling_our_type_as_an_associative_container">Enabling
+=======
+<a name="fusion.extension.ext_full.enabling_our_type_as_an_associative_container"></a><h5>
+<a name="id834878"></a>
+ <a class="link" href="ext_full.html#fusion.extension.ext_full.enabling_our_type_as_an_associative_container">Enabling
+>>>>>>> .merge-right.r57125
our type as an associative container</a>
</h4>
<p>
@@ -503,10 +590,17 @@
straightforward, and are provided in the example code, along with an implementation
of <tt class="computeroutput"><span class="identifier">is_associative_impl</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.extension.ext_full.summary"></a><h4>
<a name="id605488"></a>
<a href="ext_full.html#fusion.extension.ext_full.summary">Summary</a>
</h4>
+=======
+<a name="fusion.extension.ext_full.summary"></a><h5>
+<a name="id836875"></a>
+ <a class="link" href="ext_full.html#fusion.extension.ext_full.summary">Summary</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
We've now worked through the entire process for adding a new random access
sequence and we've also enabled our type to serve as an associative container.
@@ -521,7 +615,7 @@
</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 © 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/extension/iterator_facade.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/extension/iterator_facade.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/extension/iterator_facade.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>Iterator Facade</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../extension.html" title="Extension">
<link rel="previous" href="sequence_facade.html" title="Sequence Facade">
<link rel="next" href="../functional.html" title="Functional">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="sequence_facade.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../extension.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="../functional.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,22 +42,46 @@
<a name="id607099"></a>
<a href="iterator_facade.html#fusion.extension.iterator_facade.description">Description</a>
</h4>
+=======
+<div class="section" title="Iterator Facade">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.extension.iterator_facade"></a><a class="link" href="iterator_facade.html" title="Iterator Facade">Iterator Facade</a>
+</h3></div></div></div>
+<a name="fusion.extension.iterator_facade.description"></a><h5>
+<a name="id823411"></a>
+ <a class="link" href="iterator_facade.html#fusion.extension.iterator_facade.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
The iterator_facade
template provides an intrusive mechanism for producing a conforming Fusion
iterator.
</p>
+<<<<<<< .working
<a name="fusion.extension.iterator_facade.synopsis"></a><h4>
<a name="id607146"></a>
<a href="iterator_facade.html#fusion.extension.iterator_facade.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.extension.iterator_facade.synopsis"></a><h5>
+<a name="id823438"></a>
+ <a class="link" href="iterator_facade.html#fusion.extension.iterator_facade.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Derived</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">TravesalTag</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">iterator_facade</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.extension.iterator_facade.usage"></a><h4>
<a name="id607239"></a>
<a href="iterator_facade.html#fusion.extension.iterator_facade.usage">Usage</a>
</h4>
+=======
+<a name="fusion.extension.iterator_facade.usage"></a><h5>
+<a name="id823501"></a>
+ <a class="link" href="iterator_facade.html#fusion.extension.iterator_facade.usage">Usage</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
The user of iterator_facade derives his iterator type from a specialization
of iterator_facade and passes the derived iterator type as the first template
@@ -60,8 +93,33 @@
type.
</p>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id607264"></a><p class="title"><b>Table 1.93. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id858314"></a><p class="title"><b>Table 1.93. Parameters</b></p>
+=======
+<a name="id821953"></a><p class="title"><b>Table 1.97. Parameters</b></p>
+=======
+<a name="id814329"></a><p class="title"><b>Table 1.97. Parameters</b></p>
+=======
+<a name="id838126"></a><p class="title"><b>Table 1.97. Parameters</b></p>
+=======
+<a name="id826795"></a><p class="title"><b>Table 1.97. Parameters</b></p>
+=======
+<a name="id823518"></a><p class="title"><b>Table 1.97. 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,9 +154,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<div class="table">
<a name="id607422"></a><p class="title"><b>Table 1.94. Key Expressions</b></p>
<table class="table" summary="Key Expressions">
+=======
+<br class="table-break"><div class="table">
+<a name="id823639"></a><p class="title"><b>Table 1.98. Key Expressions</b></p>
+<div class="table-contents"><table class="table" summary="Key Expressions">
+>>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
@@ -268,20 +332,104 @@
<tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">same_type</span><span class="special"><</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">>::</span><span class="identifier">type</span><span class="special">()</span></tt>
</p></td>
</tr>
+<tr>
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">key_of</span><span class="special"><</span><span class="identifier">It</span><span class="special">>::</span><span class="identifier">type</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ The key type associated with the element from <code class="computeroutput"><span class="identifier">It</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ None
+ </p>
+ </td>
+</tr>
+<tr>
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">value_of_data</span><span class="special"><</span><span class="identifier">It</span><span class="special">>::</span><span class="identifier">type</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ The type of the data property associated with the element from <code class="computeroutput"><span class="identifier">It</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ None
+ </p>
+ </td>
+</tr>
+<tr>
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">deref_data</span><span class="special"><</span><span class="identifier">It</span><span class="special">>::</span><span class="identifier">type</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ The type that will be returned by dereferencing the data property of
+ the element from <code class="computeroutput"><span class="identifier">It</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ None
+ </p>
+ </td>
+</tr>
+<tr>
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">deref_data</span><span class="special"><</span><span class="identifier">It</span><span class="special">>::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it</span><span class="special">)</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ Deferences the data property associated with the element referenced
+ by <code class="computeroutput"><span class="identifier">it</span></code>
+ </p>
+ </td>
+<td>
+ <p>
+ None
+ </p>
+ </td>
+</tr>
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.extension.iterator_facade.header"></a><h4>
<a name="id608981"></a>
<a href="iterator_facade.html#fusion.extension.iterator_facade.header">Header</a>
</h4>
+=======
+<br class="table-break"><a name="fusion.extension.iterator_facade.header"></a><h5>
+<a name="id825613"></a>
+ <a class="link" href="iterator_facade.html#fusion.extension.iterator_facade.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">iterator_facade</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">iterator_facade</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.extension.iterator_facade.example"></a><h4>
<a name="id609138"></a>
<a href="iterator_facade.html#fusion.extension.iterator_facade.example">Example</a>
</h4>
+=======
+<a name="fusion.extension.iterator_facade.example"></a><h5>
+<a name="id825721"></a>
+ <a class="link" href="iterator_facade.html#fusion.extension.iterator_facade.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
A full working example using iterator_facade is provided in triple.cpp
in the extension examples.
@@ -289,7 +437,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 © 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/extension/sequence_facade.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/extension/sequence_facade.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/extension/sequence_facade.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>Sequence Facade</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../extension.html" title="Extension">
<link rel="previous" href="ext_full.html" title=" The Full Extension Mechanism">
<link rel="next" href="iterator_facade.html" title="Iterator Facade">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="ext_full.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../extension.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="iterator_facade.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,22 +42,46 @@
<a name="id605596"></a>
<a href="sequence_facade.html#fusion.extension.sequence_facade.description">Description</a>
</h4>
+=======
+<div class="section" title="Sequence Facade">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.extension.sequence_facade"></a><a class="link" href="sequence_facade.html" title="Sequence Facade">Sequence Facade</a>
+</h3></div></div></div>
+<a name="fusion.extension.sequence_facade.description"></a><h5>
+<a name="id822333"></a>
+ <a class="link" href="sequence_facade.html#fusion.extension.sequence_facade.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
The sequence_facade
template provides an intrusive mechanism for producing a conforming Fusion
iterator.
</p>
+<<<<<<< .working
<a name="fusion.extension.sequence_facade.synopsis"></a><h4>
<a name="id605644"></a>
<a href="sequence_facade.html#fusion.extension.sequence_facade.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.extension.sequence_facade.synopsis"></a><h5>
+<a name="id822359"></a>
+ <a class="link" href="sequence_facade.html#fusion.extension.sequence_facade.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Derived</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">TravesalTag</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">IsView</span> <span class="special">=</span> <span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">sequence_facade</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.extension.sequence_facade.usage"></a><h4>
<a name="id605777"></a>
<a href="sequence_facade.html#fusion.extension.sequence_facade.usage">Usage</a>
</h4>
+=======
+<a name="fusion.extension.sequence_facade.usage"></a><h5>
+<a name="id822453"></a>
+ <a class="link" href="sequence_facade.html#fusion.extension.sequence_facade.usage">Usage</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
The user of sequence_facade derives his sequence
type from a specialization of sequence_facade and passes the derived
@@ -62,8 +95,33 @@
type.
</p>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id605864"></a><p class="title"><b>Table 1.91. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id857300"></a><p class="title"><b>Table 1.91. Parameters</b></p>
+=======
+<a name="id820939"></a><p class="title"><b>Table 1.95. Parameters</b></p>
+=======
+<a name="id813315"></a><p class="title"><b>Table 1.95. Parameters</b></p>
+=======
+<a name="id837112"></a><p class="title"><b>Table 1.95. Parameters</b></p>
+=======
+<a name="id825781"></a><p class="title"><b>Table 1.95. Parameters</b></p>
+=======
+<a name="id822504"></a><p class="title"><b>Table 1.95. 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 +155,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<div class="table">
<a name="id605998"></a><p class="title"><b>Table 1.92. Key Expressions</b></p>
<table class="table" summary="Key Expressions">
+=======
+<br class="table-break"><div class="table">
+<a name="id822611"></a><p class="title"><b>Table 1.96. Key Expressions</b></p>
+<div class="table-contents"><table class="table" summary="Key Expressions">
+>>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
@@ -193,17 +257,31 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.extension.sequence_facade.include"></a><h4>
<a name="id606877"></a>
<a href="sequence_facade.html#fusion.extension.sequence_facade.include">Include</a>
</h4>
+=======
+<br class="table-break"><a name="fusion.extension.sequence_facade.include"></a><h5>
+<a name="id823266"></a>
+ <a class="link" href="sequence_facade.html#fusion.extension.sequence_facade.include">Include</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">sequence_facade</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">sequence_facade</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.extension.sequence_facade.example"></a><h4>
<a name="id607033"></a>
<a href="sequence_facade.html#fusion.extension.sequence_facade.example">Example</a>
</h4>
+=======
+<a name="fusion.extension.sequence_facade.example"></a><h5>
+<a name="id823374"></a>
+ <a class="link" href="sequence_facade.html#fusion.extension.sequence_facade.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
A full working example using sequence_facade is provided in triple.cpp
in the extension examples.
@@ -211,7 +289,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 © 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/functional.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional.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>Functional</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="extension/iterator_facade.html" title="Iterator Facade">
@@ -65,15 +69,28 @@
Components to call functions and function objects and to make Fusion code callable
through a function object interface.
</p>
+<<<<<<< .working
<a name="fusion.functional.header"></a><h3>
<a name="id609210"></a>
<a href="functional.html#fusion.functional.header">Header</a>
</h3>
+=======
+<a name="fusion.functional.header"></a><h4>
+<a name="id816312"></a>
+ <a class="link" href="functional.html#fusion.functional.header">Header</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.fused_and_unfused_forms"></a><h3>
<a name="id609292"></a>
<a href="functional.html#fusion.functional.fused_and_unfused_forms">Fused and unfused
+=======
+<a name="fusion.functional.fused_and_unfused_forms"></a><h4>
+<a name="id816367"></a>
+ <a class="link" href="functional.html#fusion.functional.fused_and_unfused_forms">Fused and unfused
+>>>>>>> .merge-right.r57125
forms</a>
</h3>
<p>
@@ -105,9 +122,15 @@
<tt class="computeroutput"><span class="identifier">f</span></tt> is the <span class="emphasis"><em>unfused</em></span>
form of <tt class="literal">f'</tt>.
</p>
+<<<<<<< .working
<a name="fusion.functional.calling_functions_and_function_objects"></a><h3>
<a name="id609552"></a>
<a href="functional.html#fusion.functional.calling_functions_and_function_objects">Calling
+=======
+<a name="fusion.functional.calling_functions_and_function_objects"></a><h4>
+<a name="id816552"></a>
+ <a class="link" href="functional.html#fusion.functional.calling_functions_and_function_objects">Calling
+>>>>>>> .merge-right.r57125
functions and function objects</a>
</h3>
<p>
@@ -136,9 +159,15 @@
<p>
Constructors can be called applying Boost.Functional/Factory.
</p>
+<<<<<<< .working
<a name="fusion.functional.making_fusion_code_callable_through_a_function_object_interface"></a><h3>
<a name="id609639"></a>
<a href="functional.html#fusion.functional.making_fusion_code_callable_through_a_function_object_interface">Making
+=======
+<a name="fusion.functional.making_fusion_code_callable_through_a_function_object_interface"></a><h4>
+<a name="id816596"></a>
+ <a class="link" href="functional.html#fusion.functional.making_fusion_code_callable_through_a_function_object_interface">Making
+>>>>>>> .merge-right.r57125
Fusion code callable through a function object interface</a>
</h3>
<p>
Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters.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> Adapters</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="../functional.html" title="Functional">
<link rel="previous" href="invocation/limits.html" title="Limits">
Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused.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>fused</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="../adapters.html" title=" Adapters">
<link rel="previous" href="../adapters.html" title=" Adapters">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="../adapters.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.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="fused_procedure.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,6 +38,16 @@
<a name="id617699"></a>
<a href="fused.html#fusion.functional.adapters.fused.description">Description</a>
</h5>
+=======
+<div class="section" title="fused">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.adapters.fused"></a><a class="link" href="fused.html" title="fused">fused</a>
+</h4></div></div></div>
+<a name="fusion.functional.adapters.fused.description"></a><h6>
+<a name="id826228"></a>
+ <a class="link" href="fused.html#fusion.functional.adapters.fused.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
An unary <a href="../concepts/poly.html" title=" Polymorphic Function
Object">Polymorphic Function
@@ -59,22 +74,42 @@
be defined (Boost provides this function for <tt class="literal">std::auto_ptr</tt>
and boost::shared_ptr).
</p>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused.header"></a><h5>
<a name="id617829"></a>
<a href="fused.html#fusion.functional.adapters.fused.header">Header</a>
</h5>
+=======
+<a name="fusion.functional.adapters.fused.header"></a><h6>
+<a name="id826303"></a>
+ <a class="link" href="fused.html#fusion.functional.adapters.fused.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">fused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused.synopsis"></a><h5>
<a name="id617932"></a>
<a href="fused.html#fusion.functional.adapters.fused.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.functional.adapters.fused.synopsis"></a><h6>
+<a name="id826373"></a>
+ <a class="link" href="fused.html#fusion.functional.adapters.fused.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">></span>
<span class="keyword">class</span> <span class="identifier">fused</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused.template_parameters"></a><h5>
<a name="id618009"></a>
<a href="fused.html#fusion.functional.adapters.fused.template_parameters">Template
+=======
+<a name="fusion.functional.adapters.fused.template_parameters"></a><h6>
+<a name="id826425"></a>
+ <a class="link" href="fused.html#fusion.functional.adapters.fused.template_parameters">Template
+>>>>>>> .merge-right.r57125
parameters</a>
</h5>
<div class="informaltable"><table class="table">
@@ -107,6 +142,7 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused.model_of"></a><h5>
<a name="id618123"></a>
<a href="fused.html#fusion.functional.adapters.fused.model_of">Model of</a>
@@ -114,6 +150,14 @@
<div class="itemizedlist"><ul type="disc">
<li><a href="../concepts/poly.html" title=" Polymorphic Function
Object">Polymorphic Function
+=======
+<a name="fusion.functional.adapters.fused.model_of"></a><h6>
+<a name="id826512"></a>
+ <a class="link" href="fused.html#fusion.functional.adapters.fused.model_of">Model of</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
+>>>>>>> .merge-right.r57125
Object</a></li>
<li><a href="../concepts/def_callable.html" title=" Deferred
Callable Object">Deferred Callable
@@ -143,9 +187,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused.expression_semantics"></a><h5>
<a name="id618340"></a>
<a href="fused.html#fusion.functional.adapters.fused.expression_semantics">Expression
+=======
+<a name="fusion.functional.adapters.fused.expression_semantics"></a><h6>
+<a name="id826667"></a>
+ <a class="link" href="fused.html#fusion.functional.adapters.fused.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<div class="informaltable"><table class="table">
@@ -191,13 +241,23 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused.example"></a><h5>
<a name="id618593"></a>
<a href="fused.html#fusion.functional.adapters.fused.example">Example</a>
</h5>
<pre class="programlisting"><span class="identifier">fused</span><span class="special"><</span> std::plus<span class="special"><</span><span class="keyword">long</span><span class="special">></span> <span class="special">></span> <span class="identifier">f</span><span class="special">;</span>
<span class="identifier">assert</span><span class="special">(</span><span class="identifier">f</span><span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2l</span><span class="special">))</span> <span class="special">==</span> <span class="number">3l</span><span class="special">);</span>
+=======
+<a name="fusion.functional.adapters.fused.example"></a><h6>
+<a name="id826854"></a>
+ <a class="link" href="fused.html#fusion.functional.adapters.fused.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="identifier">fused</span><span class="special"><</span> std::plus<span class="special"><</span><span class="keyword">long</span><span class="special">></span> <span class="special">></span> <span class="identifier">f</span><span class="special">;</span>
+<span class="identifier">assert</span><span class="special">(</span><span class="identifier">f</span><span class="special">(</span><a class="link" href="../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2l</span><span class="special">))</span> <span class="special">==</span> <span class="number">3l</span><span class="special">);</span>
+>>>>>>> .merge-right.r57125
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused.see_also"></a><h5>
<a name="id618768"></a>
<a href="fused.html#fusion.functional.adapters.fused.see_also">See also</a>
@@ -209,6 +269,18 @@
<li><a href="../generation/functions/mk_fused.html" title="
make_fused"><tt class="computeroutput"><span class="identifier">make_fused</span></tt></a></li>
<li>deduce</li>
+=======
+<a name="fusion.functional.adapters.fused.see_also"></a><h6>
+<a name="id826975"></a>
+ <a class="link" href="fused.html#fusion.functional.adapters.fused.see_also">See also</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="fused_procedure.html" title="fused_procedure"><code class="computeroutput"><span class="identifier">fused_procedure</span></code></a></li>
+<li class="listitem"><a class="link" href="fused_function_object.html" title="fused_function_object"><code class="computeroutput"><span class="identifier">fused_function_object</span></code></a></li>
+<li class="listitem"><a class="link" href="../invocation/functions/invoke.html" title="invoke"><code class="computeroutput"><span class="identifier">invoke</span></code></a></li>
+<li class="listitem"><a class="link" href="../generation/functions/mk_fused.html" title="make_fused"><code class="computeroutput"><span class="identifier">make_fused</span></code></a></li>
+<li class="listitem"><a class="link" href="../../support/deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li>
+>>>>>>> .merge-right.r57125
</ul></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_function_object.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_function_object.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_function_object.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>fused_function_object</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="../adapters.html" title=" Adapters">
<link rel="previous" href="fused_procedure.html" title="fused_procedure">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="fused_procedure.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.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="unfused.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,6 +38,16 @@
<a name="id620581"></a>
<a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.description">Description</a>
</h5>
+=======
+<div class="section" title="fused_function_object">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.adapters.fused_function_object"></a><a class="link" href="fused_function_object.html" title="fused_function_object">fused_function_object</a>
+</h4></div></div></div>
+<a name="fusion.functional.adapters.fused_function_object.description"></a><h6>
+<a name="id828234"></a>
+ <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
An unary <a href="../concepts/poly.html" title=" Polymorphic Function
Object">Polymorphic Function
@@ -49,22 +64,42 @@
for an target function object that is const or, if the target function
object is held by value, the adapter is const).
</p>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_function_object.header"></a><h5>
<a name="id620655"></a>
<a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.header">Header</a>
</h5>
+=======
+<a name="fusion.functional.adapters.fused_function_object.header"></a><h6>
+<a name="id828277"></a>
+ <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">fused_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_function_object.synopsis"></a><h5>
<a name="id620759"></a>
<a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.functional.adapters.fused_function_object.synopsis"></a><h6>
+<a name="id828349"></a>
+ <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">class</span> <span class="identifier">Function</span><span class="special">></span>
<span class="keyword">class</span> <span class="identifier">fused_function_object</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_function_object.template_parameters"></a><h5>
<a name="id620839"></a>
<a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.template_parameters">Template
+=======
+<a name="fusion.functional.adapters.fused_function_object.template_parameters"></a><h6>
+<a name="id829223"></a>
+ <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.template_parameters">Template
+>>>>>>> .merge-right.r57125
parameters</a>
</h5>
<div class="informaltable"><table class="table">
@@ -97,9 +132,15 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_function_object.model_of"></a><h5>
<a name="id620953"></a>
<a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.model_of">Model
+=======
+<a name="fusion.functional.adapters.fused_function_object.model_of"></a><h6>
+<a name="id829313"></a>
+ <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.model_of">Model
+>>>>>>> .merge-right.r57125
of</a>
</h5>
<div class="itemizedlist"><ul type="disc">
@@ -134,9 +175,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_function_object.expression_semantics"></a><h5>
<a name="id621172"></a>
<a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.expression_semantics">Expression
+=======
+<a name="fusion.functional.adapters.fused_function_object.expression_semantics"></a><h6>
+<a name="id829470"></a>
+ <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<div class="informaltable"><table class="table">
@@ -182,10 +229,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_function_object.example"></a><h5>
<a name="id621426"></a>
<a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.example">Example</a>
</h5>
+=======
+<a name="fusion.functional.adapters.fused_function_object.example"></a><h6>
+<a name="id829660"></a>
+ <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.example">Example</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">class</span> <span class="identifier">SeqOfSeqs</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Func</span><span class="special">></span>
<span class="keyword">typename</span> result_of::transform<span class="special"><</span> <span class="identifier">zip_view</span><span class="special"><</span><span class="identifier">SeqOfSeqs</span><span class="special">></span> <span class="keyword">const</span><span class="special">,</span>
<span class="identifier">fused_function_object</span><span class="special"><</span><span class="identifier">Func</span> <span class="keyword">const</span> <span class="special">&></span> <span class="special">>::</span><span class="identifier">type</span>
@@ -219,9 +273,15 @@
<span class="identifier">assert</span><span class="special">(</span><span class="identifier">c</span> <span class="special">==</span> <span class="identifier">n_ary_transform</span><span class="special">(</span>vector_tie<span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">sub</span><span class="special">()));</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_function_object.see_also"></a><h5>
<a name="id622481"></a>
<a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.see_also">See
+=======
+<a name="fusion.functional.adapters.fused_function_object.see_also"></a><h6>
+<a name="id830432"></a>
+ <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h5>
<div class="itemizedlist"><ul type="disc">
Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_procedure.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_procedure.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_procedure.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>fused_procedure</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="../adapters.html" title=" Adapters">
<link rel="previous" href="fused.html" title="fused">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="fused.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.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="fused_function_object.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,6 +38,16 @@
<a name="id618918"></a>
<a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.description">Description</a>
</h5>
+=======
+<div class="section" title="fused_procedure">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.adapters.fused_procedure"></a><a class="link" href="fused_procedure.html" title="fused_procedure">fused_procedure</a>
+</h4></div></div></div>
+<a name="fusion.functional.adapters.fused_procedure.description"></a><h6>
+<a name="id827069"></a>
+ <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
An unary <a href="../concepts/poly.html" title=" Polymorphic Function
Object">Polymorphic Function
@@ -66,22 +81,42 @@
such a pointer without returning anything does not make sense, so this
case is not implemented).
</p>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_procedure.header"></a><h5>
<a name="id619075"></a>
<a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.header">Header</a>
</h5>
+=======
+<a name="fusion.functional.adapters.fused_procedure.header"></a><h6>
+<a name="id827159"></a>
+ <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">fused_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_procedure.synopsis"></a><h5>
<a name="id619178"></a>
<a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.functional.adapters.fused_procedure.synopsis"></a><h6>
+<a name="id827229"></a>
+ <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">></span>
<span class="keyword">class</span> <span class="identifier">fused_procedure</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_procedure.template_parameters"></a><h5>
<a name="id619256"></a>
<a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.template_parameters">Template
+=======
+<a name="fusion.functional.adapters.fused_procedure.template_parameters"></a><h6>
+<a name="id827283"></a>
+ <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.template_parameters">Template
+>>>>>>> .merge-right.r57125
parameters</a>
</h5>
<div class="informaltable"><table class="table">
@@ -113,9 +148,15 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_procedure.model_of"></a><h5>
<a name="id619369"></a>
<a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.model_of">Model
+=======
+<a name="fusion.functional.adapters.fused_procedure.model_of"></a><h6>
+<a name="id827373"></a>
+ <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.model_of">Model
+>>>>>>> .merge-right.r57125
of</a>
</h5>
<div class="itemizedlist"><ul type="disc">
@@ -149,9 +190,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_procedure.expression_semantics"></a><h5>
<a name="id619587"></a>
<a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.expression_semantics">Expression
+=======
+<a name="fusion.functional.adapters.fused_procedure.expression_semantics"></a><h6>
+<a name="id827530"></a>
+ <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<div class="informaltable"><table class="table">
@@ -197,10 +244,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_procedure.example"></a><h5>
<a name="id619843"></a>
<a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.example">Example</a>
</h5>
+=======
+<a name="fusion.functional.adapters.fused_procedure.example"></a><h6>
+<a name="id827719"></a>
+ <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.example">Example</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">class</span> <span class="identifier">SequenceOfSequences</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Func</span><span class="special">></span>
<span class="keyword">void</span> <span class="identifier">n_ary_for_each</span><span class="special">(</span><span class="identifier">SequenceOfSequences</span> <span class="keyword">const</span> <span class="special">&</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">Func</span> <span class="keyword">const</span> <span class="special">&</span> <span class="identifier">f</span><span class="special">)</span>
<span class="special">{</span>
@@ -217,9 +271,15 @@
<span class="identifier">assert</span><span class="special">(</span><span class="identifier">a</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">0.5f</span><span class="special">));</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.fused_procedure.see_also"></a><h5>
<a name="id620448"></a>
<a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.see_also">See
+=======
+<a name="fusion.functional.adapters.fused_procedure.see_also"></a><h6>
+<a name="id828151"></a>
+ <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h5>
<div class="itemizedlist"><ul type="disc">
Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/limits.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/limits.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/limits.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>Limits</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="../adapters.html" title=" Adapters">
<link rel="previous" href="unfused_typed.html" title="unfused_typed">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="unfused_typed.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.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="../generation.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,12 +38,29 @@
<a name="id626930"></a>
<a href="limits.html#fusion.functional.adapters.limits.header">Header</a>
</h5>
+=======
+<div class="section" title="Limits">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.adapters.limits"></a><a class="link" href="limits.html" title="Limits">Limits</a>
+</h4></div></div></div>
+<a name="fusion.functional.adapters.limits.header"></a><h6>
+<a name="id836902"></a>
+ <a class="link" href="limits.html#fusion.functional.adapters.limits.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">limits</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.limits.macros"></a><h5>
<a name="id627034"></a>
<a href="limits.html#fusion.functional.adapters.limits.macros">Macros</a>
</h5>
+=======
+<a name="fusion.functional.adapters.limits.macros"></a><h6>
+<a name="id836972"></a>
+ <a class="link" href="limits.html#fusion.functional.adapters.limits.macros">Macros</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
The following macros can be defined to change the maximum arity. The value
used for these macros must not exceed <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>.
Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused.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>unfused</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="../adapters.html" title=" Adapters">
<link rel="previous" href="fused_function_object.html" title="fused_function_object">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="fused_function_object.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.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="unfused_typed.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,6 +38,16 @@
<a name="id622635"></a>
<a href="unfused.html#fusion.functional.adapters.unfused.description">Description</a>
</h5>
+=======
+<div class="section" title="unfused">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.adapters.unfused"></a><a class="link" href="unfused.html" title="unfused">unfused</a>
+</h4></div></div></div>
+<a name="fusion.functional.adapters.unfused.description"></a><h6>
+<a name="id830528"></a>
+ <a class="link" href="unfused.html#fusion.functional.adapters.unfused.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
An n-ary <a href="../concepts/poly.html" title=" Polymorphic Function
Object">Polymorphic Function
@@ -62,22 +77,42 @@
if the target function object is const - or, in case the target function
object is held by value, the adapter is const.
</p>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused.header"></a><h5>
<a name="id622744"></a>
<a href="unfused.html#fusion.functional.adapters.unfused.header">Header</a>
</h5>
+=======
+<a name="fusion.functional.adapters.unfused.header"></a><h6>
+<a name="id830586"></a>
+ <a class="link" href="unfused.html#fusion.functional.adapters.unfused.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">unfused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused.synopsis"></a><h5>
<a name="id622847"></a>
<a href="unfused.html#fusion.functional.adapters.unfused.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.functional.adapters.unfused.synopsis"></a><h6>
+<a name="id830656"></a>
+ <a class="link" href="unfused.html#fusion.functional.adapters.unfused.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">class</span> <span class="identifier">Function</span><span class="special">,</span> <span class="keyword">bool</span> <span class="identifier">AllowNullary</span> <span class="special">=</span> <span class="keyword">true</span><span class="special">></span>
<span class="keyword">class</span> <span class="identifier">unfused</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused.template_parameters"></a><h5>
<a name="id622953"></a>
<a href="unfused.html#fusion.functional.adapters.unfused.template_parameters">Template
+=======
+<a name="fusion.functional.adapters.unfused.template_parameters"></a><h6>
+<a name="id830730"></a>
+ <a class="link" href="unfused.html#fusion.functional.adapters.unfused.template_parameters">Template
+>>>>>>> .merge-right.r57125
parameters</a>
</h5>
<div class="informaltable"><table class="table">
@@ -123,6 +158,7 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused.model_of"></a><h5>
<a name="id623102"></a>
<a href="unfused.html#fusion.functional.adapters.unfused.model_of">Model of</a>
@@ -130,6 +166,14 @@
<div class="itemizedlist"><ul type="disc">
<li><a href="../concepts/poly.html" title=" Polymorphic Function
Object">Polymorphic Function
+=======
+<a name="fusion.functional.adapters.unfused.model_of"></a><h6>
+<a name="id830848"></a>
+ <a class="link" href="unfused.html#fusion.functional.adapters.unfused.model_of">Model of</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
+>>>>>>> .merge-right.r57125
Object</a></li>
<li><a href="../concepts/def_callable.html" title=" Deferred
Callable Object">Deferred Callable
@@ -163,9 +207,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused.expression_semantics"></a><h5>
<a name="id623371"></a>
<a href="unfused.html#fusion.functional.adapters.unfused.expression_semantics">Expression
+=======
+<a name="fusion.functional.adapters.unfused.expression_semantics"></a><h6>
+<a name="id831038"></a>
+ <a class="link" href="unfused.html#fusion.functional.adapters.unfused.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<div class="informaltable"><table class="table">
@@ -211,10 +261,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused.example"></a><h5>
<a name="id623635"></a>
<a href="unfused.html#fusion.functional.adapters.unfused.example">Example</a>
</h5>
+=======
+<a name="fusion.functional.adapters.unfused.example"></a><h6>
+<a name="id831231"></a>
+ <a class="link" href="unfused.html#fusion.functional.adapters.unfused.example">Example</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">fused_incrementer</span>
<span class="special">{</span>
<span class="keyword">template</span> <span class="special"><</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">></span>
@@ -238,6 +295,7 @@
<span class="identifier">assert</span><span class="special">(</span><span class="identifier">a</span> <span class="special">==</span> <span class="number">3</span> <span class="special">&&</span> <span class="identifier">b</span> <span class="special">==</span> <span class="char">'Y'</span><span class="special">);</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused.see_also"></a><h5>
<a name="id624132"></a>
<a href="unfused.html#fusion.functional.adapters.unfused.see_also">See also</a>
@@ -246,6 +304,15 @@
<li>unfused_typed</li>
<li><a href="../generation/functions/mk_unfused.html" title="
make_unfused"><tt class="computeroutput"><span class="identifier">make_unfused</span></tt></a></li>
+=======
+<a name="fusion.functional.adapters.unfused.see_also"></a><h6>
+<a name="id834329"></a>
+ <a class="link" href="unfused.html#fusion.functional.adapters.unfused.see_also">See also</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="unfused_typed.html" title="unfused_typed"><code class="computeroutput"><span class="identifier">unfused_typed</span></code></a></li>
+<li class="listitem"><a class="link" href="../generation/functions/mk_unfused.html" title="make_unfused"><code class="computeroutput"><span class="identifier">make_unfused</span></code></a></li>
+>>>>>>> .merge-right.r57125
</ul></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_typed.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_typed.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_typed.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>unfused_typed</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="../adapters.html" title=" Adapters">
<link rel="previous" href="unfused.html" title="unfused">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="unfused.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.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="limits.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,6 +38,16 @@
<a name="id624223"></a>
<a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.description">Description</a>
</h5>
+=======
+<div class="section" title="unfused_typed">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.adapters.unfused_typed"></a><a class="link" href="unfused_typed.html" title="unfused_typed">unfused_typed</a>
+</h4></div></div></div>
+<a name="fusion.functional.adapters.unfused_typed.description"></a><h6>
+<a name="id834383"></a>
+ <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
An n-ary <a href="../concepts/poly.html" title=" Polymorphic Function
Object">Polymorphic Function
@@ -64,23 +79,45 @@
<span class="inlinemediaobject"><img src="images/tip.png" alt="tip"></span> If the type sequence passed to this template contains
non-reference elements, the element is copied only once - the call operator's
signature is optimized automatically to avoid by-value parameters.
+<<<<<<< .working
</p></div>
<a name="fusion.functional.adapters.unfused_typed.header"></a><h5>
<a name="id624371"></a>
<a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.header">Header</a>
</h5>
+=======
+ </p>
+</div>
+<a name="fusion.functional.adapters.unfused_typed.header"></a><h6>
+<a name="id834477"></a>
+ <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">unfused_typed</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused_typed.synopsis"></a><h5>
<a name="id624474"></a>
<a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.functional.adapters.unfused_typed.synopsis"></a><h6>
+<a name="id834546"></a>
+ <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">class</span> <span class="identifier">Function</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">class</span> <span class="identifier">unfused_typed</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused_typed.template_parameters"></a><h5>
<a name="id624570"></a>
<a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.template_parameters">Template
+=======
+<a name="fusion.functional.adapters.unfused_typed.template_parameters"></a><h6>
+<a name="id834614"></a>
+ <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.template_parameters">Template
+>>>>>>> .merge-right.r57125
parameters</a>
</h5>
<div class="informaltable"><table class="table">
@@ -125,9 +162,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused_typed.model_of"></a><h5>
<a name="id624726"></a>
<a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.model_of">Model
+=======
+<a name="fusion.functional.adapters.unfused_typed.model_of"></a><h6>
+<a name="id834738"></a>
+ <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.model_of">Model
+>>>>>>> .merge-right.r57125
of</a>
</h5>
<div class="itemizedlist"><ul type="disc">
@@ -171,9 +214,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused_typed.expression_semantics"></a><h5>
<a name="id625048"></a>
<a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.expression_semantics">Expression
+=======
+<a name="fusion.functional.adapters.unfused_typed.expression_semantics"></a><h6>
+<a name="id834968"></a>
+ <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<div class="informaltable"><table class="table">
@@ -221,10 +270,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused_typed.example"></a><h5>
<a name="id625330"></a>
<a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.example">Example</a>
</h5>
+=======
+<a name="fusion.functional.adapters.unfused_typed.example"></a><h6>
+<a name="id835172"></a>
+ <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.example">Example</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">add_assign</span> <span class="comment">// applies operator+=
</span><span class="special">{</span>
<span class="keyword">typedef</span> <span class="keyword">void</span> <span class="identifier">result_type</span><span class="special">;</span> <span class="comment">// for simplicity
@@ -289,6 +345,7 @@
<span class="identifier">assert</span><span class="special">(</span><span class="identifier">a</span> <span class="special">==</span> <span class="number">8</span> <span class="special">&&</span> <span class="identifier">b</span> <span class="special">==</span> <span class="char">'Z'</span><span class="special">);</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.adapters.unfused_typed.see_also"></a><h5>
<a name="id626820"></a>
<a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.see_also">See also</a>
@@ -297,6 +354,16 @@
<li>unfused</li>
<li>deduce</li>
<li>deduce_sequence</li>
+=======
+<a name="fusion.functional.adapters.unfused_typed.see_also"></a><h6>
+<a name="id836835"></a>
+ <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.see_also">See also</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="unfused.html" title="unfused"><code class="computeroutput"><span class="identifier">unfused</span></code></a></li>
+<li class="listitem"><a class="link" href="../../support/deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li>
+<li class="listitem"><a class="link" href="../../support/deduce_sequence.html" title="deduce_sequence"><code class="computeroutput"><span class="identifier">deduce_sequence</span></code></a></li>
+>>>>>>> .merge-right.r57125
</ul></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
Modified: branches/release/libs/fusion/doc/html/fusion/functional/concepts.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/concepts.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/concepts.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>Concepts</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="../functional.html" title="Functional">
<link rel="previous" href="../functional.html" title="Functional">
Modified: branches/release/libs/fusion/doc/html/fusion/functional/concepts/callable.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/concepts/callable.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/concepts/callable.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> Callable Object</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="../concepts.html" title="Concepts">
<link rel="previous" href="../concepts.html" title="Concepts">
@@ -23,6 +27,7 @@
<div class="spirit-nav">
<a accesskey="p" href="../concepts.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.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="reg_callable.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -34,17 +39,36 @@
<a name="id609740"></a>
<a href="callable.html#fusion.functional.concepts.callable.description">Description</a>
</h5>
+=======
+<div class="section" title="Callable Object">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.concepts.callable"></a><a class="link" href="callable.html" title="Callable Object"> Callable Object</a>
+</h4></div></div></div>
+<a name="fusion.functional.concepts.callable.description"></a><h6>
+<a name="id816649"></a>
+ <a class="link" href="callable.html#fusion.functional.concepts.callable.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
A pointer to a function, a pointer to member function, a pointer to member
data, or a class type whose objects can appear immediately to the left
of a function call operator.
</p>
+<<<<<<< .working
<a name="fusion.functional.concepts.callable.models"></a><h5>
<a name="id609771"></a>
<a href="callable.html#fusion.functional.concepts.callable.models">Models</a>
</h5>
<div class="itemizedlist"><ul type="disc">
<li>
+=======
+<a name="fusion.functional.concepts.callable.models"></a><h6>
+<a name="id816666"></a>
+ <a class="link" href="callable.html#fusion.functional.concepts.callable.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+>>>>>>> .merge-right.r57125
function pointer types
</li>
<li>
@@ -54,10 +78,17 @@
all kinds of function objects
</li>
</ul></div>
+<<<<<<< .working
<a name="fusion.functional.concepts.callable.examples"></a><h5>
<a name="id609812"></a>
<a href="callable.html#fusion.functional.concepts.callable.examples">Examples</a>
</h5>
+=======
+<a name="fusion.functional.concepts.callable.examples"></a><h6>
+<a name="id816695"></a>
+ <a class="link" href="callable.html#fusion.functional.concepts.callable.examples">Examples</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="special">&</span> <span class="identifier">a_free_function</span>
<span class="special">&</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
<span class="special">&</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_nonstatic_data_member</span>
Modified: branches/release/libs/fusion/doc/html/fusion/functional/concepts/def_callable.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/concepts/def_callable.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/concepts/def_callable.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title> Deferred
Callable Object</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="../concepts.html" title="Concepts">
<link rel="previous" href="reg_callable.html" title=" Regular Callable
@@ -31,6 +35,7 @@
<a name="fusion.functional.concepts.def_callable"></a><a href="def_callable.html" title=" Deferred
Callable Object"> Deferred
Callable Object</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -38,14 +43,27 @@
<a name="id610834"></a>
<a href="def_callable.html#fusion.functional.concepts.def_callable.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.functional.concepts.def_callable.description"></a><h6>
+<a name="id817426"></a>
+ <a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
<a href="callable.html" title=" Callable Object">Callable Object</a>
types that work with Boost.ResultOf
to determine the result of a call.
</p>
+<<<<<<< .working
<a name="fusion.functional.concepts.def_callable.refinement_of"></a><h5>
<a name="id610880"></a>
<a href="def_callable.html#fusion.functional.concepts.def_callable.refinement_of">Refinement
+=======
+<a name="fusion.functional.concepts.def_callable.refinement_of"></a><h6>
+<a name="id817452"></a>
+ <a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.refinement_of">Refinement
+>>>>>>> .merge-right.r57125
of</a>
</h5>
<div class="itemizedlist"><ul type="disc"><li>Callable Object</li></ul></div>
@@ -84,9 +102,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.functional.concepts.def_callable.expression_requirements"></a><h5>
<a name="id611182"></a>
<a href="def_callable.html#fusion.functional.concepts.def_callable.expression_requirements">Expression
+=======
+<a name="fusion.functional.concepts.def_callable.expression_requirements"></a><h6>
+<a name="id817667"></a>
+ <a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.expression_requirements">Expression
+>>>>>>> .merge-right.r57125
requirements</a>
</h5>
<div class="informaltable"><table class="table">
@@ -114,6 +138,7 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.concepts.def_callable.models"></a><h5>
<a name="id611364"></a>
<a href="def_callable.html#fusion.functional.concepts.def_callable.models">Models</a>
@@ -122,16 +147,32 @@
<li>
<a href="poly.html" title=" Polymorphic Function
Object">Polymorphic Function
+=======
+<a name="fusion.functional.concepts.def_callable.models"></a><h6>
+<a name="id820004"></a>
+ <a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+<a class="link" href="poly.html" title="Polymorphic Function Object">Polymorphic Function
+>>>>>>> .merge-right.r57125
Object</a> types
</li>
<li>
member (function or data) pointer types
</li>
</ul></div>
+<<<<<<< .working
<a name="fusion.functional.concepts.def_callable.examples"></a><h5>
<a name="id611409"></a>
<a href="def_callable.html#fusion.functional.concepts.def_callable.examples">Examples</a>
</h5>
+=======
+<a name="fusion.functional.concepts.def_callable.examples"></a><h6>
+<a name="id820034"></a>
+ <a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.examples">Examples</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="special">&</span> <span class="identifier">a_free_function</span>
<span class="special">&</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
<span class="special">&</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_nonstatic_data_member</span>
Modified: branches/release/libs/fusion/doc/html/fusion/functional/concepts/poly.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/concepts/poly.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/concepts/poly.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title> Polymorphic Function
Object</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="../concepts.html" title="Concepts">
<link rel="previous" href="def_callable.html" title=" Deferred
@@ -30,6 +34,7 @@
<a name="fusion.functional.concepts.poly"></a><a href="poly.html" title=" Polymorphic Function
Object"> Polymorphic Function
Object</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -37,14 +42,27 @@
<a name="id611708"></a>
<a href="poly.html#fusion.functional.concepts.poly.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.functional.concepts.poly.description"></a><h6>
+<a name="id820240"></a>
+ <a class="link" href="poly.html#fusion.functional.concepts.poly.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
A non-member-pointer <a href="def_callable.html" title=" Deferred
Callable Object">Deferred
Callable Object</a> type.
</p>
+<<<<<<< .working
<a name="fusion.functional.concepts.poly.refinement_of"></a><h5>
<a name="id611746"></a>
<a href="poly.html#fusion.functional.concepts.poly.refinement_of">Refinement
+=======
+<a name="fusion.functional.concepts.poly.refinement_of"></a><h6>
+<a name="id820262"></a>
+ <a class="link" href="poly.html#fusion.functional.concepts.poly.refinement_of">Refinement
+>>>>>>> .merge-right.r57125
of</a>
</h5>
<div class="itemizedlist"><ul type="disc">
@@ -86,9 +104,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.functional.concepts.poly.expression_requirements"></a><h5>
<a name="id612034"></a>
<a href="poly.html#fusion.functional.concepts.poly.expression_requirements">Expression
+=======
+<a name="fusion.functional.concepts.poly.expression_requirements"></a><h6>
+<a name="id820471"></a>
+ <a class="link" href="poly.html#fusion.functional.concepts.poly.expression_requirements">Expression
+>>>>>>> .merge-right.r57125
requirements</a>
</h5>
<div class="informaltable"><table class="table">
@@ -123,12 +147,21 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.concepts.poly.models"></a><h5>
<a name="id612231"></a>
<a href="poly.html#fusion.functional.concepts.poly.models">Models</a>
</h5>
<div class="itemizedlist"><ul type="disc">
<li>
+=======
+<a name="fusion.functional.concepts.poly.models"></a><h6>
+<a name="id820623"></a>
+ <a class="link" href="poly.html#fusion.functional.concepts.poly.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+>>>>>>> .merge-right.r57125
function pointers
</li>
<li>
@@ -138,10 +171,17 @@
all Fusion functional adapters
</li>
</ul></div>
+<<<<<<< .working
<a name="fusion.functional.concepts.poly.examples"></a><h5>
<a name="id612283"></a>
<a href="poly.html#fusion.functional.concepts.poly.examples">Examples</a>
</h5>
+=======
+<a name="fusion.functional.concepts.poly.examples"></a><h6>
+<a name="id820656"></a>
+ <a class="link" href="poly.html#fusion.functional.concepts.poly.examples">Examples</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="special">&</span> <span class="identifier">a_free_function</span>
<span class="special">&</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
<span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special"><</span><span class="keyword">int</span><span class="special">>()</span>
Modified: branches/release/libs/fusion/doc/html/fusion/functional/concepts/reg_callable.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/concepts/reg_callable.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/concepts/reg_callable.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title> Regular Callable
Object</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="../concepts.html" title="Concepts">
<link rel="previous" href="callable.html" title=" Callable Object">
@@ -30,6 +34,7 @@
<a name="fusion.functional.concepts.reg_callable"></a><a href="reg_callable.html" title=" Regular Callable
Object"> Regular Callable
Object</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -37,14 +42,27 @@
<a name="id610148"></a>
<a href="reg_callable.html#fusion.functional.concepts.reg_callable.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.functional.concepts.reg_callable.description"></a><h6>
+<a name="id816930"></a>
+ <a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
A non-member-pointer <a href="callable.html" title=" Callable Object">Callable
Object</a> type: A pointer to a function or a class type whose objects
can appear immediately to the left of a function call operator.
</p>
+<<<<<<< .working
<a name="fusion.functional.concepts.reg_callable.refinement_of"></a><h5>
<a name="id610189"></a>
<a href="reg_callable.html#fusion.functional.concepts.reg_callable.refinement_of">Refinement
+=======
+<a name="fusion.functional.concepts.reg_callable.refinement_of"></a><h6>
+<a name="id816952"></a>
+ <a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.refinement_of">Refinement
+>>>>>>> .merge-right.r57125
of</a>
</h5>
<div class="itemizedlist"><ul type="disc"><li>Callable Object</li></ul></div>
@@ -72,9 +90,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.functional.concepts.reg_callable.expression_requirements"></a><h5>
<a name="id610374"></a>
<a href="reg_callable.html#fusion.functional.concepts.reg_callable.expression_requirements">Expression
+=======
+<a name="fusion.functional.concepts.reg_callable.expression_requirements"></a><h6>
+<a name="id817092"></a>
+ <a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.expression_requirements">Expression
+>>>>>>> .merge-right.r57125
requirements</a>
</h5>
<div class="informaltable"><table class="table">
@@ -107,22 +131,38 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.functional.concepts.reg_callable.models"></a><h5>
<a name="id610508"></a>
<a href="reg_callable.html#fusion.functional.concepts.reg_callable.models">Models</a>
</h5>
<div class="itemizedlist"><ul type="disc">
<li>
+=======
+<a name="fusion.functional.concepts.reg_callable.models"></a><h6>
+<a name="id817200"></a>
+ <a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+>>>>>>> .merge-right.r57125
function pointer types
</li>
<li>
all kinds of function objects
</li>
</ul></div>
+<<<<<<< .working
<a name="fusion.functional.concepts.reg_callable.examples"></a><h5>
<a name="id610545"></a>
<a href="reg_callable.html#fusion.functional.concepts.reg_callable.examples">Examples</a>
</h5>
+=======
+<a name="fusion.functional.concepts.reg_callable.examples"></a><h6>
+<a name="id817224"></a>
+ <a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.examples">Examples</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="special">&</span> <span class="identifier">a_free_function</span>
<span class="special">&</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
<span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special"><</span><span class="keyword">int</span><span class="special">>()</span>
Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation.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>Generation</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="../functional.html" title="Functional">
<link rel="previous" href="adapters/limits.html" title="Limits">
Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/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="../generation.html" title="Generation">
<link rel="previous" href="../generation.html" title="Generation">
Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
make_fused</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 1. 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="mk_fused_proc.html" title="
@@ -34,8 +42,33 @@
<div></div>
</div>
<a name="fusion.functional.generation.functions.mk_fused.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id627145"></a>
<a href="mk_fused.html#fusion.functional.generation.functions.mk_fused.description">Description</a>
+=======
+<a name="id878022"></a>
+=======
+<a name="id844666"></a>
+=======
+<a name="id837041"></a>
+=======
+<a name="id859313"></a>
+=======
+<a name="id847566"></a>
+=======
+<a name="id844289"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Creates a fused adapter for a given <a href="../../concepts/def_callable.html" title=" Deferred
@@ -44,8 +77,33 @@
conversion</em></span></a> is applied to the target function.
</p>
<a name="fusion.functional.generation.functions.mk_fused.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id627211"></a>
<a href="mk_fused.html#fusion.functional.generation.functions.mk_fused.synopsis">Synopsis</a>
+=======
+<a name="id878064"></a>
+=======
+<a name="id844708"></a>
+=======
+<a name="id837083"></a>
+=======
+<a name="id859355"></a>
+=======
+<a name="id847608"></a>
+=======
+<a name="id844331"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">></span>
<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_fused.html" title="
@@ -53,8 +111,33 @@
<span class="identifier">make_fused</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&</span> <span class="identifier">f</span><span class="special">);</span>
</pre>
<a name="fusion.functional.generation.functions.mk_fused.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id627363"></a>
<a href="mk_fused.html#fusion.functional.generation.functions.mk_fused.parameters">Parameters</a>
+=======
+<a name="id878171"></a>
+=======
+<a name="id844814"></a>
+=======
+<a name="id837190"></a>
+=======
+<a name="id859462"></a>
+=======
+<a name="id847715"></a>
+=======
+<a name="id844438"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -88,8 +171,33 @@
</tr></tbody>
</table></div>
<a name="fusion.functional.generation.functions.mk_fused.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id627478"></a>
<a href="mk_fused.html#fusion.functional.generation.functions.mk_fused.expression_semantics">Expression
+=======
+<a name="id878261"></a>
+=======
+<a name="id844904"></a>
+=======
+<a name="id837280"></a>
+=======
+<a name="id859552"></a>
+=======
+<a name="id847805"></a>
+=======
+<a name="id844528"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">make_fused</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
@@ -101,15 +209,65 @@
<span class="bold"><b>Semantics</b></span>: Returns a fused adapter for <tt class="computeroutput"><span class="identifier">f</span></tt>.
</p>
<a name="fusion.functional.generation.functions.mk_fused.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id627600"></a>
<a href="mk_fused.html#fusion.functional.generation.functions.mk_fused.header">Header</a>
+=======
+<a name="id878336"></a>
+=======
+<a name="id844980"></a>
+=======
+<a name="id837356"></a>
+=======
+<a name="id859628"></a>
+=======
+<a name="id847880"></a>
+=======
+<a name="id844604"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_fused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.generation.functions.mk_fused.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id627766"></a>
<a href="mk_fused.html#fusion.functional.generation.functions.mk_fused.example">Example</a>
+=======
+<a name="id878452"></a>
+=======
+<a name="id845095"></a>
+=======
+<a name="id837471"></a>
+=======
+<a name="id859743"></a>
+=======
+<a name="id847996"></a>
+=======
+<a name="id844719"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">float</span> <span class="identifier">sub</span><span class="special">(</span><span class="keyword">float</span> <span class="identifier">a</span><span class="special">,</span> <span class="keyword">float</span> <span class="identifier">b</span><span class="special">)</span> <span class="special">{</span> <span class="keyword">return</span> <span class="identifier">a</span> <span class="special">-</span> <span class="identifier">b</span><span class="special">;</span> <span class="special">}</span>
@@ -123,8 +281,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.generation.functions.mk_fused.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id628366"></a>
<a href="mk_fused.html#fusion.functional.generation.functions.mk_fused.see_also">See
+=======
+<a name="id878880"></a>
+=======
+<a name="id845524"></a>
+=======
+<a name="id837899"></a>
+=======
+<a name="id860171"></a>
+=======
+<a name="id848424"></a>
+=======
+<a name="id845147"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc">
@@ -136,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 © 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/functional/generation/functions/mk_fused_fobj.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
make_fused_function_object</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="mk_fused_proc.html" title="
make_fused_procedure">
@@ -35,8 +43,33 @@
<div></div>
</div>
<a name="fusion.functional.generation.functions.mk_fused_fobj.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id629481"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.description">Description</a>
+=======
+<a name="id879926"></a>
+=======
+<a name="id846296"></a>
+=======
+<a name="id838672"></a>
+=======
+<a name="id860944"></a>
+=======
+<a name="id850290"></a>
+=======
+<a name="id847013"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Creates a fused_function_object adapter
@@ -46,8 +79,33 @@
conversion</em></span></a> is applied to the target function.
</p>
<a name="fusion.functional.generation.functions.mk_fused_fobj.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id629550"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.synopsis">Synopsis</a>
+=======
+<a name="id879966"></a>
+=======
+<a name="id846336"></a>
+=======
+<a name="id838712"></a>
+=======
+<a name="id860984"></a>
+=======
+<a name="id850329"></a>
+=======
+<a name="id847052"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">></span>
<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_fused_fobj.html" title="
@@ -55,8 +113,33 @@
<span class="identifier">make_fused_function_object</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&</span> <span class="identifier">f</span><span class="special">);</span>
</pre>
<a name="fusion.functional.generation.functions.mk_fused_fobj.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id629701"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.parameters">Parameters</a>
+=======
+<a name="id880075"></a>
+=======
+<a name="id846445"></a>
+=======
+<a name="id838821"></a>
+=======
+<a name="id861093"></a>
+=======
+<a name="id850438"></a>
+=======
+<a name="id847162"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -90,8 +173,33 @@
</tr></tbody>
</table></div>
<a name="fusion.functional.generation.functions.mk_fused_fobj.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id629814"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.expression_semantics">Expression
+=======
+<a name="id880165"></a>
+=======
+<a name="id846535"></a>
+=======
+<a name="id838911"></a>
+=======
+<a name="id862276"></a>
+=======
+<a name="id850528"></a>
+=======
+<a name="id847252"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">make_fused_function_object</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
@@ -104,15 +212,65 @@
for <tt class="computeroutput"><span class="identifier">f</span></tt>.
</p>
<a name="fusion.functional.generation.functions.mk_fused_fobj.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id629938"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.header">Header</a>
+=======
+<a name="id880243"></a>
+=======
+<a name="id846613"></a>
+=======
+<a name="id838989"></a>
+=======
+<a name="id862354"></a>
+=======
+<a name="id850606"></a>
+=======
+<a name="id847330"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_fused_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.generation.functions.mk_fused_fobj.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id630105"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.example">Example</a>
+=======
+<a name="id880363"></a>
+=======
+<a name="id847280"></a>
+=======
+<a name="id839656"></a>
+=======
+<a name="id862474"></a>
+=======
+<a name="id850726"></a>
+=======
+<a name="id847450"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">sub</span>
<span class="special">{</span>
@@ -139,8 +297,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.generation.functions.mk_fused_fobj.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id630842"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.see_also">See
+=======
+<a name="id880903"></a>
+=======
+<a name="id847820"></a>
+=======
+<a name="id840196"></a>
+=======
+<a name="id863014"></a>
+=======
+<a name="id851266"></a>
+=======
+<a name="id847990"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc">
@@ -152,7 +335,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 © 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/functional/generation/functions/mk_fused_proc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_proc.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_proc.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
make_fused_procedure</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="mk_fused.html" title="
make_fused">
@@ -35,8 +43,33 @@
<div></div>
</div>
<a name="fusion.functional.generation.functions.mk_fused_proc.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id628477"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.description">Description</a>
+=======
+<a name="id878950"></a>
+=======
+<a name="id845593"></a>
+=======
+<a name="id837969"></a>
+=======
+<a name="id860241"></a>
+=======
+<a name="id848494"></a>
+=======
+<a name="id845217"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Creates a fused_procedure adapter for
@@ -46,8 +79,33 @@
conversion</em></span></a> applied to the target function.
</p>
<a name="fusion.functional.generation.functions.mk_fused_proc.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id628545"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.synopsis">Synopsis</a>
+=======
+<a name="id878989"></a>
+=======
+<a name="id845633"></a>
+=======
+<a name="id838008"></a>
+=======
+<a name="id860280"></a>
+=======
+<a name="id848533"></a>
+=======
+<a name="id845256"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">></span>
<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_fused_proc.html" title="
@@ -55,8 +113,33 @@
<span class="identifier">make_fused_procedure</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&</span> <span class="identifier">f</span><span class="special">);</span>
</pre>
<a name="fusion.functional.generation.functions.mk_fused_proc.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id628696"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.parameters">Parameters</a>
+=======
+<a name="id879098"></a>
+=======
+<a name="id845742"></a>
+=======
+<a name="id838118"></a>
+=======
+<a name="id860390"></a>
+=======
+<a name="id848642"></a>
+=======
+<a name="id845366"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -89,8 +172,33 @@
</tr></tbody>
</table></div>
<a name="fusion.functional.generation.functions.mk_fused_proc.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id628810"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.expression_semantics">Expression
+=======
+<a name="id879188"></a>
+=======
+<a name="id845832"></a>
+=======
+<a name="id838208"></a>
+=======
+<a name="id860480"></a>
+=======
+<a name="id848732"></a>
+=======
+<a name="id845456"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">make_fused_procedure</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
@@ -103,15 +211,65 @@
<tt class="computeroutput"><span class="identifier">f</span></tt>.
</p>
<a name="fusion.functional.generation.functions.mk_fused_proc.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id628932"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.header">Header</a>
+=======
+<a name="id879540"></a>
+=======
+<a name="id845910"></a>
+=======
+<a name="id838286"></a>
+=======
+<a name="id860558"></a>
+=======
+<a name="id848810"></a>
+=======
+<a name="id845534"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_fused_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.generation.functions.mk_fused_proc.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id629099"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.example">Example</a>
+=======
+<a name="id879660"></a>
+=======
+<a name="id846030"></a>
+=======
+<a name="id838406"></a>
+=======
+<a name="id860678"></a>
+=======
+<a name="id848930"></a>
+=======
+<a name="id845654"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">></span> <span class="identifier">v</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="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">;</span>
@@ -119,8 +277,33 @@
<span class="identifier">assert</span><span class="special">(</span>front<span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">0</span><span class="special">);</span>
</pre>
<a name="fusion.functional.generation.functions.mk_fused_proc.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id629366"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.see_also">See
+=======
+<a name="id879854"></a>
+=======
+<a name="id846224"></a>
+=======
+<a name="id838600"></a>
+=======
+<a name="id860872"></a>
+=======
+<a name="id850218"></a>
+=======
+<a name="id846941"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc">
@@ -132,7 +315,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 © 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/functional/generation/functions/mk_unfused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
make_unfused</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="mk_fused_fobj.html" title="
make_fused_function_object">
@@ -34,8 +42,33 @@
<div></div>
</div>
<a name="fusion.functional.generation.functions.mk_unfused.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id630954"></a>
<a href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.description">Description</a>
+=======
+<a name="id880978"></a>
+=======
+<a name="id847894"></a>
+=======
+<a name="id840270"></a>
+=======
+<a name="id863088"></a>
+=======
+<a name="id851341"></a>
+=======
+<a name="id848064"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Creates a unfused adapter for a given,
@@ -45,8 +78,33 @@
conversion</em></span></a> is applied to the target function.
</p>
<a name="fusion.functional.generation.functions.mk_unfused.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id631022"></a>
<a href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.synopsis">Synopsis</a>
+=======
+<a name="id881020"></a>
+=======
+<a name="id847936"></a>
+=======
+<a name="id840312"></a>
+=======
+<a name="id863130"></a>
+=======
+<a name="id851383"></a>
+=======
+<a name="id848106"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">></span>
<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_unfused.html" title="
@@ -54,8 +112,33 @@
<span class="identifier">make_unfused</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&</span> <span class="identifier">f</span><span class="special">);</span>
</pre>
<a name="fusion.functional.generation.functions.mk_unfused.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id631173"></a>
<a href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.parameters">Parameters</a>
+=======
+<a name="id881126"></a>
+=======
+<a name="id848043"></a>
+=======
+<a name="id840419"></a>
+=======
+<a name="id863237"></a>
+=======
+<a name="id851490"></a>
+=======
+<a name="id848213"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -89,8 +172,33 @@
</tr></tbody>
</table></div>
<a name="fusion.functional.generation.functions.mk_unfused.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id631289"></a>
<a href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.expression_semantics">Expression
+=======
+<a name="id881216"></a>
+=======
+<a name="id848133"></a>
+=======
+<a name="id840509"></a>
+=======
+<a name="id863327"></a>
+=======
+<a name="id851580"></a>
+=======
+<a name="id848303"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">make_unfused</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
@@ -102,15 +210,65 @@
<span class="bold"><b>Semantics</b></span>: Returns a unfused adapter for <tt class="computeroutput"><span class="identifier">f</span></tt>.
</p>
<a name="fusion.functional.generation.functions.mk_unfused.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id631410"></a>
<a href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.header">Header</a>
+=======
+<a name="id881294"></a>
+=======
+<a name="id848211"></a>
+=======
+<a name="id840587"></a>
+=======
+<a name="id863405"></a>
+=======
+<a name="id851658"></a>
+=======
+<a name="id848381"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_unfused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_unfused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.generation.functions.mk_unfused.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id631577"></a>
<a href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.example">Example</a>
+=======
+<a name="id881414"></a>
+=======
+<a name="id848331"></a>
+=======
+<a name="id840707"></a>
+=======
+<a name="id863525"></a>
+=======
+<a name="id851778"></a>
+=======
+<a name="id848501"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">fused_incrementer</span>
<span class="special">{</span>
@@ -135,8 +293,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.generation.functions.mk_unfused.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id632050"></a>
<a href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.see_also">See
+=======
+<a name="id884501"></a>
+=======
+<a name="id848686"></a>
+=======
+<a name="id841062"></a>
+=======
+<a name="id863880"></a>
+=======
+<a name="id852133"></a>
+=======
+<a name="id848856"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc">
@@ -148,7 +331,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 © 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/functional/generation/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/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="../generation.html" title="Generation">
<link rel="previous" href="functions/mk_unfused.html" title="
Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
make_fused</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 1. 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="mk_fused_proc.html" title="
@@ -34,23 +42,98 @@
<div></div>
</div>
<a name="fusion.functional.generation.metafunctions.mk_fused.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id632181"></a>
<a href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.description">Description</a>
+=======
+<a name="id884584"></a>
+=======
+<a name="id848769"></a>
+=======
+<a name="id841145"></a>
+=======
+<a name="id863963"></a>
+=======
+<a name="id852216"></a>
+=======
+<a name="id848939"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of <a href="../functions/mk_fused.html" title="
make_fused"><tt class="computeroutput"><span class="identifier">make_fused</span></tt></a>.
</p>
<a name="fusion.functional.generation.metafunctions.mk_fused.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id632229"></a>
<a href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.header">Header</a>
+=======
+<a name="id884615"></a>
+=======
+<a name="id848800"></a>
+=======
+<a name="id841176"></a>
+=======
+<a name="id863994"></a>
+=======
+<a name="id852247"></a>
+=======
+<a name="id848971"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_fused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.generation.metafunctions.mk_fused.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id632397"></a>
<a href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.synopsis">Synopsis</a>
+=======
+<a name="id884735"></a>
+=======
+<a name="id848920"></a>
+=======
+<a name="id841296"></a>
+=======
+<a name="id864114"></a>
+=======
+<a name="id852367"></a>
+=======
+<a name="id849091"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
<span class="special">{</span>
@@ -62,8 +145,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.generation.metafunctions.mk_fused.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id632528"></a>
<a href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.see_also">See
+=======
+<a name="id884832"></a>
+=======
+<a name="id849017"></a>
+=======
+<a name="id841393"></a>
+=======
+<a name="id864211"></a>
+=======
+<a name="id852465"></a>
+=======
+<a name="id849188"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_fused.html" title="
@@ -71,7 +179,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 © 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/functional/generation/metafunctions/mk_fused_fobj.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
make_fused_function_object</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="mk_fused_proc.html" title="
make_fused_procedure">
@@ -35,23 +43,98 @@
<div></div>
</div>
<a name="fusion.functional.generation.metafunctions.mk_fused_fobj.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id633013"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.description">Description</a>
+=======
+<a name="id885164"></a>
+=======
+<a name="id849350"></a>
+=======
+<a name="id841726"></a>
+=======
+<a name="id865636"></a>
+=======
+<a name="id852797"></a>
+=======
+<a name="id849520"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of <a href="../functions/mk_fused_fobj.html" title="
make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a>.
</p>
<a name="fusion.functional.generation.metafunctions.mk_fused_fobj.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id633061"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.header">Header</a>
+=======
+<a name="id885193"></a>
+=======
+<a name="id849379"></a>
+=======
+<a name="id842847"></a>
+=======
+<a name="id865665"></a>
+=======
+<a name="id852826"></a>
+=======
+<a name="id849549"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_fused_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.generation.metafunctions.mk_fused_fobj.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id633228"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.synopsis">Synopsis</a>
+=======
+<a name="id885311"></a>
+=======
+<a name="id850589"></a>
+=======
+<a name="id842965"></a>
+=======
+<a name="id865783"></a>
+=======
+<a name="id852943"></a>
+=======
+<a name="id849667"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
<span class="special">{</span>
@@ -63,8 +146,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.generation.metafunctions.mk_fused_fobj.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id633359"></a>
<a href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.see_also">See
+=======
+<a name="id885403"></a>
+=======
+<a name="id850681"></a>
+=======
+<a name="id843057"></a>
+=======
+<a name="id865875"></a>
+=======
+<a name="id853036"></a>
+=======
+<a name="id849759"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_fused_fobj.html" title="
@@ -72,7 +180,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 © 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/functional/generation/metafunctions/mk_fused_proc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
make_fused_procedure</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="mk_fused.html" title="
make_fused">
@@ -35,23 +43,98 @@
<div></div>
</div>
<a name="fusion.functional.generation.metafunctions.mk_fused_proc.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id632597"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.description">Description</a>
+=======
+<a name="id884880"></a>
+=======
+<a name="id849065"></a>
+=======
+<a name="id841441"></a>
+=======
+<a name="id864259"></a>
+=======
+<a name="id852513"></a>
+=======
+<a name="id849236"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of <a href="../functions/mk_fused_proc.html" title="
make_fused_procedure"><tt class="computeroutput"><span class="identifier">make_fused_procedure</span></tt></a>.
</p>
<a name="fusion.functional.generation.metafunctions.mk_fused_proc.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id632645"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.header">Header</a>
+=======
+<a name="id884909"></a>
+=======
+<a name="id849094"></a>
+=======
+<a name="id841470"></a>
+=======
+<a name="id864288"></a>
+=======
+<a name="id852541"></a>
+=======
+<a name="id849265"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_fused_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.generation.metafunctions.mk_fused_proc.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id632813"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.synopsis">Synopsis</a>
+=======
+<a name="id885026"></a>
+=======
+<a name="id849212"></a>
+=======
+<a name="id841588"></a>
+=======
+<a name="id865498"></a>
+=======
+<a name="id852659"></a>
+=======
+<a name="id849382"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
<span class="special">{</span>
@@ -63,8 +146,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.generation.metafunctions.mk_fused_proc.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id632945"></a>
<a href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.see_also">See
+=======
+<a name="id885119"></a>
+=======
+<a name="id849304"></a>
+=======
+<a name="id841680"></a>
+=======
+<a name="id865591"></a>
+=======
+<a name="id852751"></a>
+=======
+<a name="id849475"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_fused_proc.html" title="
@@ -72,7 +180,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 © 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/functional/generation/metafunctions/mk_unfused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
make_unfused</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="mk_fused_fobj.html" title="
make_fused_function_object">
@@ -34,23 +42,98 @@
<div></div>
</div>
<a name="fusion.functional.generation.metafunctions.mk_unfused.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id633430"></a>
<a href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.description">Description</a>
+=======
+<a name="id885444"></a>
+=======
+<a name="id850722"></a>
+=======
+<a name="id843098"></a>
+=======
+<a name="id865916"></a>
+=======
+<a name="id853077"></a>
+=======
+<a name="id849800"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of <a href="../functions/mk_unfused.html" title="
make_unfused"><tt class="computeroutput"><span class="identifier">make_unfused</span></tt></a>.
</p>
<a name="fusion.functional.generation.metafunctions.mk_unfused.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id633478"></a>
<a href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.header">Header</a>
+=======
+<a name="id885473"></a>
+=======
+<a name="id850751"></a>
+=======
+<a name="id843127"></a>
+=======
+<a name="id865945"></a>
+=======
+<a name="id853105"></a>
+=======
+<a name="id849829"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_unfused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">make_unfused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.generation.metafunctions.mk_unfused.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id633645"></a>
<a href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.synopsis">Synopsis</a>
+=======
+<a name="id885593"></a>
+=======
+<a name="id850871"></a>
+=======
+<a name="id843247"></a>
+=======
+<a name="id866065"></a>
+=======
+<a name="id853225"></a>
+=======
+<a name="id849949"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
<span class="special">{</span>
@@ -62,8 +145,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.generation.metafunctions.mk_unfused.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id633775"></a>
<a href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.see_also">See
+=======
+<a name="id885690"></a>
+=======
+<a name="id850968"></a>
+=======
+<a name="id843344"></a>
+=======
+<a name="id866162"></a>
+=======
+<a name="id853323"></a>
+=======
+<a name="id850046"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_unfused.html" title="
@@ -71,7 +179,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 © 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/functional/invocation.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation.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>Invocation</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="../functional.html" title="Functional">
<link rel="previous" href="concepts/poly.html" title=" Polymorphic Function
Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/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="../invocation.html" title="Invocation">
<link rel="previous" href="../invocation.html" title="Invocation">
Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke.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>invoke</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 1. 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="invoke_proc.html" title="
@@ -31,8 +39,33 @@
<div></div>
</div>
<a name="fusion.functional.invocation.functions.invoke.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id612575"></a>
<a href="invoke.html#fusion.functional.invocation.functions.invoke.description">Description</a>
+=======
+<a name="id863812"></a>
+=======
+<a name="id828476"></a>
+=======
+<a name="id820851"></a>
+=======
+<a name="id842590"></a>
+=======
+<a name="id831389"></a>
+=======
+<a name="id828112"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Calls a <a href="../../concepts/def_callable.html" title=" Deferred
@@ -54,8 +87,33 @@
Constructors can be called applying Boost.Functional/Factory.
</p>
<a name="fusion.functional.invocation.functions.invoke.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id612688"></a>
<a href="invoke.html#fusion.functional.invocation.functions.invoke.synopsis">Synopsis</a>
+=======
+<a name="id863883"></a>
+=======
+<a name="id828546"></a>
+=======
+<a name="id820922"></a>
+=======
+<a name="id842661"></a>
+=======
+<a name="id831460"></a>
+=======
+<a name="id828183"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span>
@@ -72,8 +130,33 @@
<span class="identifier">invoke</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span> <span class="special">&</span> <span class="identifier">s</span><span class="special">);</span>
</pre>
<a name="fusion.functional.invocation.functions.invoke.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id613062"></a>
<a href="invoke.html#fusion.functional.invocation.functions.invoke.parameters">Parameters</a>
+=======
+<a name="id864150"></a>
+=======
+<a name="id828813"></a>
+=======
+<a name="id821188"></a>
+=======
+<a name="id842927"></a>
+=======
+<a name="id831726"></a>
+=======
+<a name="id828450"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -122,8 +205,33 @@
</tbody>
</table></div>
<a name="fusion.functional.invocation.functions.invoke.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id613223"></a>
<a href="invoke.html#fusion.functional.invocation.functions.invoke.expression_semantics">Expression
+=======
+<a name="id864276"></a>
+=======
+<a name="id828939"></a>
+=======
+<a name="id821314"></a>
+=======
+<a name="id843053"></a>
+=======
+<a name="id831852"></a>
+=======
+<a name="id828576"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">invoke</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span><span class="identifier">s</span><span class="special">);</span>
@@ -138,21 +246,96 @@
as arguments and returns the result of the call expression.
</p>
<a name="fusion.functional.invocation.functions.invoke.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id613356"></a>
<a href="invoke.html#fusion.functional.invocation.functions.invoke.header">Header</a>
+=======
+<a name="id864361"></a>
+=======
+<a name="id829024"></a>
+=======
+<a name="id821400"></a>
+=======
+<a name="id843139"></a>
+=======
+<a name="id831938"></a>
+=======
+<a name="id828661"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">invocation</span><span class="special">/</span><span class="identifier">invoke</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.invocation.functions.invoke.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id613459"></a>
<a href="invoke.html#fusion.functional.invocation.functions.invoke.example">Example</a>
+=======
+<a name="id864704"></a>
+=======
+<a name="id829094"></a>
+=======
+<a name="id821469"></a>
+=======
+<a name="id843208"></a>
+=======
+<a name="id832007"></a>
+=======
+<a name="id828730"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">std::plus<span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="identifier">add</span><span class="special">;</span>
<span class="identifier">assert</span><span class="special">(</span><span class="identifier">invoke</span><span class="special">(</span><span class="identifier">add</span><span class="special">,</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1</span><span class="special">))</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
</pre>
<a name="fusion.functional.invocation.functions.invoke.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id613626"></a>
<a href="invoke.html#fusion.functional.invocation.functions.invoke.see_also">See
+=======
+<a name="id864819"></a>
+=======
+<a name="id829209"></a>
+=======
+<a name="id821584"></a>
+=======
+<a name="id843323"></a>
+=======
+<a name="id832122"></a>
+=======
+<a name="id828846"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc">
@@ -168,7 +351,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 © 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/functional/invocation/functions/invoke_fobj.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_fobj.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_fobj.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
invoke_function_object</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="invoke_proc.html" title="
invoke_procedure">
@@ -34,8 +42,33 @@
<div></div>
</div>
<a name="fusion.functional.invocation.functions.invoke_fobj.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id615066"></a>
<a href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.description">Description</a>
+=======
+<a name="id865819"></a>
+=======
+<a name="id830912"></a>
+=======
+<a name="id823288"></a>
+=======
+<a name="id846102"></a>
+=======
+<a name="id834761"></a>
+=======
+<a name="id831484"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Calls a <a href="../../concepts/poly.html" title=" Polymorphic Function
@@ -50,8 +83,33 @@
Constructors can be called applying Boost.Functional/Factory.
</p>
<a name="fusion.functional.invocation.functions.invoke_fobj.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id615129"></a>
<a href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.synopsis">Synopsis</a>
+=======
+<a name="id865862"></a>
+=======
+<a name="id830956"></a>
+=======
+<a name="id823331"></a>
+=======
+<a name="id846145"></a>
+=======
+<a name="id834804"></a>
+=======
+<a name="id831527"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span>
@@ -70,8 +128,33 @@
<span class="identifier">invoke_function_object</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span> <span class="special">&</span> <span class="identifier">s</span><span class="special">);</span>
</pre>
<a name="fusion.functional.invocation.functions.invoke_fobj.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id615507"></a>
<a href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.parameters">Parameters</a>
+=======
+<a name="id866131"></a>
+=======
+<a name="id831224"></a>
+=======
+<a name="id823600"></a>
+=======
+<a name="id846414"></a>
+=======
+<a name="id835073"></a>
+=======
+<a name="id831796"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -120,8 +203,33 @@
</tbody>
</table></div>
<a name="fusion.functional.invocation.functions.invoke_fobj.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id615667"></a>
<a href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.expression_semantics">Expression
+=======
+<a name="id866256"></a>
+=======
+<a name="id831349"></a>
+=======
+<a name="id823725"></a>
+=======
+<a name="id846539"></a>
+=======
+<a name="id835198"></a>
+=======
+<a name="id831921"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">invoke_function_object</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span><span class="identifier">s</span><span class="special">);</span>
@@ -136,14 +244,64 @@
as arguments and returns the result of the call expression.
</p>
<a name="fusion.functional.invocation.functions.invoke_fobj.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id615801"></a>
<a href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.header">Header</a>
+=======
+<a name="id866343"></a>
+=======
+<a name="id831437"></a>
+=======
+<a name="id823813"></a>
+=======
+<a name="id846626"></a>
+=======
+<a name="id835285"></a>
+=======
+<a name="id832009"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">invocation</span><span class="special">/</span><span class="identifier">invoke_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.invocation.functions.invoke_fobj.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id615906"></a>
<a href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.example">Example</a>
+=======
+<a name="id866418"></a>
+=======
+<a name="id831511"></a>
+=======
+<a name="id823887"></a>
+=======
+<a name="id846701"></a>
+=======
+<a name="id835360"></a>
+=======
+<a name="id832083"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">sub</span>
<span class="special">{</span>
@@ -168,8 +326,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.invocation.functions.invoke_fobj.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id616452"></a>
<a href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.see_also">See
+=======
+<a name="id866824"></a>
+=======
+<a name="id831918"></a>
+=======
+<a name="id824294"></a>
+=======
+<a name="id847107"></a>
+=======
+<a name="id835767"></a>
+=======
+<a name="id832490"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc">
@@ -185,7 +368,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 © 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/functional/invocation/functions/invoke_proc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_proc.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_proc.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
invoke_procedure</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="invoke.html" title="invoke">
<link rel="next" href="invoke_fobj.html" title="
@@ -34,8 +42,33 @@
<div></div>
</div>
<a name="fusion.functional.invocation.functions.invoke_proc.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id613797"></a>
<a href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.description">Description</a>
+=======
+<a name="id864922"></a>
+=======
+<a name="id829312"></a>
+=======
+<a name="id821688"></a>
+=======
+<a name="id843427"></a>
+=======
+<a name="id833865"></a>
+=======
+<a name="id830588"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Calls a <a href="../../concepts/callable.html" title=" Callable Object">Callable
@@ -58,8 +91,33 @@
isn't implemented).
</p>
<a name="fusion.functional.invocation.functions.invoke_proc.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id613906"></a>
<a href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.synopsis">Synopsis</a>
+=======
+<a name="id864992"></a>
+=======
+<a name="id829382"></a>
+=======
+<a name="id821757"></a>
+=======
+<a name="id843496"></a>
+=======
+<a name="id833934"></a>
+=======
+<a name="id830657"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span>
@@ -78,8 +136,33 @@
<span class="identifier">invoke_procedure</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span> <span class="special">&</span> <span class="identifier">s</span><span class="special">);</span>
</pre>
<a name="fusion.functional.invocation.functions.invoke_proc.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id614281"></a>
<a href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.parameters">Parameters</a>
+=======
+<a name="id865261"></a>
+=======
+<a name="id829650"></a>
+=======
+<a name="id822026"></a>
+=======
+<a name="id845544"></a>
+=======
+<a name="id834203"></a>
+=======
+<a name="id830926"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -127,8 +210,33 @@
</tbody>
</table></div>
<a name="fusion.functional.invocation.functions.invoke_proc.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id614439"></a>
<a href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.expression_semantics">Expression
+=======
+<a name="id865387"></a>
+=======
+<a name="id829776"></a>
+=======
+<a name="id822152"></a>
+=======
+<a name="id845670"></a>
+=======
+<a name="id834329"></a>
+=======
+<a name="id831052"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">invoke_procedure</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span><span class="identifier">s</span><span class="special">);</span>
@@ -142,14 +250,64 @@
as arguments.
</p>
<a name="fusion.functional.invocation.functions.invoke_proc.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id614557"></a>
<a href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.header">Header</a>
+=======
+<a name="id865467"></a>
+=======
+<a name="id830561"></a>
+=======
+<a name="id822937"></a>
+=======
+<a name="id845750"></a>
+=======
+<a name="id834409"></a>
+=======
+<a name="id831133"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special"><</span><span class="identifier">booost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">invocation</span><span class="special">/</span><span class="identifier">invoke_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.functional.invocation.functions.invoke_proc.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id614660"></a>
<a href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.example">Example</a>
+=======
+<a name="id865542"></a>
+=======
+<a name="id830635"></a>
+=======
+<a name="id823011"></a>
+=======
+<a name="id845825"></a>
+=======
+<a name="id834484"></a>
+=======
+<a name="id831207"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">></span> <span class="identifier">v</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="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">;</span>
@@ -157,8 +315,33 @@
<span class="identifier">assert</span><span class="special">(</span>front<span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
</pre>
<a name="fusion.functional.invocation.functions.invoke_proc.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id614897"></a>
<a href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.see_also">See
+=======
+<a name="id865713"></a>
+=======
+<a name="id830807"></a>
+=======
+<a name="id823183"></a>
+=======
+<a name="id845996"></a>
+=======
+<a name="id834655"></a>
+=======
+<a name="id831379"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc">
@@ -174,7 +357,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 © 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/functional/invocation/limits.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/limits.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/limits.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>Limits</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="../invocation.html" title="Invocation">
<link rel="previous" href="metafunctions/invoke_fobj.html" title="
@@ -23,6 +27,7 @@
<div class="spirit-nav">
<a accesskey="p" href="metafunctions/invoke_fobj.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../invocation.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="../adapters.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -34,12 +39,29 @@
<a name="id617510"></a>
<a href="limits.html#fusion.functional.invocation.limits.header">Header</a>
</h5>
+=======
+<div class="section" title="Limits">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.invocation.limits"></a><a class="link" href="limits.html" title="Limits">Limits</a>
+</h4></div></div></div>
+<a name="fusion.functional.invocation.limits.header"></a><h6>
+<a name="id825008"></a>
+ <a class="link" href="limits.html#fusion.functional.invocation.limits.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">functional</span><span class="special">/</span><span class="identifier">invocation</span><span class="special">/</span><span class="identifier">limits</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.functional.invocation.limits.macros"></a><h5>
<a name="id617613"></a>
<a href="limits.html#fusion.functional.invocation.limits.macros">Macros</a>
</h5>
+=======
+<a name="fusion.functional.invocation.limits.macros"></a><h6>
+<a name="id826170"></a>
+ <a class="link" href="limits.html#fusion.functional.invocation.limits.macros">Macros</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
The following macros can be defined to change the maximum arity. The default
is 6.
Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/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="../invocation.html" title="Invocation">
<link rel="previous" href="functions/invoke_fobj.html" title="
Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke.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>invoke</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 1. 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="invoke_proc.html" title="
@@ -31,15 +39,65 @@
<div></div>
</div>
<a name="fusion.functional.invocation.metafunctions.invoke.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id616641"></a>
<a href="invoke.html#fusion.functional.invocation.metafunctions.invoke.description">Description</a>
+=======
+<a name="id868720"></a>
+=======
+<a name="id832034"></a>
+=======
+<a name="id824410"></a>
+=======
+<a name="id847224"></a>
+=======
+<a name="id835883"></a>
+=======
+<a name="id832606"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke.html#fusion.functional.invocation.metafunctions.invoke.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of invoke.
</p>
<a name="fusion.functional.invocation.metafunctions.invoke.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id616689"></a>
<a href="invoke.html#fusion.functional.invocation.metafunctions.invoke.synopsis">Synopsis</a>
+=======
+<a name="id868751"></a>
+=======
+<a name="id832066"></a>
+=======
+<a name="id824441"></a>
+=======
+<a name="id847255"></a>
+=======
+<a name="id835914"></a>
+=======
+<a name="id832637"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke.html#fusion.functional.invocation.metafunctions.invoke.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
<span class="special">{</span>
@@ -54,8 +112,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.invocation.metafunctions.invoke.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id616840"></a>
<a href="invoke.html#fusion.functional.invocation.metafunctions.invoke.see_also">See
+=======
+<a name="id868864"></a>
+=======
+<a name="id832178"></a>
+=======
+<a name="id824554"></a>
+=======
+<a name="id847368"></a>
+=======
+<a name="id836167"></a>
+=======
+<a name="id832891"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke.html#fusion.functional.invocation.metafunctions.invoke.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc">
@@ -65,7 +148,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 © 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/functional/invocation/metafunctions/invoke_fobj.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
invoke_function_object</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="invoke_proc.html" title="
invoke_procedure">
@@ -34,16 +42,66 @@
<div></div>
</div>
<a name="fusion.functional.invocation.metafunctions.invoke_fobj.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id617219"></a>
<a href="invoke_fobj.html#fusion.functional.invocation.metafunctions.invoke_fobj.description">Description</a>
+=======
+<a name="id869118"></a>
+=======
+<a name="id832433"></a>
+=======
+<a name="id824809"></a>
+=======
+<a name="id847622"></a>
+=======
+<a name="id836422"></a>
+=======
+<a name="id833145"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_fobj.html#fusion.functional.invocation.metafunctions.invoke_fobj.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of <a href="../functions/invoke_fobj.html" title="
invoke_function_object"><tt class="computeroutput"><span class="identifier">invoke_function_object</span></tt></a>.
</p>
<a name="fusion.functional.invocation.metafunctions.invoke_fobj.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id617267"></a>
<a href="invoke_fobj.html#fusion.functional.invocation.metafunctions.invoke_fobj.synopsis">Synopsis</a>
+=======
+<a name="id869147"></a>
+=======
+<a name="id832462"></a>
+=======
+<a name="id824837"></a>
+=======
+<a name="id847651"></a>
+=======
+<a name="id836451"></a>
+=======
+<a name="id833174"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_fobj.html#fusion.functional.invocation.metafunctions.invoke_fobj.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
<span class="special">{</span>
@@ -58,8 +116,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.invocation.metafunctions.invoke_fobj.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id617418"></a>
<a href="invoke_fobj.html#fusion.functional.invocation.metafunctions.invoke_fobj.see_also">See
+=======
+<a name="id869260"></a>
+=======
+<a name="id832574"></a>
+=======
+<a name="id824950"></a>
+=======
+<a name="id847764"></a>
+=======
+<a name="id836563"></a>
+=======
+<a name="id833287"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_fobj.html#fusion.functional.invocation.metafunctions.invoke_fobj.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc">
@@ -70,7 +153,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 © 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/functional/invocation/metafunctions/invoke_proc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>
invoke_procedure</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="invoke.html" title="invoke">
<link rel="next" href="invoke_fobj.html" title="
@@ -34,16 +42,66 @@
<div></div>
</div>
<a name="fusion.functional.invocation.metafunctions.invoke_proc.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id616931"></a>
<a href="invoke_proc.html#fusion.functional.invocation.metafunctions.invoke_proc.description">Description</a>
+=======
+<a name="id868920"></a>
+=======
+<a name="id832235"></a>
+=======
+<a name="id824611"></a>
+=======
+<a name="id847424"></a>
+=======
+<a name="id836224"></a>
+=======
+<a name="id832947"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_proc.html#fusion.functional.invocation.metafunctions.invoke_proc.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of <a href="../functions/invoke_proc.html" title="
invoke_procedure"><tt class="computeroutput"><span class="identifier">invoke_procedure</span></tt></a>.
</p>
<a name="fusion.functional.invocation.metafunctions.invoke_proc.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id616979"></a>
<a href="invoke_proc.html#fusion.functional.invocation.metafunctions.invoke_proc.synopsis">Synopsis</a>
+=======
+<a name="id868949"></a>
+=======
+<a name="id832264"></a>
+=======
+<a name="id824639"></a>
+=======
+<a name="id847453"></a>
+=======
+<a name="id836253"></a>
+=======
+<a name="id832976"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_proc.html#fusion.functional.invocation.metafunctions.invoke_proc.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
<span class="special">{</span>
@@ -58,8 +116,33 @@
<span class="special">}</span>
</pre>
<a name="fusion.functional.invocation.metafunctions.invoke_proc.see_also"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id617129"></a>
<a href="invoke_proc.html#fusion.functional.invocation.metafunctions.invoke_proc.see_also">See
+=======
+<a name="id869062"></a>
+=======
+<a name="id832376"></a>
+=======
+<a name="id824752"></a>
+=======
+<a name="id847566"></a>
+=======
+<a name="id836365"></a>
+=======
+<a name="id833089"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="invoke_proc.html#fusion.functional.invocation.metafunctions.invoke_proc.see_also">See
+>>>>>>> .merge-right.r57125
also</a>
</h6>
<div class="itemizedlist"><ul type="disc">
@@ -70,7 +153,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 © 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/introduction.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/introduction.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/introduction.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,20 @@
<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>Introduction</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="up" href="../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="previous" href="preface.html" title="Preface">
<link rel="next" href="quick_start.html" title="Quick Start">
</head>
@@ -120,7 +129,31 @@
sequences are fully compatible with Fusion. You can work with Fusion sequences
on MPL if you
wish to work solely on types
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<sup>[<a name="id353558" href="#ftn.id353558">1</a>]</sup>
+=======
+ <sup>[<a name="id658337" href="#ftn.id658337" class="footnote">1</a>]</sup>
+=======
+ <sup>[<a name="id614097" href="#ftn.id614097" class="footnote">1</a>]</sup>
+=======
+ <sup>[<a name="id606451" href="#ftn.id606451" class="footnote">1</a>]</sup>
+=======
+ <sup>[<a name="id629406" href="#ftn.id629406" class="footnote">1</a>]</sup>
+=======
+ <sup>[<a name="id618004" href="#ftn.id618004" class="footnote">1</a>]</sup>
+=======
+ <sup>[<a name="id614727" href="#ftn.id614727" class="footnote">1</a>]</sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
. In MPL, Fusion
sequences follow MPL's
sequence-type preserving semantics (i.e. algorithms preserve the original sequence
@@ -135,7 +168,31 @@
</p>
<div class="footnotes">
<br><hr width="100" align="left">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<div class="footnote"><p><sup>[<a name="ftn.id353558" href="#id353558">1</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id658337" href="#id658337" class="para">1</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id614097" href="#id614097" class="para">1</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id606451" href="#id606451" class="para">1</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id629406" href="#id629406" class="para">1</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id618004" href="#id618004" class="para">1</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id614727" href="#id614727" class="para">1</a>] </sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
Choose MPL
over fusion when doing pure type calculations. Once the static type calculation
is finished, you can instantiate a fusion sequence (see Conversion)
@@ -145,7 +202,7 @@
</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 © 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/iterator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator.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>Iterator</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="support/pair.html" title="pair">
@@ -38,6 +42,8 @@
Iterator</a></span></dt>
<dt><span class="section"><a href="iterator/concepts/random_access_iterator.html">Random
Access Iterator</a></span></dt>
+<dt><span class="section"><a href="iterator/concepts/associative_iterator.html">Associative
+ Iterator</a></span></dt>
</dl></dd>
<dt><span class="section">Functions</span></dt>
<dd><dl>
@@ -47,6 +53,7 @@
<dt><span class="section">distance</span></dt>
<dt><span class="section">advance</span></dt>
<dt><span class="section">advance_c</span></dt>
+<dt><span class="section">deref_data</span></dt>
</dl></dd>
<dt><span class="section">Operator</span></dt>
<dd><dl>
@@ -67,6 +74,9 @@
<dt><span class="section">distance</span></dt>
<dt><span class="section">advance</span></dt>
<dt><span class="section">advance_c</span></dt>
+<dt><span class="section">key_of</span></dt>
+<dt><span class="section">value_of_data</span></dt>
+<dt><span class="section">deref_data</span></dt>
</dl></dd>
</dl></div>
<p>
@@ -77,10 +87,17 @@
iterators describe positions, and provide access to data within an underlying
<a href="sequence.html" title="Sequence">Sequence</a>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.header"></a><h3>
<a name="id420232"></a>
<a href="iterator.html#fusion.iterator.header">Header</a>
</h3>
+=======
+<a name="fusion.iterator.header"></a><h4>
+<a name="id619474"></a>
+ <a class="link" href="iterator.html#fusion.iterator.header">Header</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
Modified: branches/release/libs/fusion/doc/html/fusion/iterator/concepts.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/concepts.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/concepts.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>Concepts</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="../iterator.html" title="Iterator">
<link rel="previous" href="../iterator.html" title="Iterator">
@@ -37,6 +41,8 @@
Iterator</a></span></dt>
<dt><span class="section"><a href="concepts/random_access_iterator.html">Random
Access Iterator</a></span></dt>
+<dt><span class="section"><a href="concepts/associative_iterator.html">Associative
+ Iterator</a></span></dt>
</dl></div>
<p>
Fusion iterators are divided into different traversal categories. <a href="concepts/forward_iterator.html" title="Forward
@@ -49,7 +55,11 @@
Access Iterator">Random
Access Iterator</a> is a refinement of <a href="concepts/bidirectional_iterator.html" title="Bidirectional
Iterator">Bidirectional
- Iterator</a>.
+ Iterator</a>. <a class="link" href="concepts/associative_iterator.html" title="Associative Iterator">Associative
+ Iterator</a> is a refinement of <a class="link" href="concepts/forward_iterator.html" title="Forward Iterator">Forward
+ Iterator</a>, <a class="link" href="concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+ Iterator</a> or <a class="link" href="concepts/random_access_iterator.html" title="Random Access Iterator">Random
+ Access Iterator</a>.
</p>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
Copied: branches/release/libs/fusion/doc/html/fusion/iterator/concepts/associative_iterator.html (from r57242, /trunk/libs/fusion/doc/html/fusion/iterator/concepts/associative_iterator.html)
==============================================================================
--- /trunk/libs/fusion/doc/html/fusion/iterator/concepts/associative_iterator.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/concepts/associative_iterator.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,10 @@
<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>Associative Iterator</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
<link rel="up" href="../concepts.html" title="Concepts">
<link rel="prev" href="random_access_iterator.html" title="Random Access Iterator">
<link rel="next" href="../functions.html" title="Functions">
@@ -28,7 +28,7 @@
Iterator</a>
</h4></div></div></div>
<a name="fusion.iterator.concepts.associative_iterator.description"></a><h6>
-<a name="id633107"></a>
+<a name="id627097"></a>
<a class="link" href="associative_iterator.html#fusion.iterator.concepts.associative_iterator.description">Description</a>
</h6>
<p>
@@ -50,7 +50,7 @@
</dl>
</div>
<a name="fusion.iterator.concepts.associative_iterator.refinement_of"></a><h6>
-<a name="id633172"></a>
+<a name="id627161"></a>
<a class="link" href="associative_iterator.html#fusion.iterator.concepts.associative_iterator.refinement_of">Refinement
of</a>
</h6>
@@ -61,7 +61,7 @@
Access Iterator</a>
</p>
<a name="fusion.iterator.concepts.associative_iterator.expression_requirements"></a><h6>
-<a name="id633205"></a>
+<a name="id627195"></a>
<a class="link" href="associative_iterator.html#fusion.iterator.concepts.associative_iterator.expression_requirements">Expression
requirements</a>
</h6>
@@ -113,7 +113,7 @@
</tr></tbody>
</table></div>
<a name="fusion.iterator.concepts.associative_iterator.meta_expressions"></a><h6>
-<a name="id633358"></a>
+<a name="id627347"></a>
<a class="link" href="associative_iterator.html#fusion.iterator.concepts.associative_iterator.meta_expressions">Meta
Expressions</a>
</h6>
@@ -174,7 +174,7 @@
</tbody>
</table></div>
<a name="fusion.iterator.concepts.associative_iterator.models"></a><h6>
-<a name="id633563"></a>
+<a name="id627553"></a>
<a class="link" href="associative_iterator.html#fusion.iterator.concepts.associative_iterator.models">Models</a>
</h6>
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
@@ -213,7 +213,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 © 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/iterator/concepts/bidirectional_iterator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/concepts/bidirectional_iterator.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/concepts/bidirectional_iterator.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title>Bidirectional
Iterator</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="../concepts.html" title="Concepts">
<link rel="previous" href="forward_iterator.html" title="Forward
@@ -31,6 +35,7 @@
<a name="fusion.iterator.concepts.bidirectional_iterator"></a><a href="bidirectional_iterator.html" title="Bidirectional
Iterator">Bidirectional
Iterator</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -38,6 +43,13 @@
<a name="id423358"></a>
<a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.iterator.concepts.bidirectional_iterator.description"></a><h6>
+<a name="id623077"></a>
+ <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
A Bidirectional Iterator traverses a Sequence
allowing movement in either direction one element at a time.
@@ -64,18 +76,30 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.bidirectional_iterator.refinement_of"></a><h5>
<a name="id423503"></a>
<a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.refinement_of">Refinement
+=======
+<a name="fusion.iterator.concepts.bidirectional_iterator.refinement_of"></a><h6>
+<a name="id623189"></a>
+ <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.refinement_of">Refinement
+>>>>>>> .merge-right.r57125
of</a>
</h5>
<p>
<a href="forward_iterator.html" title="Forward
Iterator">Forward Iterator</a>
</p>
+<<<<<<< .working
<a name="fusion.iterator.concepts.bidirectional_iterator.expression_requirements"></a><h5>
<a name="id423540"></a>
<a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.expression_requirements">Expression
+=======
+<a name="fusion.iterator.concepts.bidirectional_iterator.expression_requirements"></a><h6>
+<a name="id623213"></a>
+ <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.expression_requirements">Expression
+>>>>>>> .merge-right.r57125
requirements</a>
</h5>
<p>
@@ -155,9 +179,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.bidirectional_iterator.meta_expressions"></a><h5>
<a name="id423922"></a>
<a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.meta_expressions">Meta
+=======
+<a name="fusion.iterator.concepts.bidirectional_iterator.meta_expressions"></a><h6>
+<a name="id623490"></a>
+ <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.meta_expressions">Meta
+>>>>>>> .merge-right.r57125
Expressions</a>
</h5>
<div class="informaltable"><table class="table">
@@ -182,9 +212,15 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.bidirectional_iterator.expression_semantics"></a><h5>
<a name="id424055"></a>
<a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.expression_semantics">Expression
+=======
+<a name="fusion.iterator.concepts.bidirectional_iterator.expression_semantics"></a><h6>
+<a name="id623590"></a>
+ <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<p>
@@ -215,10 +251,17 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.bidirectional_iterator.invariants"></a><h5>
<a name="id424198"></a>
<a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.invariants">Invariants</a>
</h5>
+=======
+<a name="fusion.iterator.concepts.bidirectional_iterator.invariants"></a><h6>
+<a name="id623695"></a>
+ <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.invariants">Invariants</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
In addition to the invariants of <a href="forward_iterator.html" title="Forward
Iterator">Forward
@@ -232,6 +275,7 @@
will never return a previously seen position
</li>
</ul></div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.bidirectional_iterator.models"></a><h5>
<a name="id424535"></a>
<a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.models">Models</a>
@@ -239,6 +283,15 @@
<div class="itemizedlist"><ul type="disc">
<li>
<a href="../../adapted/std__pair.html" title="std::pair"><tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt></a>
+=======
+<a name="fusion.iterator.concepts.bidirectional_iterator.models"></a><h6>
+<a name="id623920"></a>
+ <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+<a class="link" href="../../adapted/std__pair.html" title="std::pair"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a>
+>>>>>>> .merge-right.r57125
iterator
</li>
<li>
Modified: branches/release/libs/fusion/doc/html/fusion/iterator/concepts/forward_iterator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/concepts/forward_iterator.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/concepts/forward_iterator.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title>Forward
Iterator</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="../concepts.html" title="Concepts">
<link rel="previous" href="../concepts.html" title="Concepts">
@@ -30,6 +34,7 @@
<a name="fusion.iterator.concepts.forward_iterator"></a><a href="forward_iterator.html" title="Forward
Iterator">Forward
Iterator</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -37,6 +42,13 @@
<a name="id420469"></a>
<a href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.iterator.concepts.forward_iterator.description"></a><h6>
+<a name="id619640"></a>
+ <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
A Forward Iterator traverses a Sequence
allowing movement in only one direction through it's elements, one element
@@ -66,9 +78,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.forward_iterator.expression_requirements"></a><h5>
<a name="id420641"></a>
<a href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.expression_requirements">Expression
+=======
+<a name="fusion.iterator.concepts.forward_iterator.expression_requirements"></a><h6>
+<a name="id619760"></a>
+ <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.expression_requirements">Expression
+>>>>>>> .merge-right.r57125
requirements</a>
</h5>
<p>
@@ -193,9 +211,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.forward_iterator.meta_expressions"></a><h5>
<a name="id421381"></a>
<a href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.meta_expressions">Meta
+=======
+<a name="fusion.iterator.concepts.forward_iterator.meta_expressions"></a><h6>
+<a name="id620306"></a>
+ <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.meta_expressions">Meta
+>>>>>>> .merge-right.r57125
Expressions</a>
</h5>
<div class="informaltable"><table class="table">
@@ -272,9 +296,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.forward_iterator.expression_semantics"></a><h5>
<a name="id421980"></a>
<a href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.expression_semantics">Expression
+=======
+<a name="fusion.iterator.concepts.forward_iterator.expression_semantics"></a><h6>
+<a name="id622116"></a>
+ <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<div class="informaltable"><table class="table">
@@ -362,10 +392,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.forward_iterator.invariants"></a><h5>
<a name="id422585"></a>
<a href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.invariants">Invariants</a>
</h5>
+=======
+<a name="fusion.iterator.concepts.forward_iterator.invariants"></a><h6>
+<a name="id622569"></a>
+ <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.invariants">Invariants</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
The following invariants always hold:
</p>
@@ -386,6 +423,7 @@
<span class="identifier">j</span></tt> then <tt class="computeroutput"><span class="special">*</span><span class="identifier">i</span></tt> is equivalent to <tt class="computeroutput"><span class="special">*</span><span class="identifier">j</span></tt>
</li>
</ul></div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.forward_iterator.models"></a><h5>
<a name="id423010"></a>
<a href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.models">Models</a>
@@ -393,6 +431,15 @@
<div class="itemizedlist"><ul type="disc">
<li>
<a href="../../adapted/std__pair.html" title="std::pair"><tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt></a>
+=======
+<a name="fusion.iterator.concepts.forward_iterator.models"></a><h6>
+<a name="id622861"></a>
+ <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+<a class="link" href="../../adapted/std__pair.html" title="std::pair"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a>
+>>>>>>> .merge-right.r57125
iterator
</li>
<li>
Modified: branches/release/libs/fusion/doc/html/fusion/iterator/concepts/random_access_iterator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/concepts/random_access_iterator.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/concepts/random_access_iterator.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,12 +4,16 @@
<title>Random
Access Iterator</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="../concepts.html" title="Concepts">
<link rel="previous" href="bidirectional_iterator.html" title="Bidirectional
Iterator">
-<link rel="next" href="../functions.html" title="Functions">
+<link rel="next" href="associative_iterator.html" title="Associative Iterator">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -22,7 +26,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="bidirectional_iterator.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.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="../functions.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="bidirectional_iterator.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.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="associative_iterator.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" lang="en">
<div class="titlepage">
@@ -30,6 +34,7 @@
<a name="fusion.iterator.concepts.random_access_iterator"></a><a href="random_access_iterator.html" title="Random
Access Iterator">Random
Access Iterator</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -37,6 +42,13 @@
<a name="id424748"></a>
<a href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.iterator.concepts.random_access_iterator.description"></a><h6>
+<a name="id624053"></a>
+ <a class="link" href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
A Random Access Iterator traverses a Sequence
moving in either direction, permitting efficient arbitrary distance movements
@@ -66,9 +78,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.random_access_iterator.refinement_of"></a><h5>
<a name="id424917"></a>
<a href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.refinement_of">Refinement
+=======
+<a name="fusion.iterator.concepts.random_access_iterator.refinement_of"></a><h6>
+<a name="id624179"></a>
+ <a class="link" href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.refinement_of">Refinement
+>>>>>>> .merge-right.r57125
of</a>
</h5>
<p>
@@ -76,9 +94,15 @@
Iterator">Bidirectional
Iterator</a>
</p>
+<<<<<<< .working
<a name="fusion.iterator.concepts.random_access_iterator.expression_requirements"></a><h5>
<a name="id424955"></a>
<a href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.expression_requirements">Expression
+=======
+<a name="fusion.iterator.concepts.random_access_iterator.expression_requirements"></a><h6>
+<a name="id624203"></a>
+ <a class="link" href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.expression_requirements">Expression
+>>>>>>> .merge-right.r57125
requirements</a>
</h5>
<p>
@@ -158,9 +182,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.random_access_iterator.meta_expressions"></a><h5>
<a name="id425335"></a>
<a href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.meta_expressions">Meta
+=======
+<a name="fusion.iterator.concepts.random_access_iterator.meta_expressions"></a><h6>
+<a name="id625095"></a>
+ <a class="link" href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.meta_expressions">Meta
+>>>>>>> .merge-right.r57125
Expressions</a>
</h5>
<div class="informaltable"><table class="table">
@@ -205,6 +235,7 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.iterator.concepts.random_access_iterator.models"></a><h5>
<a name="id425639"></a>
<a href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.models">Models</a>
@@ -212,6 +243,15 @@
<div class="itemizedlist"><ul type="disc">
<li>
<a href="../../container/vector.html" title="vector"><tt class="computeroutput"><span class="identifier">vector</span></tt></a>
+=======
+<a name="fusion.iterator.concepts.random_access_iterator.models"></a><h6>
+<a name="id625323"></a>
+ <a class="link" href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+<a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>
+>>>>>>> .merge-right.r57125
iterator
</li>
<li>
@@ -253,7 +293,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="bidirectional_iterator.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.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="../functions.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="bidirectional_iterator.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.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="associative_iterator.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Modified: branches/release/libs/fusion/doc/html/fusion/iterator/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,11 +3,19 @@
<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="../iterator.html" title="Iterator">
+<<<<<<< .working
<link rel="previous" href="concepts/random_access_iterator.html" title="Random
Access Iterator">
+=======
+<link rel="prev" href="concepts/associative_iterator.html" title="Associative Iterator">
+>>>>>>> .merge-right.r57242
<link rel="next" href="functions/deref.html" title="deref">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -21,7 +29,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="concepts/random_access_iterator.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.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="functions/deref.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="concepts/associative_iterator.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.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="functions/deref.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" lang="en">
<div class="titlepage">
@@ -37,6 +45,7 @@
<dt><span class="section">distance</span></dt>
<dt><span class="section">advance</span></dt>
<dt><span class="section">advance_c</span></dt>
+<dt><span class="section">deref_data</span></dt>
</dl></div>
<p>
Fusion provides functions for manipulating iterators, analogous to the similar
@@ -55,7 +64,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="concepts/random_access_iterator.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.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="functions/deref.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="concepts/associative_iterator.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.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="functions/deref.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Modified: branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance.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>advance</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="distance.html" title="distance">
<link rel="next" href="advance_c.html" title="advance_c">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="distance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.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="advance_c.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,13 +42,30 @@
<a name="id429699"></a>
<a href="advance.html#fusion.iterator.functions.advance.description">Description</a>
</h5>
+=======
+<div class="section" title="advance">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.functions.advance"></a><a class="link" href="advance.html" title="advance">advance</a>
+</h4></div></div></div>
+<a name="fusion.iterator.functions.advance.description"></a><h6>
+<a name="id637460"></a>
+ <a class="link" href="advance.html#fusion.iterator.functions.advance.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Moves an iterator by a specified distance.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.advance.synopsis"></a><h5>
<a name="id429727"></a>
<a href="advance.html#fusion.iterator.functions.advance.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.functions.advance.synopsis"></a><h6>
+<a name="id637478"></a>
+ <a class="link" href="advance.html#fusion.iterator.functions.advance.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
<span class="keyword">typename</span> <span class="identifier">M</span>
@@ -47,8 +73,33 @@
<span class="keyword">typename</span> result_of::advance<span class="special"><</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">M</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">advance</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id429898"></a><p class="title"><b>Table 1.6. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id682242"></a><p class="title"><b>Table 1.6. Parameters</b></p>
+=======
+<a name="id638149"></a><p class="title"><b>Table 1.6. Parameters</b></p>
+=======
+<a name="id630503"></a><p class="title"><b>Table 1.6. Parameters</b></p>
+=======
+<a name="id653103"></a><p class="title"><b>Table 1.6. Parameters</b></p>
+=======
+<a name="id640877"></a><p class="title"><b>Table 1.6. Parameters</b></p>
+=======
+<a name="id637600"></a><p class="title"><b>Table 1.6. 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,9 +145,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.functions.advance.expression_semantics"></a><h5>
<a name="id430042"></a>
<a href="advance.html#fusion.iterator.functions.advance.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.functions.advance.expression_semantics"></a><h6>
+<a name="id637719"></a>
+ <a class="link" href="advance.html#fusion.iterator.functions.advance.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">advance<span class="special"><</span><span class="identifier">M</span><span class="special">>(</span><span class="identifier">i</span><span class="special">);</span>
@@ -114,18 +171,33 @@
Iterator</a> then <tt class="computeroutput"><span class="identifier">M</span></tt>
may be negative.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.advance.header"></a><h5>
<a name="id430203"></a>
<a href="advance.html#fusion.iterator.functions.advance.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.functions.advance.header"></a><h6>
+<a name="id637821"></a>
+ <a class="link" href="advance.html#fusion.iterator.functions.advance.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.functions.advance.example"></a><h5>
<a name="id430357"></a>
<a href="advance.html#fusion.iterator.functions.advance.example">Example</a>
</h5>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</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">></span> <span class="identifier">vec</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.functions.advance.example"></a><h6>
+<a name="id639022"></a>
+ <a class="link" href="advance.html#fusion.iterator.functions.advance.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</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">></span> <span class="identifier">vec</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">vec</span> <span class="identifier">v</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>deref<span class="special">(</span>advance<span class="special"><</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special"><</span><span class="number">2</span><span class="special">></span> <span class="special">>(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
@@ -133,7 +205,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 © 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/iterator/functions/advance_c.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance_c.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance_c.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,13 +1,21 @@
<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>advance_c</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="advance.html" title="advance">
-<link rel="next" href="../operator.html" title="Operator">
+<link rel="next" href="deref_data.html" title="deref_data">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -20,8 +28,9 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="advance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.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="../operator.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="advance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.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="deref_data.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,13 +42,30 @@
<a name="id430651"></a>
<a href="advance_c.html#fusion.iterator.functions.advance_c.description">Description</a>
</h5>
+=======
+<div class="section" title="advance_c">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.functions.advance_c"></a><a class="link" href="advance_c.html" title="advance_c">advance_c</a>
+</h4></div></div></div>
+<a name="fusion.iterator.functions.advance_c.description"></a><h6>
+<a name="id639223"></a>
+ <a class="link" href="advance_c.html#fusion.iterator.functions.advance_c.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Moves an iterator by a specified distance.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.advance_c.synopsis"></a><h5>
<a name="id430680"></a>
<a href="advance_c.html#fusion.iterator.functions.advance_c.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.functions.advance_c.synopsis"></a><h6>
+<a name="id639241"></a>
+ <a class="link" href="advance_c.html#fusion.iterator.functions.advance_c.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
<span class="keyword">int</span> <span class="identifier">N</span>
@@ -47,8 +73,33 @@
<span class="keyword">typename</span> result_of::advance_c<span class="special"><</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">N</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">advance_c</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id430850"></a><p class="title"><b>Table 1.7. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id682913"></a><p class="title"><b>Table 1.7. Parameters</b></p>
+=======
+<a name="id638820"></a><p class="title"><b>Table 1.7. Parameters</b></p>
+=======
+<a name="id631175"></a><p class="title"><b>Table 1.7. Parameters</b></p>
+=======
+<a name="id654866"></a><p class="title"><b>Table 1.7. Parameters</b></p>
+=======
+<a name="id642640"></a><p class="title"><b>Table 1.7. Parameters</b></p>
+=======
+<a name="id639364"></a><p class="title"><b>Table 1.7. 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>
@@ -93,9 +144,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.functions.advance_c.expression_semantics"></a><h5>
<a name="id430988"></a>
<a href="advance_c.html#fusion.iterator.functions.advance_c.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.functions.advance_c.expression_semantics"></a><h6>
+<a name="id639480"></a>
+ <a class="link" href="advance_c.html#fusion.iterator.functions.advance_c.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">advance_c<span class="special"><</span><span class="identifier">N</span><span class="special">>(</span><span class="identifier">i</span><span class="special">);</span>
@@ -113,18 +170,33 @@
Iterator</a> then <tt class="computeroutput"><span class="identifier">N</span></tt>
may be negative.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.advance_c.header"></a><h5>
<a name="id431151"></a>
<a href="advance_c.html#fusion.iterator.functions.advance_c.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.functions.advance_c.header"></a><h6>
+<a name="id639584"></a>
+ <a class="link" href="advance_c.html#fusion.iterator.functions.advance_c.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.functions.advance_c.example"></a><h5>
<a name="id431306"></a>
<a href="advance_c.html#fusion.iterator.functions.advance_c.example">Example</a>
</h5>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</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">></span> <span class="identifier">vec</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.functions.advance_c.example"></a><h6>
+<a name="id639692"></a>
+ <a class="link" href="advance_c.html#fusion.iterator.functions.advance_c.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</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">></span> <span class="identifier">vec</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">vec</span> <span class="identifier">v</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>deref<span class="special">(</span>advance_c<span class="special"><</span><span class="number">2</span><span class="special">>(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
@@ -132,7 +204,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 © 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)
@@ -141,7 +213,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="advance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.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="../operator.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="advance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.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="deref_data.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Modified: branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref.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>deref</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 1. 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="next.html" title="next">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="../functions.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.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="next.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,21 +42,63 @@
<a name="id425893"></a>
<a href="deref.html#fusion.iterator.functions.deref.description">Description</a>
</h5>
+=======
+<div class="section" title="deref">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.functions.deref"></a><a class="link" href="deref.html" title="deref">deref</a>
+</h4></div></div></div>
+<a name="fusion.iterator.functions.deref.description"></a><h6>
+<a name="id634266"></a>
+ <a class="link" href="deref.html#fusion.iterator.functions.deref.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Deferences an iterator.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.deref.synopsis"></a><h5>
<a name="id425922"></a>
<a href="deref.html#fusion.iterator.functions.deref.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.functions.deref.synopsis"></a><h6>
+<a name="id634283"></a>
+ <a class="link" href="deref.html#fusion.iterator.functions.deref.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span>
<span class="special">></span>
<span class="keyword">typename</span> result_of::deref<span class="special"><</span><span class="identifier">I</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">deref</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id426066"></a><p class="title"><b>Table 1.2. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id679025"></a><p class="title"><b>Table 1.2. Parameters</b></p>
+=======
+<a name="id633840"></a><p class="title"><b>Table 1.2. Parameters</b></p>
+=======
+<a name="id626194"></a><p class="title"><b>Table 1.2. Parameters</b></p>
+=======
+<a name="id649886"></a><p class="title"><b>Table 1.2. Parameters</b></p>
+=======
+<a name="id637660"></a><p class="title"><b>Table 1.2. Parameters</b></p>
+=======
+<a name="id634383"></a><p class="title"><b>Table 1.2. 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 +130,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.functions.deref.expression_semantics"></a><h5>
<a name="id426167"></a>
<a href="deref.html#fusion.iterator.functions.deref.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.functions.deref.expression_semantics"></a><h6>
+<a name="id634465"></a>
+ <a class="link" href="deref.html#fusion.iterator.functions.deref.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">deref<span class="special">(</span><span class="identifier">i</span><span class="special">);</span>
@@ -93,18 +150,33 @@
<span class="bold"><b>Semantics</b></span>: Dereferences the iterator
<tt class="computeroutput"><span class="identifier">i</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.deref.header"></a><h5>
<a name="id426312"></a>
<a href="deref.html#fusion.iterator.functions.deref.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.functions.deref.header"></a><h6>
+<a name="id634560"></a>
+ <a class="link" href="deref.html#fusion.iterator.functions.deref.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.functions.deref.example"></a><h5>
<a name="id426466"></a>
<a href="deref.html#fusion.iterator.functions.deref.example">Example</a>
</h5>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&></span> <span class="identifier">vec</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.functions.deref.example"></a><h6>
+<a name="id634668"></a>
+ <a class="link" href="deref.html#fusion.iterator.functions.deref.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&></span> <span class="identifier">vec</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="keyword">int</span> <span class="identifier">i</span><span class="special">(</span><span class="number">0</span><span class="special">);</span>
<span class="identifier">vec</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="identifier">i</span><span class="special">);</span>
@@ -115,7 +187,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 © 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)
Copied: branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref_data.html (from r57242, /trunk/libs/fusion/doc/html/fusion/iterator/functions/deref_data.html)
==============================================================================
--- /trunk/libs/fusion/doc/html/fusion/iterator/functions/deref_data.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref_data.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,10 @@
<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>deref_data</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
<link rel="up" href="../functions.html" title="Functions">
<link rel="prev" href="advance_c.html" title="advance_c">
<link rel="next" href="../operator.html" title="Operator">
@@ -27,7 +27,7 @@
<a name="fusion.iterator.functions.deref_data"></a><a class="link" href="deref_data.html" title="deref_data">deref_data</a>
</h4></div></div></div>
<a name="fusion.iterator.functions.deref_data.description"></a><h6>
-<a name="id639332"></a>
+<a name="id633321"></a>
<a class="link" href="deref_data.html#fusion.iterator.functions.deref_data.description">Description</a>
</h6>
<p>
@@ -35,7 +35,7 @@
an associative iterator.
</p>
<a name="fusion.iterator.functions.deref_data.synopsis"></a><h6>
-<a name="id639348"></a>
+<a name="id633338"></a>
<a class="link" href="deref_data.html#fusion.iterator.functions.deref_data.synopsis">Synopsis</a>
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
@@ -44,7 +44,7 @@
<span class="keyword">typename</span> <a class="link" href="../metafunctions/deref_data.html" title="deref_data"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref_data</span></code></a><span class="special"><</span><span class="identifier">I</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">deref</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">);</span>
</pre>
<div class="table">
-<a name="id639449"></a><p class="title"><b>Table 1.8. Parameters</b></p>
+<a name="id633439"></a><p class="title"><b>Table 1.8. Parameters</b></p>
<div class="table-contents"><table class="table" summary="Parameters">
<colgroup>
<col>
@@ -89,7 +89,7 @@
</table></div>
</div>
<br class="table-break"><a name="fusion.iterator.functions.deref_data.expression_semantics"></a><h6>
-<a name="id639533"></a>
+<a name="id633523"></a>
<a class="link" href="deref_data.html#fusion.iterator.functions.deref_data.expression_semantics">Expression
Semantics</a>
</h6>
@@ -103,14 +103,14 @@
associated with the element referenced by an associative iterator <code class="computeroutput"><span class="identifier">i</span></code>.
</p>
<a name="fusion.iterator.functions.deref_data.header"></a><h6>
-<a name="id639630"></a>
+<a name="id633620"></a>
<a class="link" href="deref_data.html#fusion.iterator.functions.deref_data.header">Header</a>
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">deref_data</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">deref_data</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.iterator.functions.deref_data.example"></a><h6>
-<a name="id639738"></a>
+<a name="id633728"></a>
<a class="link" href="deref_data.html#fusion.iterator.functions.deref_data.example">Example</a>
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a><span class="special"><</span><a class="link" href="../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special"><</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">int</span><span class="special">&></span> <span class="special">></span> <span class="identifier">map</span><span class="special">;</span>
@@ -123,7 +123,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 © 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/iterator/functions/distance.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/distance.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/distance.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>distance</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="prior.html" title="prior">
<link rel="next" href="advance.html" title="advance">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="prior.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.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="advance.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,13 +42,30 @@
<a name="id428768"></a>
<a href="distance.html#fusion.iterator.functions.distance.description">Description</a>
</h5>
+=======
+<div class="section" title="distance">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.functions.distance"></a><a class="link" href="distance.html" title="distance">distance</a>
+</h4></div></div></div>
+<a name="fusion.iterator.functions.distance.description"></a><h6>
+<a name="id636810"></a>
+ <a class="link" href="distance.html#fusion.iterator.functions.distance.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Returns the distance between 2 iterators.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.distance.synopsis"></a><h5>
<a name="id428797"></a>
<a href="distance.html#fusion.iterator.functions.distance.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.functions.distance.synopsis"></a><h6>
+<a name="id636828"></a>
+ <a class="link" href="distance.html#fusion.iterator.functions.distance.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
<span class="keyword">typename</span> <span class="identifier">J</span>
@@ -47,8 +73,33 @@
<span class="keyword">typename</span> result_of::distance<span class="special"><</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">J</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">distance</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">J</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">j</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id428996"></a><p class="title"><b>Table 1.5. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id681614"></a><p class="title"><b>Table 1.5. Parameters</b></p>
+=======
+<a name="id637522"></a><p class="title"><b>Table 1.5. Parameters</b></p>
+=======
+<a name="id629876"></a><p class="title"><b>Table 1.5. Parameters</b></p>
+=======
+<a name="id652475"></a><p class="title"><b>Table 1.5. Parameters</b></p>
+=======
+<a name="id640249"></a><p class="title"><b>Table 1.5. Parameters</b></p>
+=======
+<a name="id636972"></a><p class="title"><b>Table 1.5. 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>
@@ -80,9 +131,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.functions.distance.expression_semantics"></a><h5>
<a name="id429110"></a>
<a href="distance.html#fusion.iterator.functions.distance.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.functions.distance.expression_semantics"></a><h6>
+<a name="id637061"></a>
+ <a class="link" href="distance.html#fusion.iterator.functions.distance.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">distance<span class="special">(</span><span class="identifier">i</span><span class="special">,</span><span class="identifier">j</span><span class="special">);</span>
@@ -94,18 +151,33 @@
<span class="bold"><b>Semantics</b></span>: Returns the distance between
iterators <tt class="computeroutput"><span class="identifier">i</span></tt> and <tt class="computeroutput"><span class="identifier">j</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.distance.header"></a><h5>
<a name="id429236"></a>
<a href="distance.html#fusion.iterator.functions.distance.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.functions.distance.header"></a><h6>
+<a name="id637144"></a>
+ <a class="link" href="distance.html#fusion.iterator.functions.distance.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">distance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">distance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.functions.distance.example"></a><h5>
<a name="id429393"></a>
<a href="distance.html#fusion.iterator.functions.distance.example">Example</a>
</h5>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</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">></span> <span class="identifier">vec</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.functions.distance.example"></a><h6>
+<a name="id637252"></a>
+ <a class="link" href="distance.html#fusion.iterator.functions.distance.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</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">></span> <span class="identifier">vec</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">vec</span> <span class="identifier">v</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>distance<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">),</span> next<span class="special">(</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">))))</span> <span class="special">==</span> <span class="number">2</spa
n><span class="special">);</span>
@@ -113,7 +185,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 © 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/iterator/functions/next.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/next.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/next.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>next</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="deref.html" title="deref">
<link rel="next" href="prior.html" title="prior">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="deref.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.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="prior.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,21 +42,63 @@
<a name="id426912"></a>
<a href="next.html#fusion.iterator.functions.next.description">Description</a>
</h5>
+=======
+<div class="section" title="next">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.functions.next"></a><a class="link" href="next.html" title="next">next</a>
+</h4></div></div></div>
+<a name="fusion.iterator.functions.next.description"></a><h6>
+<a name="id634970"></a>
+ <a class="link" href="next.html#fusion.iterator.functions.next.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Moves an iterator 1 position forwards.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.next.synopsis"></a><h5>
<a name="id426939"></a>
<a href="next.html#fusion.iterator.functions.next.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.functions.next.synopsis"></a><h6>
+<a name="id634988"></a>
+ <a class="link" href="next.html#fusion.iterator.functions.next.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span>
<span class="special">></span>
<span class="keyword">typename</span> result_of::next<span class="special"><</span><span class="identifier">I</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">next</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id427082"></a><p class="title"><b>Table 1.3. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id679731"></a><p class="title"><b>Table 1.3. Parameters</b></p>
+=======
+<a name="id634546"></a><p class="title"><b>Table 1.3. Parameters</b></p>
+=======
+<a name="id626900"></a><p class="title"><b>Table 1.3. Parameters</b></p>
+=======
+<a name="id650592"></a><p class="title"><b>Table 1.3. Parameters</b></p>
+=======
+<a name="id638366"></a><p class="title"><b>Table 1.3. Parameters</b></p>
+=======
+<a name="id635089"></a><p class="title"><b>Table 1.3. 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 +130,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.functions.next.expression_semantics"></a><h5>
<a name="id427182"></a>
<a href="next.html#fusion.iterator.functions.next.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.functions.next.expression_semantics"></a><h6>
+<a name="id635717"></a>
+ <a class="link" href="next.html#fusion.iterator.functions.next.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting"><span class="identifier">next</span><span class="special">(</span><span class="identifier">i</span><span class="special">);</span>
@@ -94,18 +151,33 @@
<span class="bold"><b>Semantics</b></span>: Returns an iterator to the
next element after <tt class="computeroutput"><span class="identifier">i</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.next.header"></a><h5>
<a name="id427278"></a>
<a href="next.html#fusion.iterator.functions.next.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.functions.next.header"></a><h6>
+<a name="id635782"></a>
+ <a class="link" href="next.html#fusion.iterator.functions.next.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">next</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">next</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.functions.next.example"></a><h5>
<a name="id427434"></a>
<a href="next.html#fusion.iterator.functions.next.example">Example</a>
</h5>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</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">></span> <span class="identifier">vec</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.functions.next.example"></a><h6>
+<a name="id635890"></a>
+ <a class="link" href="next.html#fusion.iterator.functions.next.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</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">></span> <span class="identifier">vec</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">vec</span> <span class="identifier">v</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>deref<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">))</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
@@ -115,7 +187,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 © 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/iterator/functions/prior.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/prior.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/prior.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>prior</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="next.html" title="next">
<link rel="next" href="distance.html" title="distance">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="next.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.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="distance.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,21 +42,63 @@
<a name="id427883"></a>
<a href="prior.html#fusion.iterator.functions.prior.description">Description</a>
</h5>
+=======
+<div class="section" title="prior">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.functions.prior"></a><a class="link" href="prior.html" title="prior">prior</a>
+</h4></div></div></div>
+<a name="fusion.iterator.functions.prior.description"></a><h6>
+<a name="id636195"></a>
+ <a class="link" href="prior.html#fusion.iterator.functions.prior.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Moves an iterator 1 position backwards.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.prior.synopsis"></a><h5>
<a name="id427911"></a>
<a href="prior.html#fusion.iterator.functions.prior.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.functions.prior.synopsis"></a><h6>
+<a name="id636213"></a>
+ <a class="link" href="prior.html#fusion.iterator.functions.prior.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span>
<span class="special">></span>
<span class="keyword">typename</span> result_of::prior<span class="special"><</span><span class="identifier">I</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">prior</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id428053"></a><p class="title"><b>Table 1.4. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id680955"></a><p class="title"><b>Table 1.4. Parameters</b></p>
+=======
+<a name="id636863"></a><p class="title"><b>Table 1.4. Parameters</b></p>
+=======
+<a name="id629217"></a><p class="title"><b>Table 1.4. Parameters</b></p>
+=======
+<a name="id651816"></a><p class="title"><b>Table 1.4. Parameters</b></p>
+=======
+<a name="id639590"></a><p class="title"><b>Table 1.4. Parameters</b></p>
+=======
+<a name="id636314"></a><p class="title"><b>Table 1.4. 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 +130,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.functions.prior.expression_semantics"></a><h5>
<a name="id428154"></a>
<a href="prior.html#fusion.iterator.functions.prior.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.functions.prior.expression_semantics"></a><h6>
+<a name="id636395"></a>
+ <a class="link" href="prior.html#fusion.iterator.functions.prior.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">prior<span class="special">(</span><span class="identifier">i</span><span class="special">);</span>
@@ -94,18 +151,33 @@
<span class="bold"><b>Semantics</b></span>: Returns an iterator to the
element prior to <tt class="computeroutput"><span class="identifier">i</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.functions.prior.header"></a><h5>
<a name="id428260"></a>
<a href="prior.html#fusion.iterator.functions.prior.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.functions.prior.header"></a><h6>
+<a name="id636465"></a>
+ <a class="link" href="prior.html#fusion.iterator.functions.prior.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">prior</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">prior</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.functions.prior.example"></a><h5>
<a name="id428415"></a>
<a href="prior.html#fusion.iterator.functions.prior.example">Example</a>
</h5>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.functions.prior.example"></a><h6>
+<a name="id636573"></a>
+ <a class="link" href="prior.html#fusion.iterator.functions.prior.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">vec</span> <span class="identifier">v</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>deref<span class="special">(</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
@@ -114,7 +186,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 © 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/iterator/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/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="../iterator.html" title="Iterator">
<link rel="previous" href="operator/operator_inequality.html" title=" Operator
@@ -39,6 +43,9 @@
<dt><span class="section">distance</span></dt>
<dt><span class="section">advance</span></dt>
<dt><span class="section">advance_c</span></dt>
+<dt><span class="section">key_of</span></dt>
+<dt><span class="section">value_of_data</span></dt>
+<dt><span class="section">deref_data</span></dt>
</dl></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance.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>advance</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="distance.html" title="distance">
<link rel="next" href="advance_c.html" title="advance_c">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="distance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="advance_c.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,13 +42,30 @@
<a name="id439778"></a>
<a href="advance.html#fusion.iterator.metafunctions.advance.description">Description</a>
</h5>
+=======
+<div class="section" title="advance">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.metafunctions.advance"></a><a class="link" href="advance.html" title="advance">advance</a>
+</h4></div></div></div>
+<a name="fusion.iterator.metafunctions.advance.description"></a><h6>
+<a name="id648520"></a>
+ <a class="link" href="advance.html#fusion.iterator.metafunctions.advance.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Moves an iterator a specified distance.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.advance.synopsis"></a><h5>
<a name="id439807"></a>
<a href="advance.html#fusion.iterator.metafunctions.advance.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.advance.synopsis"></a><h6>
+<a name="id648538"></a>
+ <a class="link" href="advance.html#fusion.iterator.metafunctions.advance.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
<span class="keyword">typename</span> <span class="identifier">M</span>
@@ -50,8 +76,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id439923"></a><p class="title"><b>Table 1.17. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id690363"></a><p class="title"><b>Table 1.17. Parameters</b></p>
+=======
+<a name="id647671"></a><p class="title"><b>Table 1.18. Parameters</b></p>
+=======
+<a name="id640571"></a><p class="title"><b>Table 1.18. Parameters</b></p>
+=======
+<a name="id664058"></a><p class="title"><b>Table 1.18. Parameters</b></p>
+=======
+<a name="id651900"></a><p class="title"><b>Table 1.18. Parameters</b></p>
+=======
+<a name="id648624"></a><p class="title"><b>Table 1.18. 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 +148,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.advance.expression_semantics"></a><h5>
<a name="id440068"></a>
<a href="advance.html#fusion.iterator.metafunctions.advance.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.metafunctions.advance.expression_semantics"></a><h6>
+<a name="id648745"></a>
+ <a class="link" href="advance.html#fusion.iterator.metafunctions.advance.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">result_of::advance<span class="special"><</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">M</span><span class="special">>::</span><span class="identifier">type</span>
@@ -116,13 +173,21 @@
Iterator</a> then <tt class="computeroutput"><span class="identifier">M</span></tt>
may be negative.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.advance.header"></a><h5>
<a name="id440244"></a>
<a href="advance.html#fusion.iterator.metafunctions.advance.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.advance.header"></a><h6>
+<a name="id648860"></a>
+ <a class="link" href="advance.html#fusion.iterator.metafunctions.advance.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.advance.example"></a><h5>
<a name="id440398"></a>
<a href="advance.html#fusion.iterator.metafunctions.advance.example">Example</a>
@@ -131,13 +196,23 @@
<span class="keyword">typedef</span> result_of::begin<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::next<span class="special"><</span><span class="identifier">first</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::next<span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.metafunctions.advance.example"></a><h6>
+<a name="id648968"></a>
+ <a class="link" href="advance.html#fusion.iterator.metafunctions.advance.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><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">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special"><</span><span class="identifier">first</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span>result_of::equal_to<span class="special"><</span>result_of::advance<span class="special"><</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special"><</span><span class="number">2</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="identifier">third</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 © 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/iterator/metafunctions/advance_c.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance_c.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance_c.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,13 +1,21 @@
<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>advance_c</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="advance.html" title="advance">
-<link rel="next" href="../../sequence.html" title="Sequence">
+<link rel="next" href="key_of.html" title="key_of">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -20,8 +28,9 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="advance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="../../sequence.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="advance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="key_of.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,13 +42,30 @@
<a name="id440857"></a>
<a href="advance_c.html#fusion.iterator.metafunctions.advance_c.description">Description</a>
</h5>
+=======
+<div class="section" title="advance_c">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.metafunctions.advance_c"></a><a class="link" href="advance_c.html" title="advance_c">advance_c</a>
+</h4></div></div></div>
+<a name="fusion.iterator.metafunctions.advance_c.description"></a><h6>
+<a name="id649281"></a>
+ <a class="link" href="advance_c.html#fusion.iterator.metafunctions.advance_c.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Moves an iterator by a specified distance.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.advance_c.synopsis"></a><h5>
<a name="id440886"></a>
<a href="advance_c.html#fusion.iterator.metafunctions.advance_c.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.advance_c.synopsis"></a><h6>
+<a name="id649299"></a>
+ <a class="link" href="advance_c.html#fusion.iterator.metafunctions.advance_c.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
<span class="keyword">int</span> <span class="identifier">N</span>
@@ -50,8 +76,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id441003"></a><p class="title"><b>Table 1.18. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id692763"></a><p class="title"><b>Table 1.18. Parameters</b></p>
+=======
+<a name="id648432"></a><p class="title"><b>Table 1.19. Parameters</b></p>
+=======
+<a name="id641332"></a><p class="title"><b>Table 1.19. Parameters</b></p>
+=======
+<a name="id664819"></a><p class="title"><b>Table 1.19. Parameters</b></p>
+=======
+<a name="id652661"></a><p class="title"><b>Table 1.19. Parameters</b></p>
+=======
+<a name="id649384"></a><p class="title"><b>Table 1.19. 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,9 +147,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.advance_c.expression_semantics"></a><h5>
<a name="id441140"></a>
<a href="advance_c.html#fusion.iterator.metafunctions.advance_c.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.metafunctions.advance_c.expression_semantics"></a><h6>
+<a name="id649501"></a>
+ <a class="link" href="advance_c.html#fusion.iterator.metafunctions.advance_c.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">result_of::advance_c<span class="special"><</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">N</span><span class="special">>::</span><span class="identifier">type</span>
@@ -115,13 +172,21 @@
Iterator</a> then <tt class="computeroutput"><span class="identifier">N</span></tt>
may be negative. Equivalent to <tt class="computeroutput">result_of::advance<span class="special"><</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special"><</span><span class="identifier">N</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.advance_c.header"></a><h5>
<a name="id441418"></a>
<a href="advance_c.html#fusion.iterator.metafunctions.advance_c.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.advance_c.header"></a><h6>
+<a name="id649686"></a>
+ <a class="link" href="advance_c.html#fusion.iterator.metafunctions.advance_c.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.advance_c.example"></a><h5>
<a name="id441574"></a>
<a href="advance_c.html#fusion.iterator.metafunctions.advance_c.example">Example</a>
@@ -130,13 +195,23 @@
<span class="keyword">typedef</span> result_of::begin<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::next<span class="special"><</span><span class="identifier">first</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::next<span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.metafunctions.advance_c.example"></a><h6>
+<a name="id649794"></a>
+ <a class="link" href="advance_c.html#fusion.iterator.metafunctions.advance_c.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><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">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special"><</span><span class="identifier">first</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span>result_of::equal_to<span class="special"><</span>result_of::advance_c<span class="special"><</span><span class="identifier">first</span><span class="special">,</span> <span class="number">2</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="identifier">third</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 © 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)
@@ -145,7 +220,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="advance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="../../sequence.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="advance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="key_of.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref.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>deref</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="value_of.html" title="value_of">
<link rel="next" href="next.html" title="next">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="value_of.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="next.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,13 +42,30 @@
<a name="id434940"></a>
<a href="deref.html#fusion.iterator.metafunctions.deref.description">Description</a>
</h5>
+=======
+<div class="section" title="deref">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.metafunctions.deref"></a><a class="link" href="deref.html" title="deref">deref</a>
+</h4></div></div></div>
+<a name="fusion.iterator.metafunctions.deref.description"></a><h6>
+<a name="id642953"></a>
+ <a class="link" href="deref.html#fusion.iterator.metafunctions.deref.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Returns the type that will be returned by dereferencing an iterator.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.deref.synposis"></a><h5>
<a name="id434969"></a>
<a href="deref.html#fusion.iterator.metafunctions.deref.synposis">Synposis</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.deref.synposis"></a><h6>
+<a name="id642970"></a>
+ <a class="link" href="deref.html#fusion.iterator.metafunctions.deref.synposis">Synposis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span>
<span class="special">></span>
@@ -49,8 +75,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id435068"></a><p class="title"><b>Table 1.12. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id686966"></a><p class="title"><b>Table 1.12. Parameters</b></p>
+=======
+<a name="id643591"></a><p class="title"><b>Table 1.13. Parameters</b></p>
+=======
+<a name="id635945"></a><p class="title"><b>Table 1.13. Parameters</b></p>
+=======
+<a name="id658476"></a><p class="title"><b>Table 1.13. Parameters</b></p>
+=======
+<a name="id646319"></a><p class="title"><b>Table 1.13. Parameters</b></p>
+=======
+<a name="id643042"></a><p class="title"><b>Table 1.13. 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>
@@ -82,9 +133,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.deref.expression_semantics"></a><h5>
<a name="id435168"></a>
<a href="deref.html#fusion.iterator.metafunctions.deref.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.metafunctions.deref.expression_semantics"></a><h6>
+<a name="id643126"></a>
+ <a class="link" href="deref.html#fusion.iterator.metafunctions.deref.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">result_of::deref<span class="special"><</span><span class="identifier">I</span><span class="special">>::</span><span class="identifier">type</span>
@@ -96,18 +153,33 @@
<span class="bold"><b>Semantics</b></span>: Returns the result of dereferencing
an iterator of type <tt class="computeroutput"><span class="identifier">I</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.deref.header"></a><h5>
<a name="id435280"></a>
<a href="deref.html#fusion.iterator.metafunctions.deref.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.deref.header"></a><h6>
+<a name="id643200"></a>
+ <a class="link" href="deref.html#fusion.iterator.metafunctions.deref.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.deref.example"></a><h5>
<a name="id435436"></a>
<a href="deref.html#fusion.iterator.metafunctions.deref.example">Example</a>
</h5>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&></span> <span class="identifier">vec</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.metafunctions.deref.example"></a><h6>
+<a name="id643308"></a>
+ <a class="link" href="deref.html#fusion.iterator.metafunctions.deref.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&></span> <span class="identifier">vec</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="keyword">typedef</span> <span class="keyword">const</span> <span class="identifier">vec</span> <span class="identifier">const_vec</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::begin<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::next<span class="special"><</span><span class="identifier">first</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
@@ -121,7 +193,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 © 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)
Copied: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref_data.html (from r57242, /trunk/libs/fusion/doc/html/fusion/iterator/metafunctions/deref_data.html)
==============================================================================
--- /trunk/libs/fusion/doc/html/fusion/iterator/metafunctions/deref_data.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref_data.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,10 @@
<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>deref_data</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="prev" href="value_of_data.html" title="value_of_data">
<link rel="next" href="../../sequence.html" title="Sequence">
@@ -27,7 +27,7 @@
<a name="fusion.iterator.metafunctions.deref_data"></a><a class="link" href="deref_data.html" title="deref_data">deref_data</a>
</h4></div></div></div>
<a name="fusion.iterator.metafunctions.deref_data.description"></a><h6>
-<a name="id652202"></a>
+<a name="id645578"></a>
<a class="link" href="deref_data.html#fusion.iterator.metafunctions.deref_data.description">Description</a>
</h6>
<p>
@@ -35,7 +35,7 @@
referenced by an associative iterator.
</p>
<a name="fusion.iterator.metafunctions.deref_data.synposis"></a><h6>
-<a name="id652219"></a>
+<a name="id645594"></a>
<a class="link" href="deref_data.html#fusion.iterator.metafunctions.deref_data.synposis">Synposis</a>
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
@@ -47,7 +47,7 @@
<span class="special">};</span>
</pre>
<div class="table">
-<a name="id652291"></a><p class="title"><b>Table 1.22. Parameters</b></p>
+<a name="id645666"></a><p class="title"><b>Table 1.22. Parameters</b></p>
<div class="table-contents"><table class="table" summary="Parameters">
<colgroup>
<col>
@@ -92,7 +92,7 @@
</table></div>
</div>
<br class="table-break"><a name="fusion.iterator.metafunctions.deref_data.expression_semantics"></a><h6>
-<a name="id652375"></a>
+<a name="id645750"></a>
<a class="link" href="deref_data.html#fusion.iterator.metafunctions.deref_data.expression_semantics">Expression
Semantics</a>
</h6>
@@ -106,14 +106,14 @@
the data property referenced by an associative iterator of type <code class="computeroutput"><span class="identifier">I</span></code>.
</p>
<a name="fusion.iterator.metafunctions.deref_data.header"></a><h6>
-<a name="id652450"></a>
+<a name="id645825"></a>
<a class="link" href="deref_data.html#fusion.iterator.metafunctions.deref_data.header">Header</a>
</h6>
<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special"><</span><span class="identifier">boosta</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">deref_data</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">deref_data</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.iterator.metafunctions.deref_data.example"></a><h6>
-<a name="id652558"></a>
+<a name="id645933"></a>
<a class="link" href="deref_data.html#fusion.iterator.metafunctions.deref_data.example">Example</a>
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a><span class="special"><</span><a class="link" href="../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special"><</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">int</span><span class="special">></span> <span class="special">></span> <span class="identifier">map</span><span class="special">;</span>
@@ -124,7 +124,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 © 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/iterator/metafunctions/distance.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/distance.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/distance.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>distance</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="equal_to.html" title="equal_to">
<link rel="next" href="advance.html" title="advance">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="equal_to.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="advance.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,13 +42,30 @@
<a name="id438791"></a>
<a href="distance.html#fusion.iterator.metafunctions.distance.description">Description</a>
</h5>
+=======
+<div class="section" title="distance">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.metafunctions.distance"></a><a class="link" href="distance.html" title="distance">distance</a>
+</h4></div></div></div>
+<a name="fusion.iterator.metafunctions.distance.description"></a><h6>
+<a name="id647826"></a>
+ <a class="link" href="distance.html#fusion.iterator.metafunctions.distance.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Returns the distance between two iterators.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.distance.synopsis"></a><h5>
<a name="id438821"></a>
<a href="distance.html#fusion.iterator.metafunctions.distance.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.distance.synopsis"></a><h6>
+<a name="id647844"></a>
+ <a class="link" href="distance.html#fusion.iterator.metafunctions.distance.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
<span class="keyword">typename</span> <span class="identifier">J</span>
@@ -50,8 +76,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id438937"></a><p class="title"><b>Table 1.16. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id689668"></a><p class="title"><b>Table 1.16. Parameters</b></p>
+=======
+<a name="id646976"></a><p class="title"><b>Table 1.17. Parameters</b></p>
+=======
+<a name="id639876"></a><p class="title"><b>Table 1.17. Parameters</b></p>
+=======
+<a name="id663363"></a><p class="title"><b>Table 1.17. Parameters</b></p>
+=======
+<a name="id651206"></a><p class="title"><b>Table 1.17. Parameters</b></p>
+=======
+<a name="id647929"></a><p class="title"><b>Table 1.17. 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>
@@ -83,9 +134,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.distance.expression_semantics"></a><h5>
<a name="id439049"></a>
<a href="distance.html#fusion.iterator.metafunctions.distance.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.metafunctions.distance.expression_semantics"></a><h6>
+<a name="id648020"></a>
+ <a class="link" href="distance.html#fusion.iterator.metafunctions.distance.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">result_of::distance<span class="special"><</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">J</span><span class="special">>::</span><span class="identifier">type</span>
@@ -99,13 +156,21 @@
iterators of types <tt class="computeroutput"><span class="identifier">I</span></tt> and
<tt class="computeroutput"><span class="identifier">J</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.distance.header"></a><h5>
<a name="id439192"></a>
<a href="distance.html#fusion.iterator.metafunctions.distance.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.distance.header"></a><h6>
+<a name="id648116"></a>
+ <a class="link" href="distance.html#fusion.iterator.metafunctions.distance.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">distance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">distance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.distance.example"></a><h5>
<a name="id439348"></a>
<a href="distance.html#fusion.iterator.metafunctions.distance.example">Example</a>
@@ -115,13 +180,24 @@
<span class="keyword">typedef</span> result_of::next<span class="special"><</span><span class="identifier">first</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::next<span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::distance<span class="special"><</span><span class="identifier">first</span><span class="special">,</span><span class="identifier">third</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">dist</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.metafunctions.distance.example"></a><h6>
+<a name="id648224"></a>
+ <a class="link" href="distance.html#fusion.iterator.metafunctions.distance.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><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">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special"><</span><span class="identifier">first</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="distance.html" title="distance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">distance</span></code></a><span class="special"><</span><span class="identifier">first</span><span class="special">,</span><span class="identifier">third</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">dist</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">BOOST_MPL_ASSERT_RELATION</span><span class="special">(</span><span class="identifier">dist</span><span class="special">::</span><span class="identifier">value</span><span class="special">,</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 © 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/iterator/metafunctions/equal_to.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/equal_to.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/equal_to.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>equal_to</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="prior.html" title="prior">
<link rel="next" href="distance.html" title="distance">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="prior.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="distance.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,15 +42,32 @@
<a name="id437790"></a>
<a href="equal_to.html#fusion.iterator.metafunctions.equal_to.description">Description</a>
</h5>
+=======
+<div class="section" title="equal_to">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.metafunctions.equal_to"></a><a class="link" href="equal_to.html" title="equal_to">equal_to</a>
+</h4></div></div></div>
+<a name="fusion.iterator.metafunctions.equal_to.description"></a><h6>
+<a name="id645491"></a>
+ <a class="link" href="equal_to.html#fusion.iterator.metafunctions.equal_to.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Returns a true-valued <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
Integral Constant</a> if <tt class="computeroutput"><span class="identifier">I</span></tt>
and <tt class="computeroutput"><span class="identifier">J</span></tt> are equal.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.equal_to.synopsis"></a><h5>
<a name="id437850"></a>
<a href="equal_to.html#fusion.iterator.metafunctions.equal_to.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.equal_to.synopsis"></a><h6>
+<a name="id645527"></a>
+ <a class="link" href="equal_to.html#fusion.iterator.metafunctions.equal_to.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
<span class="keyword">typename</span> <span class="identifier">J</span>
@@ -52,8 +78,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id437965"></a><p class="title"><b>Table 1.15. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id688990"></a><p class="title"><b>Table 1.15. Parameters</b></p>
+=======
+<a name="id645683"></a><p class="title"><b>Table 1.16. Parameters</b></p>
+=======
+<a name="id638037"></a><p class="title"><b>Table 1.16. Parameters</b></p>
+=======
+<a name="id661592"></a><p class="title"><b>Table 1.16. Parameters</b></p>
+=======
+<a name="id648889"></a><p class="title"><b>Table 1.16. Parameters</b></p>
+=======
+<a name="id645612"></a><p class="title"><b>Table 1.16. 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>
@@ -83,9 +134,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.equal_to.expression_semantics"></a><h5>
<a name="id438069"></a>
<a href="equal_to.html#fusion.iterator.metafunctions.equal_to.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.metafunctions.equal_to.expression_semantics"></a><h6>
+<a name="id645698"></a>
+ <a class="link" href="equal_to.html#fusion.iterator.metafunctions.equal_to.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">result_of::equal_to<span class="special"><</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">J</span><span class="special">>::</span><span class="identifier">type</span>
@@ -99,13 +156,21 @@
if <tt class="computeroutput"><span class="identifier">I</span></tt> and <tt class="computeroutput"><span class="identifier">J</span></tt> are iterators to the same position.
Returns <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt> otherwise.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.equal_to.header"></a><h5>
<a name="id438274"></a>
<a href="equal_to.html#fusion.iterator.metafunctions.equal_to.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.equal_to.header"></a><h6>
+<a name="id645836"></a>
+ <a class="link" href="equal_to.html#fusion.iterator.metafunctions.equal_to.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.equal_to.example"></a><h5>
<a name="id438431"></a>
<a href="equal_to.html#fusion.iterator.metafunctions.equal_to.example">Example</a>
@@ -115,11 +180,22 @@
<span class="keyword">typedef</span> result_of::end<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">last</span><span class="special">;</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span>result_of::equal_to<span class="special"><</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">first</span><span class="special">>));</span>
<span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span>result_of::equal_to<span class="special"><</span><span class="identifier">first</span><span class="special">,</span><span class="identifier">last</span><span class="special">>));</span>
+=======
+<a name="fusion.iterator.metafunctions.equal_to.example"></a><h6>
+<a name="id645944"></a>
+ <a class="link" href="equal_to.html#fusion.iterator.metafunctions.equal_to.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">last</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><a class="link" href="equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special"><</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">first</span><span class="special">>));</span>
+<span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span><a class="link" href="equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special"><</span><span class="identifier">first</span><span class="special">,</span><span class="identifier">last</span><span class="special">>));</span>
+>>>>>>> .merge-right.r57125
</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 © 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)
Copied: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/key_of.html (from r57242, /trunk/libs/fusion/doc/html/fusion/iterator/metafunctions/key_of.html)
==============================================================================
--- /trunk/libs/fusion/doc/html/fusion/iterator/metafunctions/key_of.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/key_of.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,10 @@
<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>key_of</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="prev" href="advance_c.html" title="advance_c">
<link rel="next" href="value_of_data.html" title="value_of_data">
@@ -27,7 +27,7 @@
<a name="fusion.iterator.metafunctions.key_of"></a><a class="link" href="key_of.html" title="key_of">key_of</a>
</h4></div></div></div>
<a name="fusion.iterator.metafunctions.key_of.description"></a><h6>
-<a name="id651108"></a>
+<a name="id644483"></a>
<a class="link" href="key_of.html#fusion.iterator.metafunctions.key_of.description">Description</a>
</h6>
<p>
@@ -35,7 +35,7 @@
iterator.
</p>
<a name="fusion.iterator.metafunctions.key_of.synopsis"></a><h6>
-<a name="id651125"></a>
+<a name="id644500"></a>
<a class="link" href="key_of.html#fusion.iterator.metafunctions.key_of.synopsis">Synopsis</a>
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
@@ -47,7 +47,7 @@
<span class="special">};</span>
</pre>
<div class="table">
-<a name="id651197"></a><p class="title"><b>Table 1.20. Parameters</b></p>
+<a name="id644572"></a><p class="title"><b>Table 1.20. Parameters</b></p>
<div class="table-contents"><table class="table" summary="Parameters">
<colgroup>
<col>
@@ -92,7 +92,7 @@
</table></div>
</div>
<br class="table-break"><a name="fusion.iterator.metafunctions.key_of.expression_semantics"></a><h6>
-<a name="id651281"></a>
+<a name="id644656"></a>
<a class="link" href="key_of.html#fusion.iterator.metafunctions.key_of.expression_semantics">Expression
Semantics</a>
</h6>
@@ -106,14 +106,14 @@
with the element referenced by an associative iterator <code class="computeroutput"><span class="identifier">I</span></code>.
</p>
<a name="fusion.iterator.metafunctions.key_of.header"></a><h6>
-<a name="id651355"></a>
+<a name="id644730"></a>
<a class="link" href="key_of.html#fusion.iterator.metafunctions.key_of.header">Header</a>
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">key_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">key_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.iterator.metafunctions.key_of.example"></a><h6>
-<a name="id651463"></a>
+<a name="id644838"></a>
<a class="link" href="key_of.html#fusion.iterator.metafunctions.key_of.example">Example</a>
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a><span class="special"><</span><a class="link" href="../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special"><</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">int</span><span class="special">></span> <span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
@@ -124,7 +124,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 © 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/iterator/metafunctions/next.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/next.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/next.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>next</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="deref.html" title="deref">
<link rel="next" href="prior.html" title="prior">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="deref.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="prior.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,13 +42,30 @@
<a name="id436013"></a>
<a href="next.html#fusion.iterator.metafunctions.next.description">Description</a>
</h5>
+=======
+<div class="section" title="next">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.metafunctions.next"></a><a class="link" href="next.html" title="next">next</a>
+</h4></div></div></div>
+<a name="fusion.iterator.metafunctions.next.description"></a><h6>
+<a name="id644254"></a>
+ <a class="link" href="next.html#fusion.iterator.metafunctions.next.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Returns the type of the next iterator in a sequence.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.next.synposis"></a><h5>
<a name="id436042"></a>
<a href="next.html#fusion.iterator.metafunctions.next.synposis">Synposis</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.next.synposis"></a><h6>
+<a name="id644270"></a>
+ <a class="link" href="next.html#fusion.iterator.metafunctions.next.synposis">Synposis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span>
<span class="special">></span>
@@ -49,8 +75,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id436140"></a><p class="title"><b>Table 1.13. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id687720"></a><p class="title"><b>Table 1.13. Parameters</b></p>
+=======
+<a name="id644414"></a><p class="title"><b>Table 1.14. Parameters</b></p>
+=======
+<a name="id636768"></a><p class="title"><b>Table 1.14. Parameters</b></p>
+=======
+<a name="id660323"></a><p class="title"><b>Table 1.14. Parameters</b></p>
+=======
+<a name="id647619"></a><p class="title"><b>Table 1.14. Parameters</b></p>
+=======
+<a name="id644342"></a><p class="title"><b>Table 1.14. 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>
@@ -82,9 +133,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.next.expression_semantics"></a><h5>
<a name="id436242"></a>
<a href="next.html#fusion.iterator.metafunctions.next.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.metafunctions.next.expression_semantics"></a><h6>
+<a name="id644424"></a>
+ <a class="link" href="next.html#fusion.iterator.metafunctions.next.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">result_of::next<span class="special"><</span><span class="identifier">I</span><span class="special">>::</span><span class="identifier">type</span>
@@ -97,26 +154,42 @@
<span class="bold"><b>Semantics</b></span>: Returns an iterator to the
next element in the sequence after <tt class="computeroutput"><span class="identifier">I</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.next.header"></a><h5>
<a name="id436364"></a>
<a href="next.html#fusion.iterator.metafunctions.next.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.next.header"></a><h6>
+<a name="id644503"></a>
+ <a class="link" href="next.html#fusion.iterator.metafunctions.next.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">next</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">next</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.next.example"></a><h5>
<a name="id436520"></a>
<a href="next.html#fusion.iterator.metafunctions.next.example">Example</a>
</h5>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::next<span class="special"><</span>result_of::begin<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.metafunctions.next.example"></a><h6>
+<a name="id644611"></a>
+ <a class="link" href="next.html#fusion.iterator.metafunctions.next.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special"><</span><a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::value_of<span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">double</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 © 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/iterator/metafunctions/prior.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/prior.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/prior.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>prior</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="next.html" title="next">
<link rel="next" href="equal_to.html" title="equal_to">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="next.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="equal_to.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,13 +42,30 @@
<a name="id436823"></a>
<a href="prior.html#fusion.iterator.metafunctions.prior.description">Description</a>
</h5>
+=======
+<div class="section" title="prior">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.metafunctions.prior"></a><a class="link" href="prior.html" title="prior">prior</a>
+</h4></div></div></div>
+<a name="fusion.iterator.metafunctions.prior.description"></a><h6>
+<a name="id644815"></a>
+ <a class="link" href="prior.html#fusion.iterator.metafunctions.prior.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Returns the type of the previous iterator in a sequence.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.prior.synopsis"></a><h5>
<a name="id436852"></a>
<a href="prior.html#fusion.iterator.metafunctions.prior.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.prior.synopsis"></a><h6>
+<a name="id644832"></a>
+ <a class="link" href="prior.html#fusion.iterator.metafunctions.prior.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span>
<span class="special">></span>
@@ -49,8 +75,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id436950"></a><p class="title"><b>Table 1.14. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id688282"></a><p class="title"><b>Table 1.14. Parameters</b></p>
+=======
+<a name="id644975"></a><p class="title"><b>Table 1.15. Parameters</b></p>
+=======
+<a name="id637329"></a><p class="title"><b>Table 1.15. Parameters</b></p>
+=======
+<a name="id660884"></a><p class="title"><b>Table 1.15. Parameters</b></p>
+=======
+<a name="id648181"></a><p class="title"><b>Table 1.15. Parameters</b></p>
+=======
+<a name="id644904"></a><p class="title"><b>Table 1.15. 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>
@@ -82,9 +133,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.prior.expression_semantics"></a><h5>
<a name="id437051"></a>
<a href="prior.html#fusion.iterator.metafunctions.prior.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.metafunctions.prior.expression_semantics"></a><h6>
+<a name="id644988"></a>
+ <a class="link" href="prior.html#fusion.iterator.metafunctions.prior.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">result_of::prior<span class="special"><</span><span class="identifier">I</span><span class="special">>::</span><span class="identifier">type</span>
@@ -97,19 +154,35 @@
<span class="bold"><b>Semantics</b></span>: Returns an iterator to the
previous element in the sequence before <tt class="computeroutput"><span class="identifier">I</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.prior.header"></a><h5>
<a name="id437175"></a>
<a href="prior.html#fusion.iterator.metafunctions.prior.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.prior.header"></a><h6>
+<a name="id645070"></a>
+ <a class="link" href="prior.html#fusion.iterator.metafunctions.prior.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">prior</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">prior</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.prior.example"></a><h5>
<a name="id437330"></a>
<a href="prior.html#fusion.iterator.metafunctions.prior.example">Example</a>
</h5>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::next<span class="special"><</span>result_of::begin<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.metafunctions.prior.example"></a><h6>
+<a name="id645178"></a>
+ <a class="link" href="prior.html#fusion.iterator.metafunctions.prior.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special"><</span><a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::value_of<span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">double</span><span class="special">>));</span>
@@ -119,7 +192,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 © 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/iterator/metafunctions/value_of.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of.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>value_of</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 1. 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="deref.html" title="deref">
@@ -22,6 +30,7 @@
<div class="spirit-nav">
<a accesskey="p" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.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="deref.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -33,13 +42,30 @@
<a name="id433848"></a>
<a href="value_of.html#fusion.iterator.metafunctions.value_of.description">Description</a>
</h5>
+=======
+<div class="section" title="value_of">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.metafunctions.value_of"></a><a class="link" href="value_of.html" title="value_of">value_of</a>
+</h4></div></div></div>
+<a name="fusion.iterator.metafunctions.value_of.description"></a><h6>
+<a name="id642185"></a>
+ <a class="link" href="value_of.html#fusion.iterator.metafunctions.value_of.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Returns the type stored at the position of an iterator.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.value_of.synopsis"></a><h5>
<a name="id433878"></a>
<a href="value_of.html#fusion.iterator.metafunctions.value_of.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.value_of.synopsis"></a><h6>
+<a name="id642202"></a>
+ <a class="link" href="value_of.html#fusion.iterator.metafunctions.value_of.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span>
<span class="special">></span>
@@ -49,8 +75,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id433975"></a><p class="title"><b>Table 1.11. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id686198"></a><p class="title"><b>Table 1.11. Parameters</b></p>
+=======
+<a name="id642823"></a><p class="title"><b>Table 1.12. Parameters</b></p>
+=======
+<a name="id635177"></a><p class="title"><b>Table 1.12. Parameters</b></p>
+=======
+<a name="id657708"></a><p class="title"><b>Table 1.12. Parameters</b></p>
+=======
+<a name="id645551"></a><p class="title"><b>Table 1.12. Parameters</b></p>
+=======
+<a name="id642274"></a><p class="title"><b>Table 1.12. 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>
@@ -82,9 +133,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.value_of.expression_semantics"></a><h5>
<a name="id434074"></a>
<a href="value_of.html#fusion.iterator.metafunctions.value_of.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.metafunctions.value_of.expression_semantics"></a><h6>
+<a name="id642358"></a>
+ <a class="link" href="value_of.html#fusion.iterator.metafunctions.value_of.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting">result_of::value_of<span class="special"><</span><span class="identifier">I</span><span class="special">>::</span><span class="identifier">type</span>
@@ -96,13 +153,21 @@
<span class="bold"><b>Semantics</b></span>: Returns the type stored in
a sequence at iterator position <tt class="computeroutput"><span class="identifier">I</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.value_of.header"></a><h5>
<a name="id434185"></a>
<a href="value_of.html#fusion.iterator.metafunctions.value_of.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.metafunctions.value_of.header"></a><h6>
+<a name="id642432"></a>
+ <a class="link" href="value_of.html#fusion.iterator.metafunctions.value_of.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">value_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">value_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.metafunctions.value_of.example"></a><h5>
<a name="id434341"></a>
<a href="value_of.html#fusion.iterator.metafunctions.value_of.example">Example</a>
@@ -111,6 +176,16 @@
<span class="keyword">typedef</span> result_of::begin<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::next<span class="special"><</span><span class="identifier">first</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::next<span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.metafunctions.value_of.example"></a><h6>
+<a name="id642540"></a>
+ <a class="link" href="value_of.html#fusion.iterator.metafunctions.value_of.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&,</span><span class="keyword">const</span> <span class="keyword">int</span><span class="special">&></span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special"><</span><span class="identifier">first</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::value_of<span class="special"><</span><span class="identifier">first</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">>));</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::value_of<span class="special"><</span><span class="identifier">second</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&>));</span>
@@ -119,7 +194,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 © 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)
Copied: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of_data.html (from r57242, /trunk/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of_data.html)
==============================================================================
--- /trunk/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of_data.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of_data.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,10 +1,10 @@
<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>value_of_data</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="prev" href="key_of.html" title="key_of">
<link rel="next" href="deref_data.html" title="deref_data">
@@ -27,7 +27,7 @@
<a name="fusion.iterator.metafunctions.value_of_data"></a><a class="link" href="value_of_data.html" title="value_of_data">value_of_data</a>
</h4></div></div></div>
<a name="fusion.iterator.metafunctions.value_of_data.description"></a><h6>
-<a name="id651658"></a>
+<a name="id645033"></a>
<a class="link" href="value_of_data.html#fusion.iterator.metafunctions.value_of_data.description">Description</a>
</h6>
<p>
@@ -35,7 +35,7 @@
by an associative iterator references.
</p>
<a name="fusion.iterator.metafunctions.value_of_data.synopsis"></a><h6>
-<a name="id651674"></a>
+<a name="id645050"></a>
<a class="link" href="value_of_data.html#fusion.iterator.metafunctions.value_of_data.synopsis">Synopsis</a>
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
@@ -47,7 +47,7 @@
<span class="special">};</span>
</pre>
<div class="table">
-<a name="id651746"></a><p class="title"><b>Table 1.21. Parameters</b></p>
+<a name="id645122"></a><p class="title"><b>Table 1.21. Parameters</b></p>
<div class="table-contents"><table class="table" summary="Parameters">
<colgroup>
<col>
@@ -92,7 +92,7 @@
</table></div>
</div>
<br class="table-break"><a name="fusion.iterator.metafunctions.value_of_data.expression_semantics"></a><h6>
-<a name="id651828"></a>
+<a name="id645203"></a>
<a class="link" href="value_of_data.html#fusion.iterator.metafunctions.value_of_data.expression_semantics">Expression
Semantics</a>
</h6>
@@ -107,14 +107,14 @@
<code class="computeroutput"><span class="identifier">I</span></code>.
</p>
<a name="fusion.iterator.metafunctions.value_of_data.header"></a><h6>
-<a name="id651900"></a>
+<a name="id645275"></a>
<a class="link" href="value_of_data.html#fusion.iterator.metafunctions.value_of_data.header">Header</a>
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">value_of_data</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">value_of_data</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.iterator.metafunctions.value_of_data.example"></a><h6>
-<a name="id652008"></a>
+<a name="id645383"></a>
<a class="link" href="value_of_data.html#fusion.iterator.metafunctions.value_of_data.example">Example</a>
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a><span class="special"><</span><a class="link" href="../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special"><</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">int</span><span class="special">></span> <span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
@@ -125,7 +125,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 © 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/iterator/operator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/operator.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/operator.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,12 +3,21 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Operator</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="../iterator.html" title="Iterator">
+<<<<<<< .working
<link rel="previous" href="functions/advance_c.html" title="advance_c">
<link rel="next" href="operator/operator_unary_star.html" title=" Operator
*">
+=======
+<link rel="prev" href="functions/deref_data.html" title="deref_data">
+<link rel="next" href="operator/operator_unary_star.html" title="Operator *">
+>>>>>>> .merge-right.r57242
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -21,7 +30,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="functions/advance_c.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.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="operator/operator_unary_star.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="functions/deref_data.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.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="operator/operator_unary_star.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" lang="en">
<div class="titlepage">
@@ -54,7 +63,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="functions/advance_c.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.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="operator/operator_unary_star.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="functions/deref_data.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.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="operator/operator_unary_star.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Modified: branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_equality.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_equality.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_equality.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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> Operator
==</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../operator.html" title="Operator">
<link rel="previous" href="operator_unary_star.html" title=" Operator
*">
@@ -31,6 +39,7 @@
<a name="fusion.iterator.operator.operator_equality"></a><a href="operator_equality.html" title=" Operator
=="> Operator
==</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -38,13 +47,27 @@
<a name="id432570"></a>
<a href="operator_equality.html#fusion.iterator.operator.operator_equality.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.iterator.operator.operator_equality.description"></a><h6>
+<a name="id641283"></a>
+ <a class="link" href="operator_equality.html#fusion.iterator.operator.operator_equality.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Compares 2 iterators for equality.
</p>
+<<<<<<< .working
<a name="fusion.iterator.operator.operator_equality.synopsis"></a><h5>
<a name="id432599"></a>
<a href="operator_equality.html#fusion.iterator.operator.operator_equality.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.operator.operator_equality.synopsis"></a><h6>
+<a name="id641300"></a>
+ <a class="link" href="operator_equality.html#fusion.iterator.operator.operator_equality.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
<span class="keyword">typename</span> <span class="identifier">J</span>
@@ -52,8 +75,33 @@
<span class="emphasis"><em>unspecified</em></span> <span class="keyword">operator</span><span class="special">==(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">J</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id432739"></a><p class="title"><b>Table 1.9. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id685327"></a><p class="title"><b>Table 1.9. Parameters</b></p>
+=======
+<a name="id641952"></a><p class="title"><b>Table 1.10. Parameters</b></p>
+=======
+<a name="id634306"></a><p class="title"><b>Table 1.10. Parameters</b></p>
+=======
+<a name="id656837"></a><p class="title"><b>Table 1.10. Parameters</b></p>
+=======
+<a name="id644680"></a><p class="title"><b>Table 1.10. Parameters</b></p>
+=======
+<a name="id641403"></a><p class="title"><b>Table 1.10. 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>
@@ -83,9 +131,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.operator.operator_equality.expression_semantics"></a><h5>
<a name="id432842"></a>
<a href="operator_equality.html#fusion.iterator.operator.operator_equality.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.operator.operator_equality.expression_semantics"></a><h6>
+<a name="id641489"></a>
+ <a class="link" href="operator_equality.html#fusion.iterator.operator.operator_equality.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting"><span class="identifier">i</span> <span class="special">==</span> <span class="identifier">j</span>
@@ -98,17 +152,24 @@
where <tt class="computeroutput"><span class="identifier">I</span></tt> and <tt class="computeroutput"><span class="identifier">J</span></tt> are the types of <tt class="computeroutput"><span class="identifier">i</span></tt>
and <tt class="computeroutput"><span class="identifier">j</span></tt> respectively.
</p>
+<<<<<<< .working
<a name="fusion.iterator.operator.operator_equality.header"></a><h5>
<a name="id433034"></a>
<a href="operator_equality.html#fusion.iterator.operator.operator_equality.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.operator.operator_equality.header"></a><h6>
+<a name="id641616"></a>
+ <a class="link" href="operator_equality.html#fusion.iterator.operator.operator_equality.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</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 © 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/iterator/operator/operator_inequality.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_inequality.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_inequality.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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> Operator
!=</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../operator.html" title="Operator">
<link rel="previous" href="operator_equality.html" title=" Operator
==">
@@ -30,6 +38,7 @@
<a name="fusion.iterator.operator.operator_inequality"></a><a href="operator_inequality.html" title=" Operator
!="> Operator
!=</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -37,13 +46,27 @@
<a name="id433209"></a>
<a href="operator_inequality.html#fusion.iterator.operator.operator_inequality.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.iterator.operator.operator_inequality.description"></a><h6>
+<a name="id641738"></a>
+ <a class="link" href="operator_inequality.html#fusion.iterator.operator.operator_inequality.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Compares 2 iterators for inequality.
</p>
+<<<<<<< .working
<a name="fusion.iterator.operator.operator_inequality.synopsis"></a><h5>
<a name="id433239"></a>
<a href="operator_inequality.html#fusion.iterator.operator.operator_inequality.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.operator.operator_inequality.synopsis"></a><h6>
+<a name="id641758"></a>
+ <a class="link" href="operator_inequality.html#fusion.iterator.operator.operator_inequality.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
<span class="keyword">typename</span> <span class="identifier">J</span>
@@ -51,8 +74,33 @@
<span class="emphasis"><em>unspecified</em></span> <span class="keyword">operator</span><span class="special">==(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">J</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id433380"></a><p class="title"><b>Table 1.10. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id685785"></a><p class="title"><b>Table 1.10. Parameters</b></p>
+=======
+<a name="id642410"></a><p class="title"><b>Table 1.11. Parameters</b></p>
+=======
+<a name="id634764"></a><p class="title"><b>Table 1.11. Parameters</b></p>
+=======
+<a name="id657296"></a><p class="title"><b>Table 1.11. Parameters</b></p>
+=======
+<a name="id645138"></a><p class="title"><b>Table 1.11. Parameters</b></p>
+=======
+<a name="id641861"></a><p class="title"><b>Table 1.11. 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>
@@ -82,9 +130,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.operator.operator_inequality.expression_semantics"></a><h5>
<a name="id433483"></a>
<a href="operator_inequality.html#fusion.iterator.operator.operator_inequality.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.operator.operator_inequality.expression_semantics"></a><h6>
+<a name="id641945"></a>
+ <a class="link" href="operator_inequality.html#fusion.iterator.operator.operator_inequality.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<p>
@@ -95,17 +149,24 @@
where <tt class="computeroutput"><span class="identifier">I</span></tt> and <tt class="computeroutput"><span class="identifier">J</span></tt> are the types of <tt class="computeroutput"><span class="identifier">i</span></tt>
and <tt class="computeroutput"><span class="identifier">j</span></tt> respectively.
</p>
+<<<<<<< .working
<a name="fusion.iterator.operator.operator_inequality.header"></a><h5>
<a name="id433654"></a>
<a href="operator_inequality.html#fusion.iterator.operator.operator_inequality.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.operator.operator_inequality.header"></a><h6>
+<a name="id642056"></a>
+ <a class="link" href="operator_inequality.html#fusion.iterator.operator.operator_inequality.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</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 © 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/iterator/operator/operator_unary_star.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_unary_star.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_unary_star.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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> Operator
*</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../operator.html" title="Operator">
<link rel="previous" href="../operator.html" title="Operator">
<link rel="next" href="operator_equality.html" title=" Operator
@@ -30,6 +38,7 @@
<a name="fusion.iterator.operator.operator_unary_star"></a><a href="operator_unary_star.html" title=" Operator
*"> Operator
*</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -37,21 +46,60 @@
<a name="id431600"></a>
<a href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.iterator.operator.operator_unary_star.description"></a><h6>
+<a name="id640541"></a>
+ <a class="link" href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
Dereferences an iterator.
</p>
+<<<<<<< .working
<a name="fusion.iterator.operator.operator_unary_star.synopsis"></a><h5>
<a name="id431631"></a>
<a href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.synopsis">Synopsis</a>
</h5>
+=======
+<a name="fusion.iterator.operator.operator_unary_star.synopsis"></a><h6>
+<a name="id640560"></a>
+ <a class="link" href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.synopsis">Synopsis</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">I</span>
<span class="special">></span>
<span class="keyword">typename</span> result_of::deref<span class="special"><</span><span class="identifier">I</span><span class="special">>::</span><span class="identifier">type</span> <span class="keyword">operator</span><span class="special">*(</span><span class="emphasis"><em>unspecified</em></span><span class="special"><</span><span class="identifier">I</span><span class="special">></span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">i</span><span class="special">);</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id431788"></a><p class="title"><b>Table 1.8. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id684663"></a><p class="title"><b>Table 1.8. Parameters</b></p>
+=======
+<a name="id640127"></a><p class="title"><b>Table 1.9. Parameters</b></p>
+=======
+<a name="id632481"></a><p class="title"><b>Table 1.9. Parameters</b></p>
+=======
+<a name="id656173"></a><p class="title"><b>Table 1.9. Parameters</b></p>
+=======
+<a name="id643947"></a><p class="title"><b>Table 1.9. Parameters</b></p>
+=======
+<a name="id640670"></a><p class="title"><b>Table 1.9. 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>
@@ -83,9 +131,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.iterator.operator.operator_unary_star.expression_semantics"></a><h5>
<a name="id431889"></a>
<a href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.iterator.operator.operator_unary_star.expression_semantics"></a><h6>
+<a name="id640752"></a>
+ <a class="link" href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<pre class="programlisting"><span class="special">*</span><span class="identifier">i</span>
@@ -97,18 +151,33 @@
<p>
<span class="bold"><b>Semantics</b></span>: Equivalent to <tt class="computeroutput">deref<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.iterator.operator.operator_unary_star.header"></a><h5>
<a name="id432026"></a>
<a href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.header">Header</a>
</h5>
+=======
+<a name="fusion.iterator.operator.operator_unary_star.header"></a><h6>
+<a name="id640840"></a>
+ <a class="link" href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">iterator</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.iterator.operator.operator_unary_star.example"></a><h5>
<a name="id432182"></a>
<a href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.example">Example</a>
</h5>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&></span> <span class="identifier">vec</span><span class="special">;</span>
+=======
+<a name="fusion.iterator.operator.operator_unary_star.example"></a><h6>
+<a name="id640948"></a>
+ <a class="link" href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.example">Example</a>
+ </h6>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&></span> <span class="identifier">vec</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="keyword">int</span> <span class="identifier">i</span><span class="special">(</span><span class="number">0</span><span class="special">);</span>
<span class="identifier">vec</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="identifier">i</span><span class="special">);</span>
@@ -119,7 +188,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 © 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/notes.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/notes.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/notes.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,20 @@
<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>Notes</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="up" href="../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="previous" href="functional/generation/metafunctions/mk_unfused.html" title="
make_unfused">
<link rel="next" href="change_log.html" title="Change log">
@@ -23,6 +32,7 @@
<div class="spirit-nav">
<a accesskey="p" href="functional/generation/metafunctions/mk_unfused.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="change_log.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h2 class="title" style="clear: both">
@@ -33,6 +43,15 @@
<a name="fusion.notes.recursive_inlined_functions"></a><h3>
<a name="id633847"></a>
<a href="notes.html#fusion.notes.recursive_inlined_functions">Recursive Inlined
+=======
+<div class="section" title="Notes">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.notes"></a><a class="link" href="notes.html" title="Notes">Notes</a>
+</h2></div></div></div>
+<a name="fusion.notes.recursive_inlined_functions"></a><h4>
+<a name="id850093"></a>
+ <a class="link" href="notes.html#fusion.notes.recursive_inlined_functions">Recursive Inlined
+>>>>>>> .merge-right.r57125
Functions</a>
</h3>
<p>
@@ -44,20 +63,34 @@
deeply recursive (up to a certain compiler limit of course). Compile time complexity
remains linear.
</p>
+<<<<<<< .working
<a name="fusion.notes.overloaded_functions"></a><h3>
<a name="id633922"></a>
<a href="notes.html#fusion.notes.overloaded_functions">Overloaded Functions</a>
</h3>
+=======
+<a name="fusion.notes.overloaded_functions"></a><h4>
+<a name="id850133"></a>
+ <a class="link" href="notes.html#fusion.notes.overloaded_functions">Overloaded Functions</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Associative sequences use function overloading to implement membership testing
and type associated key lookup. This amounts to constant runtime and amortized
constant compile time complexities. There is an overloaded function, <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">k</span><span class="special">)</span></tt>, for each key <span class="emphasis"><em>type</em></span> <tt class="computeroutput"><span class="identifier">k</span></tt>. The compiler chooses the appropriate function
given a key, <tt class="computeroutput"><span class="identifier">k</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.notes.tag_dispatching"></a><h3>
<a name="id634005"></a>
<a href="notes.html#fusion.notes.tag_dispatching">Tag Dispatching</a>
</h3>
+=======
+<a name="fusion.notes.tag_dispatching"></a><h4>
+<a name="id850186"></a>
+ <a class="link" href="notes.html#fusion.notes.tag_dispatching">Tag Dispatching</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Tag dispatching is a generic programming technique for selecting template specializations.
There are typically 3 components involved in the tag dispatching mechanism:
@@ -105,10 +138,17 @@
to provide an implementation for each tag type
</li>
</ol></div>
+<<<<<<< .working
<a name="fusion.notes.extensibility"></a><h3>
<a name="id634386"></a>
<a href="notes.html#fusion.notes.extensibility">Extensibility</a>
</h3>
+=======
+<a name="fusion.notes.extensibility"></a><h4>
+<a name="id850454"></a>
+ <a class="link" href="notes.html#fusion.notes.extensibility">Extensibility</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Unlike MPL, there
is no extensibe sequence concept in fusion. This does not mean that Fusion
@@ -140,10 +180,17 @@
holds a reference to the original sequence plus the appended data --making
it very cheap to pass around.
</p>
+<<<<<<< .working
<a name="fusion.notes.element_conversion"></a><h3>
<a name="id634704"></a>
<a href="notes.html#fusion.notes.element_conversion">Element Conversion</a>
</h3>
+=======
+<a name="fusion.notes.element_conversion"></a><h4>
+<a name="id850636"></a>
+ <a class="link" href="notes.html#fusion.notes.element_conversion">Element Conversion</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Functions that take in elemental values to form sequences (e.g. make_list) convert their arguments
to something suitable to be stored as a sequence element. In general, the element
@@ -163,7 +210,31 @@
</p>
<p>
Array arguments are deduced to reference to const types. For example
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<sup>[<a name="id634862" href="#ftn.id634862">10</a>]</sup>
+=======
+ <sup>[<a name="id886385" href="#ftn.id886385" class="footnote">10</a>]</sup>
+=======
+ <sup>[<a name="id851663" href="#ftn.id851663" class="footnote">10</a>]</sup>
+=======
+ <sup>[<a name="id844039" href="#ftn.id844039" class="footnote">10</a>]</sup>
+=======
+ <sup>[<a name="id866857" href="#ftn.id866857" class="footnote">10</a>]</sup>
+=======
+ <sup>[<a name="id854017" href="#ftn.id854017" class="footnote">10</a>]</sup>
+=======
+ <sup>[<a name="id850741" href="#ftn.id850741" class="footnote">10</a>]</sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
:
</p>
<pre class="programlisting">make_list<span class="special">(</span><span class="string">"Donald"</span><span class="special">,</span> <span class="string">"Daisy"</span><span class="special">)</span>
@@ -191,10 +262,17 @@
</p>
<pre class="programlisting">list<span class="special"><</span><span class="keyword">void</span> <span class="special">(*)(</span><span class="keyword">int</span><span class="special">)></span>
</pre>
+<<<<<<< .working
<a name="fusion.notes.boost__ref"></a><h3>
<a name="id635292"></a>
<a href="notes.html#fusion.notes.boost__ref">boost::ref</a>
</h3>
+=======
+<a name="fusion.notes.boost__ref"></a><h4>
+<a name="id851027"></a>
+ <a class="link" href="notes.html#fusion.notes.boost__ref">boost::ref</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Fusion's generation functions (e.g. make_list) by default stores the element
types as plain non-reference types. Example:
@@ -232,7 +310,31 @@
</p>
<div class="footnotes">
<br><hr width="100" align="left">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<div class="footnote"><p><sup>[<a name="ftn.id634862" href="#id634862">10</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id886385" href="#id886385" class="para">10</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id851663" href="#id851663" class="para">10</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id844039" href="#id844039" class="para">10</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id866857" href="#id866857" class="para">10</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id854017" href="#id854017" class="para">10</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id850741" href="#id850741" class="para">10</a>] </sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
Note that the type of a string literal is an array of const characters,
not <tt class="computeroutput"><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span></tt>. To get make_list to create a list with an element of a non-const
array type one must use the <tt class="computeroutput"><span class="identifier">ref</span></tt>
@@ -242,7 +344,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 © 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/organization.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/organization.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/organization.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,20 @@
<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>Organization</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="up" href="../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="previous" href="quick_start.html" title="Quick Start">
<link rel="next" href="support.html" title="Support">
</head>
@@ -37,10 +46,17 @@
<p>
The library is organized in three layers:
</p>
+<<<<<<< .working
<a name="fusion.organization.layers"></a><h3>
<a name="id411703"></a>
<a href="organization.html#fusion.organization.layers">Layers</a>
</h3>
+=======
+<a name="fusion.organization.layers"></a><h4>
+<a name="id618936"></a>
+ <a class="link" href="organization.html#fusion.organization.layers">Layers</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<div class="blockquote"><blockquote class="blockquote">
<p>
</p>
@@ -68,12 +84,21 @@
The library is header-only. There is no need to build object files to link
against.
</p>
+<<<<<<< .working
<a name="fusion.organization.directory"></a><h3>
<a name="id411798"></a>
<a href="organization.html#fusion.organization.directory">Directory</a>
</h3>
<div class="itemizedlist"><ul type="disc">
<li>
+=======
+<a name="fusion.organization.directory"></a><h4>
+<a name="id619006"></a>
+ <a class="link" href="organization.html#fusion.organization.directory">Directory</a>
+ </h4>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+>>>>>>> .merge-right.r57125
tuple
</li>
<li>
@@ -189,10 +214,17 @@
support
</li>
</ul></div>
+<<<<<<< .working
<a name="fusion.organization.example"></a><h3>
<a name="id411987"></a>
<a href="organization.html#fusion.organization.example">Example</a>
</h3>
+=======
+<a name="fusion.organization.example"></a><h4>
+<a name="id619167"></a>
+ <a class="link" href="organization.html#fusion.organization.example">Example</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
If, for example, you want to use <tt class="computeroutput"><span class="identifier">list</span></tt>,
depending on the granularity that you desire, you may do so by including one
@@ -204,13 +236,42 @@
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<p>
+<<<<<<< .working
The first includes all containers The second includes only <tt class="computeroutput"><span class="identifier">list</span></tt>
<sup>[<a name="id412252" href="#ftn.id412252">4</a>]</sup>
+=======
+ The first includes all containers The second includes only <code class="computeroutput"><span class="identifier">list</span></code>
+ <sup>[<a name="id619376" href="#ftn.id619376" class="footnote">4</a>]</sup>
+>>>>>>> .merge-right.r57125
.
</p>
<div class="footnotes">
<br><hr width="100" align="left">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<div class="footnote"><p><sup>[<a name="ftn.id412252" href="#id412252">4</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id665290" href="#id665290" class="para">4</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id619857" href="#id619857" class="para">4</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id612211" href="#id612211" class="para">4</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id635152" href="#id635152" class="para">4</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id622653" href="#id622653" class="para">4</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id619376" href="#id619376" class="para">4</a>] </sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
Modules may contain smaller components. Header file information for each
component will be provided as part of the component's documentation.
</p></div>
@@ -218,7 +279,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 © 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/preface.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/preface.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/preface.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,12 +1,22 @@
<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>Preface</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="up" href="../index.html" title="Chapter 1. Fusion 2.0">
<link rel="previous" href="../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<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="prev" href="../index.html" title="Chapter 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="next" href="introduction.html" title="Introduction">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -47,10 +57,17 @@
<p>
</p>
</blockquote></div>
+<<<<<<< .working
<a name="fusion.preface.description"></a><h3>
<a name="id355262"></a>
<a href="preface.html#fusion.preface.description">Description</a>
</h3>
+=======
+<a name="fusion.preface.description"></a><h4>
+<a name="id614034"></a>
+ <a class="link" href="preface.html#fusion.preface.description">Description</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Fusion is a library for working with heterogenous collections of data, commonly
referred to as tuples. A set of containers (vector, list, set and map) is provided,
@@ -65,10 +82,17 @@
It is named "fusion" because the library is a "fusion"
of compile time metaprogramming with runtime programming.
</p>
+<<<<<<< .working
<a name="fusion.preface.motivation"></a><h3>
<a name="id398013"></a>
<a href="preface.html#fusion.preface.motivation">Motivation</a>
</h3>
+=======
+<a name="fusion.preface.motivation"></a><h4>
+<a name="id614064"></a>
+ <a class="link" href="preface.html#fusion.preface.motivation">Motivation</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Tuples are powerful beasts. After having developed two significant projects
(Spirit and Phoenix)
@@ -91,17 +115,49 @@
had an adhoc collection of tuple manipulation and traversal routines. It was
an instant <span class="emphasis"><em>AHA!</em></span> moment.
</p>
+<<<<<<< .working
<a name="fusion.preface.how_to_use_this_manual"></a><h3>
<a name="id353771"></a>
<a href="preface.html#fusion.preface.how_to_use_this_manual">How to use this manual</a>
</h3>
+=======
+<a name="fusion.preface.how_to_use_this_manual"></a><h4>
+<a name="id614131"></a>
+ <a class="link" href="preface.html#fusion.preface.how_to_use_this_manual">How to use this manual</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Some icons are used to mark certain topics indicative of their relevance. These
icons precede some text to indicate:
</p>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id353790"></a><p class="title"><b>Table 1.1. Icons</b></p>
<table class="table" summary="Icons">
+=======
+<a name="id657754"></a><p class="title"><b>Table 1.1. Icons</b></p>
+=======
+<a name="id613514"></a><p class="title"><b>Table 1.1. Icons</b></p>
+=======
+<a name="id605868"></a><p class="title"><b>Table 1.1. Icons</b></p>
+=======
+<a name="id628823"></a><p class="title"><b>Table 1.1. Icons</b></p>
+=======
+<a name="id617421"></a><p class="title"><b>Table 1.1. Icons</b></p>
+=======
+<a name="id614144"></a><p class="title"><b>Table 1.1. Icons</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="Icons">
+>>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
@@ -172,10 +228,17 @@
tool. QuickBook can be found in the <a href="http://www.boost.org/tools/index.html" target="_top">Boost
Tools</a>.
</p>
+<<<<<<< .working
<a name="fusion.preface.support"></a><h3>
<a name="id355560"></a>
<a href="preface.html#fusion.preface.support">Support</a>
</h3>
+=======
+<a name="fusion.preface.support"></a><h4>
+<a name="id614348"></a>
+ <a class="link" href="preface.html#fusion.preface.support">Support</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Please direct all questions to Spirit's mailing list. You can subscribe to
the <a href="https://lists.sourceforge.net/lists/listinfo/spirit-general" target="_top">Spirit
@@ -189,7 +252,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 © 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/quick_start.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/quick_start.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/quick_start.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,20 @@
<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>Quick Start</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="up" href="../index.html" title="Chapter 1. Fusion 2.0">
+=======
+<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="previous" href="introduction.html" title="Introduction">
<link rel="next" href="organization.html" title="Organization">
</head>
@@ -36,16 +45,26 @@
is more or less a synonym for fusion's <tt class="computeroutput">vector</tt>.
</p>
<p>
+<<<<<<< .working
For starters, we shall include all of Fusion's Sequence(s)
<sup>[<a name="id409214" href="#ftn.id409214">2</a>]</sup>
+=======
+ For starters, we shall include all of Fusion's <a class="link" href="sequence.html" title="Sequence">Sequence</a>(s)
+ <sup>[<a name="id614839" href="#ftn.id614839" class="footnote">2</a>]</sup>
+>>>>>>> .merge-right.r57125
:
</p>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<p>
+<<<<<<< .working
Let's begin with a <tt class="computeroutput">vector</tt>
<sup>[<a name="id409361" href="#ftn.id409361">3</a>]</sup>
+=======
+ Let's begin with a <code class="computeroutput"><a class="link" href="container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a></code>
+ <sup>[<a name="id614954" href="#ftn.id614954" class="footnote">3</a>]</sup>
+>>>>>>> .merge-right.r57125
:
</p>
<pre class="programlisting">vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">></span> <span class="identifier">stuff</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="string">"howdy"</span><span class="special">);</span>
@@ -61,9 +80,15 @@
there. You can do a lot more with Fusion <tt class="computeroutput">vector</tt> or <tt class="computeroutput"><span class="identifier">tuple</span></tt>.
Let's see some examples.
</p>
+<<<<<<< .working
<a name="fusion.quick_start.print_the_vector_as_xml"></a><h3>
<a name="id409777"></a>
<a href="quick_start.html#fusion.quick_start.print_the_vector_as_xml">Print the vector
+=======
+<a name="fusion.quick_start.print_the_vector_as_xml"></a><h4>
+<a name="id615270"></a>
+ <a class="link" href="quick_start.html#fusion.quick_start.print_the_vector_as_xml">Print the vector
+>>>>>>> .merge-right.r57125
as XML</a>
</h3>
<p>
@@ -116,10 +141,17 @@
<tt class="computeroutput"><span class="identifier">print_xml</span></tt>, you can use it to
print just about any Fusion Sequence.
</p>
+<<<<<<< .working
<a name="fusion.quick_start.print_only_pointers"></a><h3>
<a name="id410372"></a>
<a href="quick_start.html#fusion.quick_start.print_only_pointers">Print only pointers</a>
</h3>
+=======
+<a name="fusion.quick_start.print_only_pointers"></a><h4>
+<a name="id617917"></a>
+ <a class="link" href="quick_start.html#fusion.quick_start.print_only_pointers">Print only pointers</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Let's get a little cleverer. Say we wish to write a <span class="emphasis"><em>generic</em></span>
function that takes in an arbitrary sequence and XML prints only those elements
@@ -148,10 +180,17 @@
<p>
Easy, right?
</p>
+<<<<<<< .working
<a name="fusion.quick_start.associative_tuples"></a><h3>
<a name="id410736"></a>
<a href="quick_start.html#fusion.quick_start.associative_tuples">Associative tuples</a>
</h3>
+=======
+<a name="fusion.quick_start.associative_tuples"></a><h4>
+<a name="id618190"></a>
+ <a class="link" href="quick_start.html#fusion.quick_start.associative_tuples">Associative tuples</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
Ok, moving on...
</p>
@@ -220,10 +259,17 @@
regardless if it is a <tt class="computeroutput"><span class="identifier">person</span></tt>,
a <tt class="computeroutput"><span class="identifier">dog</span></tt> or a whole <tt class="computeroutput"><span class="identifier">alternate_universe</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.quick_start.tip_of_the_iceberg"></a><h3>
<a name="id411650"></a>
<a href="quick_start.html#fusion.quick_start.tip_of_the_iceberg">Tip of the Iceberg</a>
</h3>
+=======
+<a name="fusion.quick_start.tip_of_the_iceberg"></a><h4>
+<a name="id618901"></a>
+ <a class="link" href="quick_start.html#fusion.quick_start.tip_of_the_iceberg">Tip of the Iceberg</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<p>
And... we've barely scratched the surface! You can compose and expand the data
structures, remove elements from the structures, find specific data types,
@@ -232,21 +278,71 @@
</p>
<div class="footnotes">
<br><hr width="100" align="left">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<div class="footnote"><p><sup>[<a name="ftn.id409214" href="#id409214">2</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id658449" href="#id658449" class="para">2</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id614209" href="#id614209" class="para">2</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id606563" href="#id606563" class="para">2</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id629518" href="#id629518" class="para">2</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id618116" href="#id618116" class="para">2</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id614839" href="#id614839" class="para">2</a>] </sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
There are finer grained header files available if you wish to have more
control over which components to include (see section Orgainization
for details).
</p></div>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<div class="footnote"><p><sup>[<a name="ftn.id409361" href="#id409361">3</a>] </sup>
Unless otherwise noted, components are in namespace <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span></tt>.
For the sake of simplicity, code in this quick start implies <tt class="computeroutput"><span class="keyword">using</span></tt> directives for the fusion components
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id658564" href="#id658564" class="para">3</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id614324" href="#id614324" class="para">3</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id606678" href="#id606678" class="para">3</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id629633" href="#id629633" class="para">3</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id618231" href="#id618231" class="para">3</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id614954" href="#id614954" class="para">3</a>] </sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ Unless otherwise noted, components are in namespace <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span></code>.
+ For the sake of simplicity, code in this quick start implies <code class="computeroutput"><span class="keyword">using</span></code> directives for the fusion components
+>>>>>>> .merge-right.r57125
we will be using.
</p></div>
</div>
</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 © 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/references.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/references.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/references.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>References</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="acknowledgements.html" title="Acknowledgements">
Modified: branches/release/libs/fusion/doc/html/fusion/sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -3,10 +3,18 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>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="../index.html" title="Chapter 1. Fusion 2.0">
+<<<<<<< .working
<link rel="previous" href="iterator/metafunctions/advance_c.html" title="advance_c">
+=======
+<link rel="prev" href="iterator/metafunctions/deref_data.html" title="deref_data">
+>>>>>>> .merge-right.r57242
<link rel="next" href="sequence/concepts.html" title="Concepts">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +28,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="iterator/metafunctions/advance_c.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="sequence/concepts.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="iterator/metafunctions/deref_data.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="sequence/concepts.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" lang="en">
<div class="titlepage">
@@ -62,10 +70,17 @@
Sequence have an associated Iterator
type that can be used to iterate through the Sequence's elements.
</p>
+<<<<<<< .working
<a name="fusion.sequence.header"></a><h3>
<a name="id442034"></a>
<a href="sequence.html#fusion.sequence.header">Header</a>
</h3>
+=======
+<a name="fusion.sequence.header"></a><h4>
+<a name="id645131"></a>
+ <a class="link" href="sequence.html#fusion.sequence.header">Header</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
@@ -81,7 +96,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="iterator/metafunctions/advance_c.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="sequence/concepts.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="iterator/metafunctions/deref_data.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.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="sequence/concepts.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/concepts.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/concepts.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/concepts.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>Concepts</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="../sequence.html" title="Sequence">
<link rel="previous" href="../sequence.html" title="Sequence">
@@ -43,10 +47,17 @@
<p>
Fusion Sequences are organized into a hierarchy of concepts.
</p>
+<<<<<<< .working
<a name="fusion.sequence.concepts.traversal"></a><h4>
<a name="id442201"></a>
<a href="concepts.html#fusion.sequence.concepts.traversal">Traversal</a>
</h4>
+=======
+<a name="fusion.sequence.concepts.traversal"></a><h5>
+<a name="id645245"></a>
+ <a class="link" href="concepts.html#fusion.sequence.concepts.traversal">Traversal</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Fusion's sequence traversal related concepts parallel Fusion's <a href="../iterator/concepts.html" title="Concepts">Iterator
Concepts</a>. <a href="concepts/forward_sequence.html" title="Forward
@@ -61,10 +72,17 @@
Sequence">Bidirectional
Sequence</a>. These concepts pertain to sequence traversal.
</p>
+<<<<<<< .working
<a name="fusion.sequence.concepts.associativity"></a><h4>
<a name="id442286"></a>
<a href="concepts.html#fusion.sequence.concepts.associativity">Associativity</a>
</h4>
+=======
+<a name="fusion.sequence.concepts.associativity"></a><h5>
+<a name="id645291"></a>
+ <a class="link" href="concepts.html#fusion.sequence.concepts.associativity">Associativity</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
The <a href="concepts/associative_sequence.html" title="Associative
Sequence">Associative
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/concepts/associative_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/concepts/associative_sequence.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/concepts/associative_sequence.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title>Associative
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="../concepts.html" title="Concepts">
<link rel="previous" href="random_access_sequence.html" title="Random
@@ -30,6 +34,7 @@
<a name="fusion.sequence.concepts.associative_sequence"></a><a href="associative_sequence.html" title="Associative
Sequence">Associative
Sequence</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -37,17 +42,19 @@
<a name="id447542"></a>
<a href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.sequence.concepts.associative_sequence.description"></a><h6>
+<a name="id651268"></a>
+ <a class="link" href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
An Associative Sequence allows efficient retrieval of elements based on
keys. Like associative sequences in MPL,
and unlike associative containers in STL,
Fusion associative sequences have no implied ordering relation. Instead,
- type identity is used to impose an equivalence relation on keys, and the
- order in which sequence elements are traversed during iteration is left
- unspecified. In addition, unlike STL,
- Associative Sequences have mutable iterators. This is due to the fact that
- there is no associated ordering relation and the runtime value of the keys
- themselves do not have any effect on the associativity of the sequence.
+ type identity is used to impose an equivalence relation on keys.
</p>
<div class="variablelist">
<p class="title"><b>Notation</b></p>
@@ -74,9 +81,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.associative_sequence.valid_expressions"></a><h5>
<a name="id447735"></a>
<a href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.valid_expressions">Valid
+=======
+<a name="fusion.sequence.concepts.associative_sequence.valid_expressions"></a><h6>
+<a name="id651402"></a>
+ <a class="link" href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.valid_expressions">Valid
+>>>>>>> .merge-right.r57125
Expressions</a>
</h5>
<p>
@@ -151,9 +164,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.associative_sequence.result_type_expressions"></a><h5>
<a name="id448116"></a>
<a href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.result_type_expressions">Result
+=======
+<a name="fusion.sequence.concepts.associative_sequence.result_type_expressions"></a><h6>
+<a name="id651688"></a>
+ <a class="link" href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.result_type_expressions">Result
+>>>>>>> .merge-right.r57125
Type Expressions</a>
</h5>
<div class="informaltable"><table class="table">
@@ -205,11 +224,20 @@
most cases, this is a reference. Hence, there is no way to know the exact
element type using <tt class="computeroutput">result_of::at_key<span class="special"><</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">K</span><span class="special">></span></tt>.The element at <tt class="computeroutput"><span class="identifier">K</span></tt>
may actually be a reference to begin with. For this purpose, you can use
+<<<<<<< .working
<tt class="computeroutput">result_of::value_at_key<span class="special"><</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">></span></tt>.
</p></div>
<a name="fusion.sequence.concepts.associative_sequence.expression_semantics"></a><h5>
<a name="id448687"></a>
<a href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.expression_semantics">Expression
+=======
+ <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/value_at_key.html" title="value_at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_key</span></code></a><span class="special"><</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">></span></code>.
+ </p>
+</div>
+<a name="fusion.sequence.concepts.associative_sequence.expression_semantics"></a><h6>
+<a name="id652092"></a>
+ <a class="link" href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<div class="informaltable"><table class="table">
@@ -250,6 +278,7 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.associative_sequence.models"></a><h5>
<a name="id449008"></a>
<a href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.models">Models</a>
@@ -257,6 +286,15 @@
<div class="itemizedlist"><ul type="disc">
<li>set</li>
<li>map</li>
+=======
+<a name="fusion.sequence.concepts.associative_sequence.models"></a><h6>
+<a name="id652312"></a>
+ <a class="link" href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../../container/set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a></li>
+<li class="listitem"><a class="link" href="../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a></li>
+>>>>>>> .merge-right.r57125
</ul></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/concepts/bidirectional_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/concepts/bidirectional_sequence.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/concepts/bidirectional_sequence.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title>Bidirectional
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="../concepts.html" title="Concepts">
<link rel="previous" href="forward_sequence.html" title="Forward
@@ -31,6 +35,7 @@
<a name="fusion.sequence.concepts.bidirectional_sequence"></a><a href="bidirectional_sequence.html" title="Bidirectional
Sequence">Bidirectional
Sequence</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -38,6 +43,13 @@
<a name="id444601"></a>
<a href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.sequence.concepts.bidirectional_sequence.description"></a><h6>
+<a name="id646988"></a>
+ <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
A Bidirectional Sequence is a <a href="forward_sequence.html" title="Forward
Sequence">Forward
@@ -45,9 +57,15 @@
Iterator">Bidirectional
Iterator</a>.
</p>
+<<<<<<< .working
<a name="fusion.sequence.concepts.bidirectional_sequence.refinement_of"></a><h5>
<a name="id444649"></a>
<a href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.refinement_of">Refinement
+=======
+<a name="fusion.sequence.concepts.bidirectional_sequence.refinement_of"></a><h6>
+<a name="id647019"></a>
+ <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.refinement_of">Refinement
+>>>>>>> .merge-right.r57125
of</a>
</h5>
<p>
@@ -75,9 +93,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.bidirectional_sequence.valid_expressions"></a><h5>
<a name="id444786"></a>
<a href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.valid_expressions">Valid
+=======
+<a name="fusion.sequence.concepts.bidirectional_sequence.valid_expressions"></a><h6>
+<a name="id647122"></a>
+ <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.valid_expressions">Valid
+>>>>>>> .merge-right.r57125
Expressions</a>
</h5>
<p>
@@ -170,9 +194,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.bidirectional_sequence.result_type_expressions"></a><h5>
<a name="id445223"></a>
<a href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.result_type_expressions">Result
+=======
+<a name="fusion.sequence.concepts.bidirectional_sequence.result_type_expressions"></a><h6>
+<a name="id647446"></a>
+ <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.result_type_expressions">Result
+>>>>>>> .merge-right.r57125
Type Expressions</a>
</h5>
<div class="informaltable"><table class="table">
@@ -215,9 +245,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.bidirectional_sequence.expression_semantics"></a><h5>
<a name="id445497"></a>
<a href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.expression_semantics">Expression
+=======
+<a name="fusion.sequence.concepts.bidirectional_sequence.expression_semantics"></a><h6>
+<a name="id647649"></a>
+ <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<p>
@@ -248,6 +284,7 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.bidirectional_sequence.models"></a><h5>
<a name="id445649"></a>
<a href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.models">Models</a>
@@ -259,6 +296,19 @@
<li>reverse_view</li>
<li>
<a href="../../view/iterator_range.html" title="iterator_range"><tt class="computeroutput"><span class="identifier">iterator_range</span></tt></a>
+=======
+<a name="fusion.sequence.concepts.bidirectional_sequence.models"></a><h6>
+<a name="id647755"></a>
+ <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../../adapted/std__pair.html" title="std::pair"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a></li>
+<li class="listitem"><a class="link" href="../../adapted/boost__array.html" title="boost::array"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code></a></li>
+<li class="listitem"><a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a></li>
+<li class="listitem"><a class="link" href="../../view/reverse_view.html" title="reverse_view"><code class="computeroutput"><span class="identifier">reverse_view</span></code></a></li>
+<li class="listitem">
+<a class="link" href="../../view/iterator_range.html" title="iterator_range"><code class="computeroutput"><span class="identifier">iterator_range</span></code></a>
+>>>>>>> .merge-right.r57125
(where adapted sequence is a Bidirectional Sequence)
</li>
<li>
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/concepts/forward_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/concepts/forward_sequence.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/concepts/forward_sequence.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title>Forward
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="../concepts.html" title="Concepts">
<link rel="previous" href="../concepts.html" title="Concepts">
@@ -30,6 +34,7 @@
<a name="fusion.sequence.concepts.forward_sequence"></a><a href="forward_sequence.html" title="Forward
Sequence">Forward
Sequence</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -37,6 +42,13 @@
<a name="id442346"></a>
<a href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.sequence.concepts.forward_sequence.description"></a><h6>
+<a name="id645322"></a>
+ <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
A Forward Sequence is a Sequence whose elements are arranged in a definite
order. The ordering is guaranteed not to change from iteration to iteration.
@@ -65,9 +77,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.forward_sequence.valid_expressions"></a><h5>
<a name="id442473"></a>
<a href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.valid_expressions">Valid
+=======
+<a name="fusion.sequence.concepts.forward_sequence.valid_expressions"></a><h6>
+<a name="id645420"></a>
+ <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.valid_expressions">Valid
+>>>>>>> .merge-right.r57125
Expressions</a>
</h5>
<p>
@@ -186,9 +204,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.forward_sequence.result_type_expressions"></a><h5>
<a name="id443053"></a>
<a href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.result_type_expressions">Result
+=======
+<a name="fusion.sequence.concepts.forward_sequence.result_type_expressions"></a><h6>
+<a name="id645924"></a>
+ <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.result_type_expressions">Result
+>>>>>>> .merge-right.r57125
Type Expressions</a>
</h5>
<div class="informaltable"><table class="table">
@@ -247,9 +271,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.forward_sequence.expression_semantics"></a><h5>
<a name="id443468"></a>
<a href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.expression_semantics">Expression
+=======
+<a name="fusion.sequence.concepts.forward_sequence.expression_semantics"></a><h6>
+<a name="id646230"></a>
+ <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<div class="informaltable"><table class="table">
@@ -311,10 +341,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.forward_sequence.invariants"></a><h5>
<a name="id443935"></a>
<a href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.invariants">Invariants</a>
</h5>
+=======
+<a name="fusion.sequence.concepts.forward_sequence.invariants"></a><h6>
+<a name="id646558"></a>
+ <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.invariants">Invariants</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
For any Forward Sequence s the following invariants always hold:
</p>
@@ -337,6 +374,7 @@
will access its elements in the same order.
</li>
</ul></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.forward_sequence.models"></a><h5>
<a name="id444246"></a>
<a href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.models">Models</a>
@@ -356,6 +394,27 @@
<li>transform_view</li>
<li>reverse_view</li>
<li>zip_view</li>
+=======
+<a name="fusion.sequence.concepts.forward_sequence.models"></a><h6>
+<a name="id646759"></a>
+ <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../../adapted/std__pair.html" title="std::pair"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a></li>
+<li class="listitem"><a class="link" href="../../adapted/boost__array.html" title="boost::array"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code></a></li>
+<li class="listitem"><a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a></li>
+<li class="listitem"><a class="link" href="../../container/cons.html" title="cons"><code class="computeroutput"><span class="identifier">cons</span></code></a></li>
+<li class="listitem"><a class="link" href="../../container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a></li>
+<li class="listitem"><a class="link" href="../../container/set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a></li>
+<li class="listitem"><a class="link" href="../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a></li>
+<li class="listitem"><a class="link" href="../../view/single_view.html" title="single_view"><code class="computeroutput"><span class="identifier">single_view</span></code></a></li>
+<li class="listitem"><a class="link" href="../../view/filter_view.html" title="filter_view"><code class="computeroutput"><span class="identifier">filter_view</span></code></a></li>
+<li class="listitem"><a class="link" href="../../view/iterator_range.html" title="iterator_range"><code class="computeroutput"><span class="identifier">iterator_range</span></code></a></li>
+<li class="listitem"><a class="link" href="../../view/joint_view.html" title="joint_view"><code class="computeroutput"><span class="identifier">joint_view</span></code></a></li>
+<li class="listitem"><a class="link" href="../../view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a></li>
+<li class="listitem"><a class="link" href="../../view/reverse_view.html" title="reverse_view"><code class="computeroutput"><span class="identifier">reverse_view</span></code></a></li>
+<li class="listitem"><a class="link" href="../../view/zip_view.html" title="zip_view"><code class="computeroutput"><span class="identifier">zip_view</span></code></a></li>
+>>>>>>> .merge-right.r57125
</ul></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/concepts/random_access_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/concepts/random_access_sequence.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/concepts/random_access_sequence.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title>Random
Access 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="../concepts.html" title="Concepts">
<link rel="previous" href="bidirectional_sequence.html" title="Bidirectional
@@ -31,6 +35,7 @@
<a name="fusion.sequence.concepts.random_access_sequence"></a><a href="random_access_sequence.html" title="Random
Access Sequence">Random
Access Sequence</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -38,6 +43,13 @@
<a name="id445865"></a>
<a href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.sequence.concepts.random_access_sequence.description"></a><h6>
+<a name="id650077"></a>
+ <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
A Random Access Sequence is a <a href="bidirectional_sequence.html" title="Bidirectional
Sequence">Bidirectional
@@ -46,9 +58,15 @@
Access Iterator</a>. It guarantees constant time access to arbitrary
sequence elements.
</p>
+<<<<<<< .working
<a name="fusion.sequence.concepts.random_access_sequence.refinement_of"></a><h5>
<a name="id445915"></a>
<a href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.refinement_of">Refinement
+=======
+<a name="fusion.sequence.concepts.random_access_sequence.refinement_of"></a><h6>
+<a name="id650108"></a>
+ <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.refinement_of">Refinement
+>>>>>>> .merge-right.r57125
of</a>
</h5>
<p>
@@ -82,9 +100,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.random_access_sequence.valid_expressions"></a><h5>
<a name="id446083"></a>
<a href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.valid_expressions">Valid
+=======
+<a name="fusion.sequence.concepts.random_access_sequence.valid_expressions"></a><h6>
+<a name="id650235"></a>
+ <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.valid_expressions">Valid
+>>>>>>> .merge-right.r57125
Expressions</a>
</h5>
<p>
@@ -177,9 +201,15 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.random_access_sequence.result_type_expressions"></a><h5>
<a name="id446539"></a>
<a href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.result_type_expressions">Result
+=======
+<a name="fusion.sequence.concepts.random_access_sequence.result_type_expressions"></a><h6>
+<a name="id650574"></a>
+ <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.result_type_expressions">Result
+>>>>>>> .merge-right.r57125
Type Expressions</a>
</h5>
<div class="informaltable"><table class="table">
@@ -238,11 +268,20 @@
most cases, this is a reference. Hence, there is no way to know the exact
element type using <tt class="computeroutput">result_of::at<span class="special"><</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">></span></tt>.The element at <tt class="computeroutput"><span class="identifier">N</span></tt>
may actually be a reference to begin with. For this purpose, you can use
+<<<<<<< .working
<tt class="computeroutput">result_of::value_at<span class="special"><</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">></span></tt>.
</p></div>
<a name="fusion.sequence.concepts.random_access_sequence.expression_semantics"></a><h5>
<a name="id447167"></a>
<a href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.expression_semantics">Expression
+=======
+ <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/value_at.html" title="value_at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at</span></code></a><span class="special"><</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">></span></code>.
+ </p>
+</div>
+<a name="fusion.sequence.concepts.random_access_sequence.expression_semantics"></a><h6>
+<a name="id651020"></a>
+ <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h5>
<p>
@@ -273,6 +312,7 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.sequence.concepts.random_access_sequence.models"></a><h5>
<a name="id447327"></a>
<a href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.models">Models</a>
@@ -284,6 +324,19 @@
<li>reverse_view</li>
<li>
<a href="../../view/iterator_range.html" title="iterator_range"><tt class="computeroutput"><span class="identifier">iterator_range</span></tt></a>
+=======
+<a name="fusion.sequence.concepts.random_access_sequence.models"></a><h6>
+<a name="id651132"></a>
+ <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.models">Models</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../../adapted/std__pair.html" title="std::pair"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a></li>
+<li class="listitem"><a class="link" href="../../adapted/boost__array.html" title="boost::array"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code></a></li>
+<li class="listitem"><a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a></li>
+<li class="listitem"><a class="link" href="../../view/reverse_view.html" title="reverse_view"><code class="computeroutput"><span class="identifier">reverse_view</span></code></a></li>
+<li class="listitem">
+<a class="link" href="../../view/iterator_range.html" title="iterator_range"><code class="computeroutput"><span class="identifier">iterator_range</span></code></a>
+>>>>>>> .merge-right.r57125
(where adapted sequence is a Random Access Sequence)
</li>
<li>
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic.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>Intrinsic</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../sequence.html" title="Sequence">
<link rel="previous" href="concepts/associative_sequence.html" title="Associative
Sequence">
@@ -38,22 +46,60 @@
Intrinsic form the essential interface of every Fusion Sequence.
<a href="http://en.wikipedia.org/wiki/Standard_Template_Library" target="_top">STL</a>
counterparts of these functions are usually implemented as member functions.
+<<<<<<< .working
Intrinsic functions, unlike Algorithms,
are not generic across the full Sequence
repertoire. They need to be implemented for each Fusion Sequence
<sup>[<a name="id449132" href="#ftn.id449132">5</a>]</sup>
+=======
+ Intrinsic functions, unlike <a class="link" href="../algorithm.html" title="Algorithm">Algorithms</a>,
+ are not generic across the full <a class="link" href="../sequence.html" title="Sequence">Sequence</a>
+ repertoire. They need to be implemented for each Fusion <a class="link" href="../sequence.html" title="Sequence">Sequence</a>
+ <sup>[<a name="id660256" href="#ftn.id660256" class="footnote">5</a>]</sup>
+>>>>>>> .merge-right.r57125
.
</p>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.header"></a><h4>
<a name="id449150"></a>
<a href="intrinsic.html#fusion.sequence.intrinsic.header">Header</a>
</h4>
+=======
+<a name="fusion.sequence.intrinsic.header"></a><h5>
+<a name="id660268"></a>
+ <a class="link" href="intrinsic.html#fusion.sequence.intrinsic.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<div class="footnotes">
<br><hr width="100" align="left">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<div class="footnote"><p><sup>[<a name="ftn.id449132" href="#id449132">5</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id700405" href="#id700405" class="para">5</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id660036" href="#id660036" class="para">5</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id652390" href="#id652390" class="para">5</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id674871" href="#id674871" class="para">5</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id663532" href="#id663532" class="para">5</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id660256" href="#id660256" class="para">5</a>] </sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
In practice, many of intrinsic functions have default implementations
that will work in majority of cases
</p></div>
@@ -61,7 +107,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 © 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/sequence/intrinsic/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/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="../intrinsic.html" title="Intrinsic">
<link rel="previous" href="../intrinsic.html" title="Intrinsic">
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at.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>at</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="size.html" title="size">
<link rel="next" href="at_c.html" title="at_c">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.at.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id454767"></a>
<a href="at.html#fusion.sequence.intrinsic.functions.at.description">Description</a>
+=======
+<a name="id705408"></a>
+=======
+<a name="id667405"></a>
+=======
+<a name="id659759"></a>
+=======
+<a name="id679987"></a>
+=======
+<a name="id669280"></a>
+=======
+<a name="id666003"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the N-th element from the beginning of the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.at.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id454796"></a>
<a href="at.html#fusion.sequence.intrinsic.functions.at.synopsis">Synopsis</a>
+=======
+<a name="id705425"></a>
+=======
+<a name="id667421"></a>
+=======
+<a name="id659776"></a>
+=======
+<a name="id680004"></a>
+=======
+<a name="id669297"></a>
+=======
+<a name="id666020"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">N</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> result_of::at<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">N</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">at</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.at.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id455124"></a>
<a href="at.html#fusion.sequence.intrinsic.functions.at.parameters">Parameters</a>
+=======
+<a name="id705658"></a>
+=======
+<a name="id667791"></a>
+=======
+<a name="id660145"></a>
+=======
+<a name="id681534"></a>
+=======
+<a name="id671305"></a>
+=======
+<a name="id668028"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -98,8 +181,33 @@
</tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.at.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id455282"></a>
<a href="at.html#fusion.sequence.intrinsic.functions.at.expression_semantics">Expression
+=======
+<a name="id705783"></a>
+=======
+<a name="id667916"></a>
+=======
+<a name="id660270"></a>
+=======
+<a name="id681659"></a>
+=======
+<a name="id671430"></a>
+=======
+<a name="id668153"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">at</span><span class="special"><</span><span class="identifier">N</span><span class="special">>(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -124,15 +232,65 @@
<pre class="programlisting">deref<span class="special">(</span>advance<span class="special"><</span><span class="identifier">N</span><span class="special">>(</span>begin<span class="special">(</span><span class="identifier">s</span><span class="special">)))</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.at.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id455597"></a>
<a href="at.html#fusion.sequence.intrinsic.functions.at.header">Header</a>
+=======
+<a name="id705993"></a>
+=======
+<a name="id668126"></a>
+=======
+<a name="id660480"></a>
+=======
+<a name="id681869"></a>
+=======
+<a name="id671640"></a>
+=======
+<a name="id668363"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.intrinsic.functions.at.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id455760"></a>
<a href="at.html#fusion.sequence.intrinsic.functions.at.example">Example</a>
+=======
+<a name="id706108"></a>
+=======
+<a name="id668241"></a>
+=======
+<a name="id660595"></a>
+=======
+<a name="id681984"></a>
+=======
+<a name="id671755"></a>
+=======
+<a name="id668478"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">></span> <span class="identifier">v</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><span class="identifier">at</span><span class="special"><</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special"><</span><span class="number">1</span><span class="special">></span> <span class="special">>(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
@@ -140,7 +298,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 © 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/sequence/intrinsic/functions/at_c.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_c.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_c.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>at_c</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="at.html" title="at">
<link rel="next" href="has_key.html" title="has_key">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.at_c.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id455987"></a>
<a href="at_c.html#fusion.sequence.intrinsic.functions.at_c.description">Description</a>
+=======
+<a name="id706268"></a>
+=======
+<a name="id668401"></a>
+=======
+<a name="id660755"></a>
+=======
+<a name="id682144"></a>
+=======
+<a name="id671915"></a>
+=======
+<a name="id668638"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the N-th element from the beginning of the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.at_c.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id456017"></a>
<a href="at_c.html#fusion.sequence.intrinsic.functions.at_c.synopsis">Synopsis</a>
+=======
+<a name="id708606"></a>
+=======
+<a name="id668418"></a>
+=======
+<a name="id660772"></a>
+=======
+<a name="id682161"></a>
+=======
+<a name="id671932"></a>
+=======
+<a name="id668655"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">int</span> <span class="identifier">N</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> result_of::at_c<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">N</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">at_c</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.at_c.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id456348"></a>
<a href="at_c.html#fusion.sequence.intrinsic.functions.at_c.parameters">Parameters</a>
+=======
+<a name="id708839"></a>
+=======
+<a name="id668650"></a>
+=======
+<a name="id661005"></a>
+=======
+<a name="id682393"></a>
+=======
+<a name="id672164"></a>
+=======
+<a name="id668888"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -97,8 +180,33 @@
</tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.at_c.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id456499"></a>
<a href="at_c.html#fusion.sequence.intrinsic.functions.at_c.expression_semantics">Expression
+=======
+<a name="id708960"></a>
+=======
+<a name="id668772"></a>
+=======
+<a name="id661126"></a>
+=======
+<a name="id682515"></a>
+=======
+<a name="id672286"></a>
+=======
+<a name="id669009"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">at_c</span><span class="special"><</span><span class="identifier">N</span><span class="special">>(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -124,15 +232,65 @@
<pre class="programlisting">deref<span class="special">(</span>advance<span class="special"><</span><span class="identifier">N</span><span class="special">>(</span>begin<span class="special">(</span><span class="identifier">s</span><span class="special">)))</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.at_c.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id456804"></a>
<a href="at_c.html#fusion.sequence.intrinsic.functions.at_c.header">Header</a>
+=======
+<a name="id709163"></a>
+=======
+<a name="id668974"></a>
+=======
+<a name="id661329"></a>
+=======
+<a name="id682717"></a>
+=======
+<a name="id672488"></a>
+=======
+<a name="id669212"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at_c</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">at_c</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.intrinsic.functions.at_c.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id456970"></a>
<a href="at_c.html#fusion.sequence.intrinsic.functions.at_c.example">Example</a>
+=======
+<a name="id709278"></a>
+=======
+<a name="id669090"></a>
+=======
+<a name="id661444"></a>
+=======
+<a name="id682833"></a>
+=======
+<a name="id672604"></a>
+=======
+<a name="id669327"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">></span> <span class="identifier">v</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><span class="identifier">at_c</span><span class="special"><</span><span class="number">1</span><span class="special">>(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
@@ -140,7 +298,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 © 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/sequence/intrinsic/functions/at_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_key.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_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>at_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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="has_key.html" title="has_key">
<link rel="next" href="swap.html" title="swap">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.at_key.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id458062"></a>
<a href="at_key.html#fusion.sequence.intrinsic.functions.at_key.description">Description</a>
+=======
+<a name="id710034"></a>
+=======
+<a name="id669846"></a>
+=======
+<a name="id662200"></a>
+=======
+<a name="id683589"></a>
+=======
+<a name="id673360"></a>
+=======
+<a name="id670083"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the element associated with a Key from the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.at_key.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id458092"></a>
<a href="at_key.html#fusion.sequence.intrinsic.functions.at_key.synopsis">Synopsis</a>
+=======
+<a name="id710051"></a>
+=======
+<a name="id669862"></a>
+=======
+<a name="id662217"></a>
+=======
+<a name="id683605"></a>
+=======
+<a name="id673377"></a>
+=======
+<a name="id670100"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</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">></span>
<span class="keyword">typename</span> result_of::at_key<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">at_key</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.at_key.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id458422"></a>
<a href="at_key.html#fusion.sequence.intrinsic.functions.at_key.parameters">Parameters</a>
+=======
+<a name="id710284"></a>
+=======
+<a name="id671188"></a>
+=======
+<a name="id663542"></a>
+=======
+<a name="id683839"></a>
+=======
+<a name="id673610"></a>
+=======
+<a name="id670333"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -97,8 +180,33 @@
</tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.at_key.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id458572"></a>
<a href="at_key.html#fusion.sequence.intrinsic.functions.at_key.expression_semantics">Expression
+=======
+<a name="id710405"></a>
+=======
+<a name="id671309"></a>
+=======
+<a name="id663663"></a>
+=======
+<a name="id683960"></a>
+=======
+<a name="id673731"></a>
+=======
+<a name="id670454"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">at_key</span><span class="special"><</span><span class="identifier">Key</span><span class="special">>(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -120,15 +228,65 @@
with Key.
</p>
<a name="fusion.sequence.intrinsic.functions.at_key.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id458777"></a>
<a href="at_key.html#fusion.sequence.intrinsic.functions.at_key.header">Header</a>
+=======
+<a name="id710545"></a>
+=======
+<a name="id671450"></a>
+=======
+<a name="id663804"></a>
+=======
+<a name="id684100"></a>
+=======
+<a name="id673871"></a>
+=======
+<a name="id670594"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.intrinsic.functions.at_key.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id458943"></a>
<a href="at_key.html#fusion.sequence.intrinsic.functions.at_key.example">Example</a>
+=======
+<a name="id710660"></a>
+=======
+<a name="id671565"></a>
+=======
+<a name="id663919"></a>
+=======
+<a name="id684216"></a>
+=======
+<a name="id673986"></a>
+=======
+<a name="id670710"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">set<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">bool</span><span class="special">></span> <span class="identifier">s</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="keyword">true</span><span class="special">);</span>
<span class="identifier">assert</span><span class="special">(</span><span class="identifier">at_key</span><span class="special"><</span><span class="keyword">char</span><span class="special">>(</span><span class="identifier">s</span><span class="special">)</span> <span class="special">==</span> <span class="char">'x'</span><span class="special">);</span>
@@ -136,7 +294,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 © 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/sequence/intrinsic/functions/back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/back.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/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>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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="front.html" title="front">
<link rel="next" href="size.html" title="size">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.back.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id453047"></a>
<a href="back.html#fusion.sequence.intrinsic.functions.back.description">Description</a>
+=======
+<a name="id704208"></a>
+=======
+<a name="id666205"></a>
+=======
+<a name="id658559"></a>
+=======
+<a name="id678787"></a>
+=======
+<a name="id668080"></a>
+=======
+<a name="id664803"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the last element in the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.back.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id453076"></a>
<a href="back.html#fusion.sequence.intrinsic.functions.back.synopsis">Synopsis</a>
+=======
+<a name="id704225"></a>
+=======
+<a name="id666221"></a>
+=======
+<a name="id658576"></a>
+=======
+<a name="id678804"></a>
+=======
+<a name="id668097"></a>
+=======
+<a name="id664820"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> result_of::back<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">back</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.back.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id453351"></a>
<a href="back.html#fusion.sequence.intrinsic.functions.back.parameters">Parameters</a>
+=======
+<a name="id704415"></a>
+=======
+<a name="id666411"></a>
+=======
+<a name="id658765"></a>
+=======
+<a name="id678993"></a>
+=======
+<a name="id668286"></a>
+=======
+<a name="id665010"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -84,8 +167,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.back.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id453464"></a>
<a href="back.html#fusion.sequence.intrinsic.functions.back.expression_semantics">Expression
+=======
+<a name="id704505"></a>
+=======
+<a name="id666501"></a>
+=======
+<a name="id658855"></a>
+=======
+<a name="id679083"></a>
+=======
+<a name="id668376"></a>
+=======
+<a name="id665100"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">back</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -107,15 +215,65 @@
in the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.back.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id453659"></a>
<a href="back.html#fusion.sequence.intrinsic.functions.back.header">Header</a>
+=======
+<a name="id704636"></a>
+=======
+<a name="id666632"></a>
+=======
+<a name="id658986"></a>
+=======
+<a name="id679214"></a>
+=======
+<a name="id668507"></a>
+=======
+<a name="id665230"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.intrinsic.functions.back.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id453825"></a>
<a href="back.html#fusion.sequence.intrinsic.functions.back.example">Example</a>
+=======
+<a name="id704751"></a>
+=======
+<a name="id666747"></a>
+=======
+<a name="id659101"></a>
+=======
+<a name="id679329"></a>
+=======
+<a name="id668622"></a>
+=======
+<a name="id665346"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">></span> <span class="identifier">v</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><span class="identifier">back</span><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
@@ -123,7 +281,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 © 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/sequence/intrinsic/functions/begin.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/begin.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/begin.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>begin</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 1. 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="end.html" title="end">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.begin.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id449344"></a>
<a href="begin.html#fusion.sequence.intrinsic.functions.begin.description">Description</a>
+=======
+<a name="id700544"></a>
+=======
+<a name="id660175"></a>
+=======
+<a name="id652529"></a>
+=======
+<a name="id675010"></a>
+=======
+<a name="id663672"></a>
+=======
+<a name="id660395"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns an iterator pointing to the first element in the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.begin.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id449373"></a>
<a href="begin.html#fusion.sequence.intrinsic.functions.begin.synopsis">Synopsis</a>
+=======
+<a name="id700561"></a>
+=======
+<a name="id660192"></a>
+=======
+<a name="id652546"></a>
+=======
+<a name="id675027"></a>
+=======
+<a name="id663688"></a>
+=======
+<a name="id660412"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> result_of::begin<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">begin</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.begin.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id449647"></a>
<a href="begin.html#fusion.sequence.intrinsic.functions.begin.parameters">Parameters</a>
+=======
+<a name="id700751"></a>
+=======
+<a name="id660381"></a>
+=======
+<a name="id652735"></a>
+=======
+<a name="id675216"></a>
+=======
+<a name="id663878"></a>
+=======
+<a name="id660601"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -84,13 +167,39 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.begin.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id449760"></a>
<a href="begin.html#fusion.sequence.intrinsic.functions.begin.expression_semantics">Expression
+=======
+<a name="id700851"></a>
+=======
+<a name="id660471"></a>
+=======
+<a name="id652825"></a>
+=======
+<a name="id675306"></a>
+=======
+<a name="id663968"></a>
+=======
+<a name="id660691"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">begin</span><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 href="../../../iterator/concepts/forward_iterator.html" title="Forward
Iterator">Forward
Iterator</a> if <tt class="computeroutput"><span class="identifier">seq</span></tt>
@@ -107,21 +216,94 @@
is a <a href="../../concepts/random_access_sequence.html" title="Random
Access Sequence">Random
Access 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="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a> else, <a class="link" href="../../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> else, <a class="link" href="../../../iterator/concepts/random_access_iterator.html" title="Random Access Iterator">Random
+ Access Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/random_access_sequence.html" title="Random Access Sequence">Random
+ Access Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../iterator/concepts/associative_iterator.html" title="Associative Iterator">Associative
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is an <a class="link" href="../../concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a>.
+ </li>
+</ul></div>
<p>
<span class="bold"><b>Semantics</b></span>: Returns an iterator pointing
to the first element in the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.begin.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id449927"></a>
<a href="begin.html#fusion.sequence.intrinsic.functions.begin.header">Header</a>
+=======
+<a name="id700953"></a>
+=======
+<a name="id660601"></a>
+=======
+<a name="id652955"></a>
+=======
+<a name="id675436"></a>
+=======
+<a name="id664098"></a>
+=======
+<a name="id660821"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">begin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">begin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.intrinsic.functions.begin.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id450094"></a>
<a href="begin.html#fusion.sequence.intrinsic.functions.begin.example">Example</a>
+=======
+<a name="id701068"></a>
+=======
+<a name="id660716"></a>
+=======
+<a name="id653070"></a>
+=======
+<a name="id675551"></a>
+=======
+<a name="id664213"></a>
+=======
+<a name="id660936"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">></span> <span class="identifier">v</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>deref<span class="special">(</span><span class="identifier">begin</span><span class="special">(</span><span class="identifier">v</span><span class="special">))</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
@@ -129,7 +311,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 © 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/sequence/intrinsic/functions/empty.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/empty.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/empty.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>empty</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="end.html" title="end">
<link rel="next" href="front.html" title="front">
@@ -30,8 +38,33 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.empty.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id451280"></a>
<a href="empty.html#fusion.sequence.intrinsic.functions.empty.description">Description</a>
+=======
+<a name="id701884"></a>
+=======
+<a name="id661560"></a>
+=======
+<a name="id653914"></a>
+=======
+<a name="id676395"></a>
+=======
+<a name="id665056"></a>
+=======
+<a name="id661780"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns a type convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>
@@ -39,16 +72,66 @@
the sequence is empty, else, evaluates to <tt class="computeroutput"><span class="keyword">false</span></tt>.
</p>
<a name="fusion.sequence.intrinsic.functions.empty.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id451345"></a>
<a href="empty.html#fusion.sequence.intrinsic.functions.empty.synopsis">Synopsis</a>
+=======
+<a name="id701924"></a>
+=======
+<a name="id661599"></a>
+=======
+<a name="id653953"></a>
+=======
+<a name="id676434"></a>
+=======
+<a name="id665096"></a>
+=======
+<a name="id661819"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> result_of::empty<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
<span class="identifier">empty</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.empty.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id451498"></a>
<a href="empty.html#fusion.sequence.intrinsic.functions.empty.parameters">Parameters</a>
+=======
+<a name="id702027"></a>
+=======
+<a name="id661702"></a>
+=======
+<a name="id654056"></a>
+=======
+<a name="id676538"></a>
+=======
+<a name="id665199"></a>
+=======
+<a name="id661922"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -82,8 +165,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.empty.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id451612"></a>
<a href="empty.html#fusion.sequence.intrinsic.functions.empty.expression_semantics">Expression
+=======
+<a name="id702117"></a>
+=======
+<a name="id661792"></a>
+=======
+<a name="id654146"></a>
+=======
+<a name="id676628"></a>
+=======
+<a name="id665289"></a>
+=======
+<a name="id662012"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">empty</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -96,15 +204,65 @@
to <tt class="computeroutput"><span class="keyword">false</span></tt>.
</p>
<a name="fusion.sequence.intrinsic.functions.empty.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id451723"></a>
<a href="empty.html#fusion.sequence.intrinsic.functions.empty.header">Header</a>
+=======
+<a name="id702192"></a>
+=======
+<a name="id661867"></a>
+=======
+<a name="id654221"></a>
+=======
+<a name="id676702"></a>
+=======
+<a name="id665364"></a>
+=======
+<a name="id662087"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">empty</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">empty</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.intrinsic.functions.empty.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id451890"></a>
<a href="empty.html#fusion.sequence.intrinsic.functions.empty.example">Example</a>
+=======
+<a name="id702307"></a>
+=======
+<a name="id661982"></a>
+=======
+<a name="id654336"></a>
+=======
+<a name="id677978"></a>
+=======
+<a name="id667271"></a>
+=======
+<a name="id663994"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">></span> <span class="identifier">v</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><span class="identifier">empty</span><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">false</span><span class="special">);</span>
@@ -112,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 © 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/sequence/intrinsic/functions/end.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/end.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/end.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>end</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="begin.html" title="begin">
<link rel="next" href="empty.html" title="empty">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.end.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id450304"></a>
<a href="end.html#fusion.sequence.intrinsic.functions.end.description">Description</a>
+=======
+<a name="id701214"></a>
+=======
+<a name="id660861"></a>
+=======
+<a name="id653215"></a>
+=======
+<a name="id675696"></a>
+=======
+<a name="id664358"></a>
+=======
+<a name="id661081"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns an iterator pointing to one element past the end of the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.end.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id450334"></a>
<a href="end.html#fusion.sequence.intrinsic.functions.end.synopsis">Synopsis</a>
+=======
+<a name="id701230"></a>
+=======
+<a name="id660878"></a>
+=======
+<a name="id653232"></a>
+=======
+<a name="id675713"></a>
+=======
+<a name="id664375"></a>
+=======
+<a name="id661098"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> result_of::end<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">end</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.end.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id450606"></a>
<a href="end.html#fusion.sequence.intrinsic.functions.end.parameters">Parameters</a>
+=======
+<a name="id701420"></a>
+=======
+<a name="id661068"></a>
+=======
+<a name="id653422"></a>
+=======
+<a name="id675903"></a>
+=======
+<a name="id664564"></a>
+=======
+<a name="id661288"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -84,13 +167,39 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.end.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id450718"></a>
<a href="end.html#fusion.sequence.intrinsic.functions.end.expression_semantics">Expression
+=======
+<a name="id701510"></a>
+=======
+<a name="id661158"></a>
+=======
+<a name="id653512"></a>
+=======
+<a name="id675993"></a>
+=======
+<a name="id664654"></a>
+=======
+<a name="id661378"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">end</span><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 href="../../../iterator/concepts/forward_iterator.html" title="Forward
Iterator">Forward
Iterator</a> if <tt class="computeroutput"><span class="identifier">seq</span></tt>
@@ -107,21 +216,94 @@
is a <a href="../../concepts/random_access_sequence.html" title="Random
Access Sequence">Random
Access 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="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a> else, <a class="link" href="../../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> else, <a class="link" href="../../../iterator/concepts/random_access_iterator.html" title="Random Access Iterator">Random
+ Access Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/random_access_sequence.html" title="Random Access Sequence">Random
+ Access Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../iterator/concepts/associative_iterator.html" title="Associative Iterator">Associative
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is an <a class="link" href="../../concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a>.
+ </li>
+</ul></div>
<p>
<span class="bold"><b>Semantics</b></span>: Returns an iterator pointing
to one element past the end of the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.end.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id450886"></a>
<a href="end.html#fusion.sequence.intrinsic.functions.end.header">Header</a>
+=======
+<a name="id701612"></a>
+=======
+<a name="id661287"></a>
+=======
+<a name="id653641"></a>
+=======
+<a name="id676122"></a>
+=======
+<a name="id664784"></a>
+=======
+<a name="id661507"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">end</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">end</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.intrinsic.functions.end.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id451051"></a>
<a href="end.html#fusion.sequence.intrinsic.functions.end.example">Example</a>
+=======
+<a name="id701727"></a>
+=======
+<a name="id661402"></a>
+=======
+<a name="id653756"></a>
+=======
+<a name="id676238"></a>
+=======
+<a name="id664899"></a>
+=======
+<a name="id661622"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">></span> <span class="identifier">v</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>deref<span class="special">(</span>prior<span class="special">(</span><span class="identifier">end</span><span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
@@ -129,7 +311,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 © 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/sequence/intrinsic/functions/front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/front.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/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>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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="empty.html" title="empty">
<link rel="next" href="back.html" title="back">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.front.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id452080"></a>
<a href="front.html#fusion.sequence.intrinsic.functions.front.description">Description</a>
+=======
+<a name="id702440"></a>
+=======
+<a name="id665529"></a>
+=======
+<a name="id657883"></a>
+=======
+<a name="id678111"></a>
+=======
+<a name="id667404"></a>
+=======
+<a name="id664128"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the first element in the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.front.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id452109"></a>
<a href="front.html#fusion.sequence.intrinsic.functions.front.synopsis">Synopsis</a>
+=======
+<a name="id702457"></a>
+=======
+<a name="id665546"></a>
+=======
+<a name="id657900"></a>
+=======
+<a name="id678128"></a>
+=======
+<a name="id667421"></a>
+=======
+<a name="id664144"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> result_of::front<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
@@ -49,8 +107,33 @@
<span class="identifier">front</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.front.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id452384"></a>
<a href="front.html#fusion.sequence.intrinsic.functions.front.parameters">Parameters</a>
+=======
+<a name="id702646"></a>
+=======
+<a name="id665735"></a>
+=======
+<a name="id658090"></a>
+=======
+<a name="id678318"></a>
+=======
+<a name="id667611"></a>
+=======
+<a name="id664334"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -84,8 +167,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.front.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id452497"></a>
<a href="front.html#fusion.sequence.intrinsic.functions.front.expression_semantics">Expression
+=======
+<a name="id702736"></a>
+=======
+<a name="id665825"></a>
+=======
+<a name="id658180"></a>
+=======
+<a name="id678408"></a>
+=======
+<a name="id667701"></a>
+=======
+<a name="id664424"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">front</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -107,15 +215,65 @@
in the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.front.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id452690"></a>
<a href="front.html#fusion.sequence.intrinsic.functions.front.header">Header</a>
+=======
+<a name="id702867"></a>
+=======
+<a name="id665956"></a>
+=======
+<a name="id658310"></a>
+=======
+<a name="id678539"></a>
+=======
+<a name="id667832"></a>
+=======
+<a name="id664555"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.intrinsic.functions.front.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id452856"></a>
<a href="front.html#fusion.sequence.intrinsic.functions.front.example">Example</a>
+=======
+<a name="id702982"></a>
+=======
+<a name="id666071"></a>
+=======
+<a name="id658426"></a>
+=======
+<a name="id678654"></a>
+=======
+<a name="id667947"></a>
+=======
+<a name="id664670"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">></span> <span class="identifier">v</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><span class="identifier">front</span><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
@@ -123,7 +281,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 © 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/sequence/intrinsic/functions/has_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/has_key.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/has_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>has_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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="at_c.html" title="at_c">
<link rel="next" href="at_key.html" title="at_key">
@@ -30,8 +38,33 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.has_key.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id457172"></a>
<a href="has_key.html#fusion.sequence.intrinsic.functions.has_key.description">Description</a>
+=======
+<a name="id709418"></a>
+=======
+<a name="id669230"></a>
+=======
+<a name="id661584"></a>
+=======
+<a name="id682973"></a>
+=======
+<a name="id672744"></a>
+=======
+<a name="id669467"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns a type convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>
@@ -40,16 +73,66 @@
to <tt class="computeroutput"><span class="keyword">false</span></tt>.
</p>
<a name="fusion.sequence.intrinsic.functions.has_key.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id457238"></a>
<a href="has_key.html#fusion.sequence.intrinsic.functions.has_key.synopsis">Synopsis</a>
+=======
+<a name="id709457"></a>
+=======
+<a name="id669268"></a>
+=======
+<a name="id661623"></a>
+=======
+<a name="id683011"></a>
+=======
+<a name="id672782"></a>
+=======
+<a name="id669506"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</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">></span>
<span class="keyword">typename</span> result_of::has_key<span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">>::</span><span class="identifier">type</span>
<span class="identifier">has_key</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.has_key.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id457419"></a>
<a href="has_key.html#fusion.sequence.intrinsic.functions.has_key.parameters">Parameters</a>
+=======
+<a name="id709582"></a>
+=======
+<a name="id669393"></a>
+=======
+<a name="id661747"></a>
+=======
+<a name="id683136"></a>
+=======
+<a name="id672907"></a>
+=======
+<a name="id669630"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -96,8 +179,33 @@
</tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.has_key.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id457572"></a>
<a href="has_key.html#fusion.sequence.intrinsic.functions.has_key.expression_semantics">Expression
+=======
+<a name="id709700"></a>
+=======
+<a name="id669512"></a>
+=======
+<a name="id661866"></a>
+=======
+<a name="id683255"></a>
+=======
+<a name="id673026"></a>
+=======
+<a name="id669749"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">has_key</span><span class="special"><</span><span class="identifier">Key</span><span class="special">>(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -110,15 +218,65 @@
associated with Key, else, evaluates to <tt class="computeroutput"><span class="keyword">false</span></tt>.
</p>
<a name="fusion.sequence.intrinsic.functions.has_key.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id457693"></a>
<a href="has_key.html#fusion.sequence.intrinsic.functions.has_key.header">Header</a>
+=======
+<a name="id709778"></a>
+=======
+<a name="id669590"></a>
+=======
+<a name="id661944"></a>
+=======
+<a name="id683333"></a>
+=======
+<a name="id673104"></a>
+=======
+<a name="id669827"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">has_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">has_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.intrinsic.functions.has_key.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id457859"></a>
<a href="has_key.html#fusion.sequence.intrinsic.functions.has_key.example">Example</a>
+=======
+<a name="id709894"></a>
+=======
+<a name="id669705"></a>
+=======
+<a name="id662059"></a>
+=======
+<a name="id683448"></a>
+=======
+<a name="id673219"></a>
+=======
+<a name="id669942"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">set<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">bool</span><span class="special">></span> <span class="identifier">s</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="keyword">true</span><span class="special">);</span>
<span class="identifier">assert</span><span class="special">(</span><span class="identifier">has_key</span><span class="special"><</span><span class="keyword">char</span><span class="special">>(</span><span class="identifier">s</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">true</span><span class="special">);</span>
@@ -126,7 +284,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 © 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/sequence/intrinsic/functions/size.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/size.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/size.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>size</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="back.html" title="back">
<link rel="next" href="at.html" title="at">
@@ -30,24 +38,99 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.size.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id454017"></a>
<a href="size.html#fusion.sequence.intrinsic.functions.size.description">Description</a>
+=======
+<a name="id704884"></a>
+=======
+<a name="id666880"></a>
+=======
+<a name="id659234"></a>
+=======
+<a name="id679463"></a>
+=======
+<a name="id668756"></a>
+=======
+<a name="id665479"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns a type convertible to <tt class="computeroutput"><span class="keyword">int</span></tt>
that evaluates the number of elements in the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.size.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id454060"></a>
<a href="size.html#fusion.sequence.intrinsic.functions.size.synopsis">Synopsis</a>
+=======
+<a name="id704908"></a>
+=======
+<a name="id666904"></a>
+=======
+<a name="id659258"></a>
+=======
+<a name="id679487"></a>
+=======
+<a name="id668780"></a>
+=======
+<a name="id665503"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">typename</span> result_of::size<span class="special"><</span><span class="identifier">Sequence</span><span class="special">>::</span><span class="identifier">type</span>
<span class="identifier">size</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.size.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id454212"></a>
<a href="size.html#fusion.sequence.intrinsic.functions.size.parameters">Parameters</a>
+=======
+<a name="id705011"></a>
+=======
+<a name="id667007"></a>
+=======
+<a name="id659362"></a>
+=======
+<a name="id679590"></a>
+=======
+<a name="id668883"></a>
+=======
+<a name="id665606"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -81,8 +164,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.size.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id454326"></a>
<a href="size.html#fusion.sequence.intrinsic.functions.size.expression_semantics">Expression
+=======
+<a name="id705101"></a>
+=======
+<a name="id667097"></a>
+=======
+<a name="id659452"></a>
+=======
+<a name="id679680"></a>
+=======
+<a name="id668973"></a>
+=======
+<a name="id665696"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">size</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
@@ -95,15 +203,65 @@
in the sequence.
</p>
<a name="fusion.sequence.intrinsic.functions.size.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id454412"></a>
<a href="size.html#fusion.sequence.intrinsic.functions.size.header">Header</a>
+=======
+<a name="id705160"></a>
+=======
+<a name="id667156"></a>
+=======
+<a name="id659510"></a>
+=======
+<a name="id679739"></a>
+=======
+<a name="id669032"></a>
+=======
+<a name="id665755"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">size</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">size</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.intrinsic.functions.size.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id454577"></a>
<a href="size.html#fusion.sequence.intrinsic.functions.size.example">Example</a>
+=======
+<a name="id705275"></a>
+=======
+<a name="id667271"></a>
+=======
+<a name="id659626"></a>
+=======
+<a name="id679854"></a>
+=======
+<a name="id669147"></a>
+=======
+<a name="id665870"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">></span> <span class="identifier">v</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><span class="identifier">size</span><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
@@ -111,7 +269,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 © 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/sequence/intrinsic/functions/swap.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/swap.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/swap.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>swap</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../functions.html" title="Functions">
<link rel="previous" href="at_key.html" title="at_key">
<link rel="next" href="../metafunctions.html" title="Metafunctions">
@@ -30,22 +38,97 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.functions.swap.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id459147"></a>
<a href="swap.html#fusion.sequence.intrinsic.functions.swap.description">Description</a>
+=======
+<a name="id711894"></a>
+=======
+<a name="id671705"></a>
+=======
+<a name="id664059"></a>
+=======
+<a name="id684356"></a>
+=======
+<a name="id674127"></a>
+=======
+<a name="id670850"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="swap.html#fusion.sequence.intrinsic.functions.swap.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Performs an element by element swap of the elements in 2 sequences.
</p>
<a name="fusion.sequence.intrinsic.functions.swap.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id459177"></a>
<a href="swap.html#fusion.sequence.intrinsic.functions.swap.synopsis">Synopsis</a>
+=======
+<a name="id711910"></a>
+=======
+<a name="id671722"></a>
+=======
+<a name="id664076"></a>
+=======
+<a name="id684373"></a>
+=======
+<a name="id674144"></a>
+=======
+<a name="id670867"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="swap.html#fusion.sequence.intrinsic.functions.swap.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">></span>
<span class="keyword">void</span> <span class="identifier">swap</span><span class="special">(</span><span class="identifier">Seq1</span><span class="special">&</span> <span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">Seq2</span><span class="special">&</span> <span class="identifier">seq2</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.intrinsic.functions.swap.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id459316"></a>
<a href="swap.html#fusion.sequence.intrinsic.functions.swap.parameters">Parameters</a>
+=======
+<a name="id712006"></a>
+=======
+<a name="id671818"></a>
+=======
+<a name="id664172"></a>
+=======
+<a name="id684469"></a>
+=======
+<a name="id674240"></a>
+=======
+<a name="id670963"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="swap.html#fusion.sequence.intrinsic.functions.swap.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -79,8 +162,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.intrinsic.functions.swap.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id459442"></a>
<a href="swap.html#fusion.sequence.intrinsic.functions.swap.expression_semantics">Expression
+=======
+<a name="id712104"></a>
+=======
+<a name="id671915"></a>
+=======
+<a name="id664269"></a>
+=======
+<a name="id684566"></a>
+=======
+<a name="id674337"></a>
+=======
+<a name="id671060"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="swap.html#fusion.sequence.intrinsic.functions.swap.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">swap</span><span class="special">(</span><span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">seq2</span><span class="special">);</span>
@@ -98,8 +206,33 @@
/sequence/intrinsic/swap.hpp>
</p>
<a name="fusion.sequence.intrinsic.functions.swap.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id459689"></a>
<a href="swap.html#fusion.sequence.intrinsic.functions.swap.example">Example</a>
+=======
+<a name="id712272"></a>
+=======
+<a name="id672083"></a>
+=======
+<a name="id664437"></a>
+=======
+<a name="id684734"></a>
+=======
+<a name="id674505"></a>
+=======
+<a name="id671228"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="swap.html#fusion.sequence.intrinsic.functions.swap.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">></span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">),</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="string">"world"</span><span class="special">);</span>
<span class="identifier">swap</span><span class="special">(</span><span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">);</span>
@@ -109,7 +242,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 © 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/sequence/intrinsic/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/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="../intrinsic.html" title="Intrinsic">
<link rel="previous" href="functions/swap.html" title="swap">
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at.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>at</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="size.html" title="size">
<link rel="next" href="at_c.html" title="at_c">
@@ -30,17 +38,72 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.at.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id463892"></a>
<a href="at.html#fusion.sequence.intrinsic.metafunctions.at.description">Description</a>
+=======
+<a name="id715319"></a>
+=======
+<a name="id677580"></a>
+=======
+<a name="id669935"></a>
+=======
+<a name="id691340"></a>
+=======
+<a name="id680002"></a>
+=======
+<a name="id676725"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at.html#fusion.sequence.intrinsic.metafunctions.at.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
+<<<<<<< .working
Returns the result type of at
<sup>[<a name="id463929" href="#ftn.id463929">6</a>]</sup>
+=======
+ Returns the result type of <a class="link" href="../functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a>
+ <sup>[<a name="id676747" href="#ftn.id676747" class="footnote">6</a>]</sup>
+>>>>>>> .merge-right.r57125
.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.at.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id464047"></a>
<a href="at.html#fusion.sequence.intrinsic.metafunctions.at.synopsis">Synopsis</a>
+=======
+<a name="id715410"></a>
+=======
+<a name="id677672"></a>
+=======
+<a name="id670026"></a>
+=======
+<a name="id691432"></a>
+=======
+<a name="id680093"></a>
+=======
+<a name="id676816"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at.html#fusion.sequence.intrinsic.metafunctions.at.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Seq</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="id464162"></a><p class="title"><b>Table 1.25. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id715494"></a><p class="title"><b>Table 1.25. Parameters</b></p>
+=======
+<a name="id677756"></a><p class="title"><b>Table 1.29. Parameters</b></p>
+=======
+<a name="id670110"></a><p class="title"><b>Table 1.29. Parameters</b></p>
+=======
+<a name="id691516"></a><p class="title"><b>Table 1.29. Parameters</b></p>
+=======
+<a name="id680177"></a><p class="title"><b>Table 1.29. Parameters</b></p>
+=======
+<a name="id676900"></a><p class="title"><b>Table 1.29. 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.sequence.intrinsic.metafunctions.at.expression_semantics"></a><h6>
<a name="id464305"></a>
<a href="at.html#fusion.sequence.intrinsic.metafunctions.at.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.at.expression_semantics"></a><h6>
+<a name="id677019"></a>
+ <a class="link" href="at.html#fusion.sequence.intrinsic.metafunctions.at.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">N</span><span class="special">>::</span><span class="identifier">type</span>
@@ -112,29 +206,86 @@
<span class="bold"><b>Semantics</b></span>: Returns the result type of
using at to access the <tt class="computeroutput"><span class="identifier">N</span></tt>th element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
</p>
-<p>
- /sequence/intrinsic/at.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.at.header"></a><h6>
+<a name="id677114"></a>
+ <a class="link" href="at.html#fusion.sequence.intrinsic.metafunctions.at.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.at.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id464452"></a>
<a href="at.html#fusion.sequence.intrinsic.metafunctions.at.example">Example</a>
+=======
+<a name="id715711"></a>
+=======
+<a name="id678084"></a>
+=======
+<a name="id670439"></a>
+=======
+<a name="id691844"></a>
+=======
+<a name="id680506"></a>
+=======
+<a name="id677229"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at.html#fusion.sequence.intrinsic.metafunctions.at.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::at<span class="special"><</span><span class="identifier">vec</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special"><</span><span class="number">1</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&>));</span>
</pre>
<div class="footnotes">
<br><hr width="100" align="left">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<div class="footnote"><p><sup>[<a name="ftn.id463929" href="#id463929">6</a>] </sup>
<a href="at.html" title="at"><tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span></tt></a> reflects the actual return
type of the function at. Sequence(s)
typically return references to its elements via the at function. If you want
to get the actual element type, use result_of::value_at
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id715340" href="#id715340" class="para">6</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id677602" href="#id677602" class="para">6</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id669956" href="#id669956" class="para">6</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id691362" href="#id691362" class="para">6</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id680024" href="#id680024" class="para">6</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id676747" href="#id676747" class="para">6</a>] </sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at.html" title="at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span></code></a> reflects the actual return
+ type of the function <a class="link" href="../functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a>. <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>(s)
+ typically return references to its elements via the <a class="link" href="../functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a> function. If you want
+ to get the actual element type, use <a class="link" href="value_at.html" title="value_at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at</span></code></a>
+>>>>>>> .merge-right.r57125
</p></div>
</div>
</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 © 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/sequence/intrinsic/metafunctions/at_c.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.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>at_c</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="at.html" title="at">
<link rel="next" href="value_at.html" title="value_at">
@@ -30,17 +38,72 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.at_c.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id464709"></a>
<a href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.description">Description</a>
+=======
+<a name="id715889"></a>
+=======
+<a name="id678262"></a>
+=======
+<a name="id670616"></a>
+=======
+<a name="id692022"></a>
+=======
+<a name="id680684"></a>
+=======
+<a name="id677407"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
+<<<<<<< .working
Returns the result type of at_c
<sup>[<a name="id464747" href="#ftn.id464747">7</a>]</sup>
+=======
+ Returns the result type of <a class="link" href="../functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a>
+ <sup>[<a name="id677431" href="#ftn.id677431" class="footnote">7</a>]</sup>
+>>>>>>> .merge-right.r57125
.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.at_c.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id464868"></a>
<a href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.synopsis">Synopsis</a>
+=======
+<a name="id715982"></a>
+=======
+<a name="id678356"></a>
+=======
+<a name="id670710"></a>
+=======
+<a name="id692116"></a>
+=======
+<a name="id680777"></a>
+=======
+<a name="id677500"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Seq</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="id464983"></a><p class="title"><b>Table 1.26. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id716066"></a><p class="title"><b>Table 1.26. Parameters</b></p>
+=======
+<a name="id678440"></a><p class="title"><b>Table 1.30. Parameters</b></p>
+=======
+<a name="id670794"></a><p class="title"><b>Table 1.30. Parameters</b></p>
+=======
+<a name="id692200"></a><p class="title"><b>Table 1.30. Parameters</b></p>
+=======
+<a name="id680861"></a><p class="title"><b>Table 1.30. Parameters</b></p>
+=======
+<a name="id677584"></a><p class="title"><b>Table 1.30. 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.sequence.intrinsic.metafunctions.at_c.expression_semantics"></a><h6>
<a name="id465121"></a>
<a href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.at_c.expression_semantics"></a><h6>
+<a name="id677697"></a>
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">M</span><span class="special">>::</span><span class="identifier">type</span>
@@ -111,29 +205,86 @@
<span class="bold"><b>Semantics</b></span>: Returns the result type of
using at_c to access the <tt class="computeroutput"><span class="identifier">M</span></tt>th element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
</p>
-<p>
- /sequence/intrinsic/at.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.at_c.header"></a><h6>
+<a name="id677790"></a>
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.at_c.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id465270"></a>
<a href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.example">Example</a>
+=======
+<a name="id716275"></a>
+=======
+<a name="id678760"></a>
+=======
+<a name="id671114"></a>
+=======
+<a name="id692520"></a>
+=======
+<a name="id681182"></a>
+=======
+<a name="id677905"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::at_c<span class="special"><</span><span class="identifier">vec</span><span class="special">,</span> <span class="number">1</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&>));</span>
</pre>
<div class="footnotes">
<br><hr width="100" align="left">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<div class="footnote"><p><sup>[<a name="ftn.id464747" href="#id464747">7</a>] </sup>
<a href="at_c.html" title="at_c"><tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span></tt></a> reflects the actual
return type of the function at_c. Sequence(s)
typically return references to its elements via the at_c function. If you want
to get the actual element type, use result_of::value_at_c
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id715913" href="#id715913" class="para">7</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id678286" href="#id678286" class="para">7</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id670640" href="#id670640" class="para">7</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id692046" href="#id692046" class="para">7</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id680708" href="#id680708" class="para">7</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id677431" href="#id677431" class="para">7</a>] </sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span></code></a> reflects the actual
+ return type of the function <a class="link" href="../functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a>. <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>(s)
+ typically return references to its elements via the <a class="link" href="../functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a> function. If you want
+ to get the actual element type, use <a class="link" href="value_at_c.html" title="value_at_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_c</span></code></a>
+>>>>>>> .merge-right.r57125
</p></div>
</div>
</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 © 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/sequence/intrinsic/metafunctions/at_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_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>at_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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="has_key.html" title="has_key">
<link rel="next" href="value_at_key.html" title="value_at_key">
@@ -30,17 +38,72 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.at_key.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id467644"></a>
<a href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.description">Description</a>
+=======
+<a name="id719070"></a>
+=======
+<a name="id681553"></a>
+=======
+<a name="id673907"></a>
+=======
+<a name="id696337"></a>
+=======
+<a name="id685067"></a>
+=======
+<a name="id681790"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
+<<<<<<< .working
Returns the result type of at_key
<sup>[<a name="id467682" href="#ftn.id467682">8</a>]</sup>
+=======
+ Returns the result type of <a class="link" href="../functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a>
+ <sup>[<a name="id681814" href="#ftn.id681814" class="footnote">8</a>]</sup>
+>>>>>>> .merge-right.r57125
.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.at_key.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id467800"></a>
<a href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.synopsis">Synopsis</a>
+=======
+<a name="id719163"></a>
+=======
+<a name="id681646"></a>
+=======
+<a name="id674000"></a>
+=======
+<a name="id696430"></a>
+=======
+<a name="id685160"></a>
+=======
+<a name="id681883"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Seq</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="id467915"></a><p class="title"><b>Table 1.30. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id719247"></a><p class="title"><b>Table 1.30. Parameters</b></p>
+=======
+<a name="id681730"></a><p class="title"><b>Table 1.34. Parameters</b></p>
+=======
+<a name="id674084"></a><p class="title"><b>Table 1.34. Parameters</b></p>
+=======
+<a name="id696514"></a><p class="title"><b>Table 1.34. Parameters</b></p>
+=======
+<a name="id685244"></a><p class="title"><b>Table 1.34. Parameters</b></p>
+=======
+<a name="id681967"></a><p class="title"><b>Table 1.34. 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.sequence.intrinsic.metafunctions.at_key.expression_semantics"></a><h6>
<a name="id468053"></a>
<a href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.at_key.expression_semantics"></a><h6>
+<a name="id682079"></a>
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">>::</span><span class="identifier">type</span>
@@ -113,29 +207,86 @@
with key type <tt class="computeroutput"><span class="identifier">Key</span></tt> in
<tt class="computeroutput"><span class="identifier">Seq</span></tt>.
</p>
-<p>
- /sequence/intrinsic/at_key.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.at_key.header"></a><h6>
+<a name="id682171"></a>
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.at_key.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id468201"></a>
<a href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.example">Example</a>
+=======
+<a name="id719455"></a>
+=======
+<a name="id682050"></a>
+=======
+<a name="id674404"></a>
+=======
+<a name="id696834"></a>
+=======
+<a name="id685563"></a>
+=======
+<a name="id682287"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> map<span class="special"><</span>pair<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">>,</span> pair<span class="special"><</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">>,</span> pair<span class="special"><</span><span class="keyword">double</span><span class="special">,</span> <span cla
ss="keyword">char</span><span class="special">></span> <span class="special">></span> <span class="identifier">mymap</span><span class="special">;</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::at_key<span class="special"><</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">int</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&>));</span>
</pre>
<div class="footnotes">
<br><hr width="100" align="left">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<div class="footnote"><p><sup>[<a name="ftn.id467682" href="#id467682">8</a>] </sup>
<a href="at_key.html" title="at_key"><tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span></tt></a> reflects the actual
return type of the function at_key. <span class="underline">_sequence</span>_s
typically return references to its elements via the at_key function. If you
want to get the actual element type, use result_of::value_at_key
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id719094" href="#id719094" class="para">8</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id681577" href="#id681577" class="para">8</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id673931" href="#id673931" class="para">8</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id696361" href="#id696361" class="para">8</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id685091" href="#id685091" class="para">8</a>] </sup>
+=======
+<div class="footnote"><p><sup>[<a name="ftn.id681814" href="#id681814" class="para">8</a>] </sup>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span></code></a> reflects the actual
+ return type of the function <a class="link" href="../functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a>. <span class="underline">_sequence</span>_s
+ typically return references to its elements via the <a class="link" href="../functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a> function. If you
+ want to get the actual element type, use <a class="link" href="value_at_key.html" title="value_at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_key</span></code></a>
+>>>>>>> .merge-right.r57125
</p></div>
</div>
</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 © 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/sequence/intrinsic/metafunctions/back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/back.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/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>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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="front.html" title="front">
<link rel="next" href="size.html" title="size">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.back.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id462630"></a>
<a href="back.html#fusion.sequence.intrinsic.metafunctions.back.description">Description</a>
+=======
+<a name="id714442"></a>
+=======
+<a name="id674841"></a>
+=======
+<a name="id667195"></a>
+=======
+<a name="id689693"></a>
+=======
+<a name="id678355"></a>
+=======
+<a name="id675078"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="back.html#fusion.sequence.intrinsic.metafunctions.back.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of back.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.back.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id462678"></a>
<a href="back.html#fusion.sequence.intrinsic.metafunctions.back.synopsis">Synopsis</a>
+=======
+<a name="id714470"></a>
+=======
+<a name="id674870"></a>
+=======
+<a name="id667224"></a>
+=======
+<a name="id689722"></a>
+=======
+<a name="id678384"></a>
+=======
+<a name="id675107"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="back.html#fusion.sequence.intrinsic.metafunctions.back.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">back</span>
@@ -47,8 +105,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id462775"></a><p class="title"><b>Table 1.23. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id714540"></a><p class="title"><b>Table 1.23. Parameters</b></p>
+=======
+<a name="id674940"></a><p class="title"><b>Table 1.27. Parameters</b></p>
+=======
+<a name="id667294"></a><p class="title"><b>Table 1.27. Parameters</b></p>
+=======
+<a name="id689792"></a><p class="title"><b>Table 1.27. Parameters</b></p>
+=======
+<a name="id678453"></a><p class="title"><b>Table 1.27. Parameters</b></p>
+=======
+<a name="id675177"></a><p class="title"><b>Table 1.27. 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>
@@ -80,9 +163,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.back.expression_semantics"></a><h6>
<a name="id462874"></a>
<a href="back.html#fusion.sequence.intrinsic.metafunctions.back.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.back.expression_semantics"></a><h6>
+<a name="id675258"></a>
+ <a class="link" href="back.html#fusion.sequence.intrinsic.metafunctions.back.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">back</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">>::</span><span class="identifier">type</span>
@@ -94,12 +183,41 @@
<span class="bold"><b>Semantics</b></span>: The type returned by dereferencing
an iterator to the last element in the sequence. Equivalent to <tt class="computeroutput">result_of::deref<span class="special"><</span>result_of::prior<span class="special"><</span>result_of::end<span class="special"><</span><span class="identifier">Seq</span><span class="special">>::</span><span class="identifier">type</span><span class="special">>::</span><span class="identifier">type</span><span class="special">>::</span><span class
="identifier">type</span></tt>.
</p>
-<p>
- /sequence/intrinsic/back.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.back.header"></a><h6>
+<a name="id675405"></a>
+ <a class="link" href="back.html#fusion.sequence.intrinsic.metafunctions.back.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.back.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id463105"></a>
<a href="back.html#fusion.sequence.intrinsic.metafunctions.back.example">Example</a>
+=======
+<a name="id714772"></a>
+=======
+<a name="id675283"></a>
+=======
+<a name="id667637"></a>
+=======
+<a name="id690135"></a>
+=======
+<a name="id678797"></a>
+=======
+<a name="id675520"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="back.html#fusion.sequence.intrinsic.metafunctions.back.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::back<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&>));</span>
@@ -107,7 +225,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 © 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/sequence/intrinsic/metafunctions/begin.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/begin.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>begin</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 1. 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="end.html" title="end">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.begin.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id460036"></a>
<a href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.description">Description</a>
+=======
+<a name="id712512"></a>
+=======
+<a name="id672323"></a>
+=======
+<a name="id664677"></a>
+=======
+<a name="id684974"></a>
+=======
+<a name="id674745"></a>
+=======
+<a name="id671468"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of begin.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.begin.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id460084"></a>
<a href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.synopsis">Synopsis</a>
+=======
+<a name="id712540"></a>
+=======
+<a name="id672352"></a>
+=======
+<a name="id664706"></a>
+=======
+<a name="id685003"></a>
+=======
+<a name="id674774"></a>
+=======
+<a name="id671497"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">begin</span>
@@ -47,8 +105,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id460180"></a><p class="title"><b>Table 1.19. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id712610"></a><p class="title"><b>Table 1.19. Parameters</b></p>
+=======
+<a name="id672422"></a><p class="title"><b>Table 1.23. Parameters</b></p>
+=======
+<a name="id664776"></a><p class="title"><b>Table 1.23. Parameters</b></p>
+=======
+<a name="id685072"></a><p class="title"><b>Table 1.23. Parameters</b></p>
+=======
+<a name="id674843"></a><p class="title"><b>Table 1.23. Parameters</b></p>
+=======
+<a name="id671566"></a><p class="title"><b>Table 1.23. 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>
@@ -80,27 +163,86 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.begin.expression_semantics"></a><h6>
<a name="id460281"></a>
<a href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.begin.expression_semantics"></a><h6>
+<a name="id671648"></a>
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">>::</span><span class="identifier">type</span>
</pre>
<p>
+<<<<<<< .working
<span class="bold"><b>Return type</b></span>: An iterator modelling the
same traversal concept as <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+=======
+ <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="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a> else, <a class="link" href="../../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> else, <a class="link" href="../../../iterator/concepts/random_access_iterator.html" title="Random Access Iterator">Random
+ Access Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/random_access_sequence.html" title="Random Access Sequence">Random
+ Access Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../iterator/concepts/associative_iterator.html" title="Associative Iterator">Associative
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is an <a class="link" href="../../concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a>.
+ </li>
+</ul></div>
<p>
<span class="bold"><b>Semantics</b></span>: Returns the type of an iterator
to the first element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
</p>
-<p>
- /sequence/intrinsic/begin.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.begin.header"></a><h6>
+<a name="id671793"></a>
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">begin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">begin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.begin.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id460401"></a>
<a href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.example">Example</a>
+=======
+<a name="id712770"></a>
+=======
+<a name="id672764"></a>
+=======
+<a name="id665118"></a>
+=======
+<a name="id685414"></a>
+=======
+<a name="id675185"></a>
+=======
+<a name="id671908"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::begin<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">it</span><span class="special">;</span>
@@ -109,7 +251,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 © 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/sequence/intrinsic/metafunctions/empty.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/empty.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>empty</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="end.html" title="end">
<link rel="next" href="front.html" title="front">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.empty.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id461321"></a>
<a href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.description">Description</a>
+=======
+<a name="id713400"></a>
+=======
+<a name="id673713"></a>
+=======
+<a name="id666067"></a>
+=======
+<a name="id688565"></a>
+=======
+<a name="id677227"></a>
+=======
+<a name="id673950"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of empty.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.empty.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id461369"></a>
<a href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.synopsis">Synopsis</a>
+=======
+<a name="id713428"></a>
+=======
+<a name="id673742"></a>
+=======
+<a name="id666096"></a>
+=======
+<a name="id688594"></a>
+=======
+<a name="id677256"></a>
+=======
+<a name="id673979"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">empty</span>
@@ -47,8 +105,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id461466"></a><p class="title"><b>Table 1.21. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id713498"></a><p class="title"><b>Table 1.21. Parameters</b></p>
+=======
+<a name="id673812"></a><p class="title"><b>Table 1.25. Parameters</b></p>
+=======
+<a name="id666166"></a><p class="title"><b>Table 1.25. Parameters</b></p>
+=======
+<a name="id688664"></a><p class="title"><b>Table 1.25. Parameters</b></p>
+=======
+<a name="id677325"></a><p class="title"><b>Table 1.25. Parameters</b></p>
+=======
+<a name="id674049"></a><p class="title"><b>Table 1.25. 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>
@@ -80,9 +163,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.empty.expression_semantics"></a><h6>
<a name="id461568"></a>
<a href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.empty.expression_semantics"></a><h6>
+<a name="id674130"></a>
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">empty</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">>::</span><span class="identifier">type</span>
@@ -96,12 +185,41 @@
if <tt class="computeroutput"><span class="identifier">Seq</span></tt> has zero elements,
<tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt> otherwise.
</p>
-<p>
- /sequence/intrinsic/empty.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.empty.header"></a><h6>
+<a name="id674231"></a>
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">empty</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">empty</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.empty.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id461725"></a>
<a href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.example">Example</a>
+=======
+<a name="id713684"></a>
+=======
+<a name="id674109"></a>
+=======
+<a name="id666463"></a>
+=======
+<a name="id688961"></a>
+=======
+<a name="id677623"></a>
+=======
+<a name="id674346"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><></span> <span class="identifier">empty_vec</span><span class="special">;</span>
<span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
@@ -112,7 +230,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 © 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/sequence/intrinsic/metafunctions/end.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/end.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/end.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>end</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="begin.html" title="begin">
<link rel="next" href="empty.html" title="empty">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.end.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id460654"></a>
<a href="end.html#fusion.sequence.intrinsic.metafunctions.end.description">Description</a>
+=======
+<a name="id712940"></a>
+=======
+<a name="id672934"></a>
+=======
+<a name="id665288"></a>
+=======
+<a name="id685585"></a>
+=======
+<a name="id675356"></a>
+=======
+<a name="id672079"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="end.html#fusion.sequence.intrinsic.metafunctions.end.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of end.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.end.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id460701"></a>
<a href="end.html#fusion.sequence.intrinsic.metafunctions.end.synopsis">Synopsis</a>
+=======
+<a name="id712966"></a>
+=======
+<a name="id672960"></a>
+=======
+<a name="id665315"></a>
+=======
+<a name="id685611"></a>
+=======
+<a name="id675382"></a>
+=======
+<a name="id672105"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="end.html#fusion.sequence.intrinsic.metafunctions.end.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">end</span>
@@ -47,8 +105,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id460798"></a><p class="title"><b>Table 1.20. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id713036"></a><p class="title"><b>Table 1.20. Parameters</b></p>
+=======
+<a name="id673030"></a><p class="title"><b>Table 1.24. Parameters</b></p>
+=======
+<a name="id665384"></a><p class="title"><b>Table 1.24. Parameters</b></p>
+=======
+<a name="id685681"></a><p class="title"><b>Table 1.24. Parameters</b></p>
+=======
+<a name="id675452"></a><p class="title"><b>Table 1.24. Parameters</b></p>
+=======
+<a name="id672175"></a><p class="title"><b>Table 1.24. 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>
@@ -80,27 +163,86 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.end.expression_semantics"></a><h6>
<a name="id460898"></a>
<a href="end.html#fusion.sequence.intrinsic.metafunctions.end.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.end.expression_semantics"></a><h6>
+<a name="id673486"></a>
+ <a class="link" href="end.html#fusion.sequence.intrinsic.metafunctions.end.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">>::</span><span class="identifier">type</span>
</pre>
<p>
+<<<<<<< .working
<span class="bold"><b>Return type</b></span>: A model of the same traversal
concept as <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+=======
+ <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="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a> else, <a class="link" href="../../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> else, <a class="link" href="../../../iterator/concepts/random_access_iterator.html" title="Random Access Iterator">Random
+ Access Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is a <a class="link" href="../../concepts/random_access_sequence.html" title="Random Access Sequence">Random
+ Access Sequence</a>.
+ </li>
+<li class="listitem">
+ A model of <a class="link" href="../../../iterator/concepts/associative_iterator.html" title="Associative Iterator">Associative
+ Iterator</a> if <code class="computeroutput"><span class="identifier">seq</span></code>
+ is an <a class="link" href="../../concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a>.
+ </li>
+</ul></div>
<p>
<span class="bold"><b>Semantics</b></span>: Returns the type of an iterator
one past the end of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
</p>
-<p>
- /sequence/intrinsic/end.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.end.header"></a><h6>
+<a name="id673631"></a>
+ <a class="link" href="end.html#fusion.sequence.intrinsic.metafunctions.end.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">end</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">end</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.end.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id461016"></a>
<a href="end.html#fusion.sequence.intrinsic.metafunctions.end.example">Example</a>
+=======
+<a name="id713196"></a>
+=======
+<a name="id673509"></a>
+=======
+<a name="id665863"></a>
+=======
+<a name="id688361"></a>
+=======
+<a name="id677023"></a>
+=======
+<a name="id673746"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="end.html#fusion.sequence.intrinsic.metafunctions.end.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::prior<span class="special"><</span>result_of::end<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
@@ -109,7 +251,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 © 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/sequence/intrinsic/metafunctions/front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/front.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/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>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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="empty.html" title="empty">
<link rel="next" href="back.html" title="back">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.front.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id461984"></a>
<a href="front.html#fusion.sequence.intrinsic.metafunctions.front.description">Description</a>
+=======
+<a name="id713858"></a>
+=======
+<a name="id674283"></a>
+=======
+<a name="id666637"></a>
+=======
+<a name="id689135"></a>
+=======
+<a name="id677797"></a>
+=======
+<a name="id674520"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="front.html#fusion.sequence.intrinsic.metafunctions.front.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of front.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.front.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id462032"></a>
<a href="front.html#fusion.sequence.intrinsic.metafunctions.front.synopsis">Synopsis</a>
+=======
+<a name="id713887"></a>
+=======
+<a name="id674312"></a>
+=======
+<a name="id666666"></a>
+=======
+<a name="id689164"></a>
+=======
+<a name="id677826"></a>
+=======
+<a name="id674549"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="front.html#fusion.sequence.intrinsic.metafunctions.front.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">front</span>
@@ -47,8 +105,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id462129"></a><p class="title"><b>Table 1.22. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id713956"></a><p class="title"><b>Table 1.22. Parameters</b></p>
+=======
+<a name="id674382"></a><p class="title"><b>Table 1.26. Parameters</b></p>
+=======
+<a name="id666736"></a><p class="title"><b>Table 1.26. Parameters</b></p>
+=======
+<a name="id689234"></a><p class="title"><b>Table 1.26. Parameters</b></p>
+=======
+<a name="id677895"></a><p class="title"><b>Table 1.26. Parameters</b></p>
+=======
+<a name="id674619"></a><p class="title"><b>Table 1.26. 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>
@@ -80,9 +163,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.front.expression_semantics"></a><h6>
<a name="id462230"></a>
<a href="front.html#fusion.sequence.intrinsic.metafunctions.front.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.front.expression_semantics"></a><h6>
+<a name="id674700"></a>
+ <a class="link" href="front.html#fusion.sequence.intrinsic.metafunctions.front.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">front</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">>::</span><span class="identifier">type</span>
@@ -95,12 +184,41 @@
an iterator to the first element in <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
Equivalent to <tt class="computeroutput">result_of::deref<span class="special"><</span>result_of::begin<span class="special"><</span><span class="identifier">Seq</span><span class="special">>::</span><span class="identifier">type</span><span class="special">>::</span><span class="identifier">type</span></tt>.
</p>
-<p>
- /sequence/intrinsic/front.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.front.header"></a><h6>
+<a name="id674827"></a>
+ <a class="link" href="front.html#fusion.sequence.intrinsic.metafunctions.front.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.front.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id462431"></a>
<a href="front.html#fusion.sequence.intrinsic.metafunctions.front.example">Example</a>
+=======
+<a name="id714306"></a>
+=======
+<a name="id674706"></a>
+=======
+<a name="id667060"></a>
+=======
+<a name="id689558"></a>
+=======
+<a name="id678219"></a>
+=======
+<a name="id674943"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="front.html#fusion.sequence.intrinsic.metafunctions.front.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::front<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&>));</span>
@@ -108,7 +226,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 © 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/sequence/intrinsic/metafunctions/has_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/has_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>has_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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="value_at_c.html" title="value_at_c">
<link rel="next" href="at_key.html" title="at_key">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.has_key.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id466822"></a>
<a href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.description">Description</a>
+=======
+<a name="id718488"></a>
+=======
+<a name="id680859"></a>
+=======
+<a name="id673213"></a>
+=======
+<a name="id695643"></a>
+=======
+<a name="id684373"></a>
+=======
+<a name="id681096"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of has_key.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.has_key.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id466869"></a>
<a href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.synopsis">Synopsis</a>
+=======
+<a name="id718519"></a>
+=======
+<a name="id680890"></a>
+=======
+<a name="id673244"></a>
+=======
+<a name="id695674"></a>
+=======
+<a name="id684404"></a>
+=======
+<a name="id681127"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -49,8 +107,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id466985"></a><p class="title"><b>Table 1.29. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id718605"></a><p class="title"><b>Table 1.29. Parameters</b></p>
+=======
+<a name="id680977"></a><p class="title"><b>Table 1.33. Parameters</b></p>
+=======
+<a name="id673331"></a><p class="title"><b>Table 1.33. Parameters</b></p>
+=======
+<a name="id695761"></a><p class="title"><b>Table 1.33. Parameters</b></p>
+=======
+<a name="id684491"></a><p class="title"><b>Table 1.33. Parameters</b></p>
+=======
+<a name="id681214"></a><p class="title"><b>Table 1.33. 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,9 +178,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.has_key.expression_semantics"></a><h6>
<a name="id467122"></a>
<a href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.has_key.expression_semantics"></a><h6>
+<a name="id681325"></a>
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">has_key</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">>::</span><span class="identifier">type</span>
@@ -112,12 +201,41 @@
with key type <tt class="computeroutput"><span class="identifier">Key</span></tt>, returns
<tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt> otherwise.
</p>
-<p>
- /sequence/intrinsic/has_key.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.has_key.header"></a><h6>
+<a name="id681442"></a>
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">has_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">has_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.has_key.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id467302"></a>
<a href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.example">Example</a>
+=======
+<a name="id718837"></a>
+=======
+<a name="id681320"></a>
+=======
+<a name="id673674"></a>
+=======
+<a name="id696104"></a>
+=======
+<a name="id684834"></a>
+=======
+<a name="id681557"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> map<span class="special"><</span>pair<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">>,</span> pair<span class="special"><</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">>,</span> pair<span class="special"><</span><span class="keyword">double</span><span class="special">,</span> <span cla
ss="keyword">char</span><span class="special">></span> <span class="special">></span> <span class="identifier">mymap</span><span class="special">;</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span>result_of::has_key<span class="special"><</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">int</span><span class="special">>));</span>
@@ -126,7 +244,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 © 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/sequence/intrinsic/metafunctions/size.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/size.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/size.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>size</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="back.html" title="back">
<link rel="next" href="at.html" title="at">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.size.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id463304"></a>
<a href="size.html#fusion.sequence.intrinsic.metafunctions.size.description">Description</a>
+=======
+<a name="id714907"></a>
+=======
+<a name="id675418"></a>
+=======
+<a name="id667772"></a>
+=======
+<a name="id690271"></a>
+=======
+<a name="id679479"></a>
+=======
+<a name="id676202"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="size.html#fusion.sequence.intrinsic.metafunctions.size.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the result type of size.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.size.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id463351"></a>
<a href="size.html#fusion.sequence.intrinsic.metafunctions.size.synopsis">Synopsis</a>
+=======
+<a name="id714936"></a>
+=======
+<a name="id675447"></a>
+=======
+<a name="id667801"></a>
+=======
+<a name="id690299"></a>
+=======
+<a name="id679508"></a>
+=======
+<a name="id676231"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="size.html#fusion.sequence.intrinsic.metafunctions.size.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">size</span>
@@ -47,8 +105,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id463448"></a><p class="title"><b>Table 1.24. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id715006"></a><p class="title"><b>Table 1.24. Parameters</b></p>
+=======
+<a name="id675517"></a><p class="title"><b>Table 1.28. Parameters</b></p>
+=======
+<a name="id667871"></a><p class="title"><b>Table 1.28. Parameters</b></p>
+=======
+<a name="id690916"></a><p class="title"><b>Table 1.28. Parameters</b></p>
+=======
+<a name="id679577"></a><p class="title"><b>Table 1.28. Parameters</b></p>
+=======
+<a name="id676300"></a><p class="title"><b>Table 1.28. 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>
@@ -80,9 +163,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.size.expression_semantics"></a><h6>
<a name="id463548"></a>
<a href="size.html#fusion.sequence.intrinsic.metafunctions.size.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.size.expression_semantics"></a><h6>
+<a name="id676382"></a>
+ <a class="link" href="size.html#fusion.sequence.intrinsic.metafunctions.size.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">>::</span><span class="identifier">type</span>
@@ -95,12 +184,41 @@
<span class="bold"><b>Semantics</b></span>: Returns the number of elements
in <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
</p>
-<p>
- /sequence/intrinsic/size.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.size.header"></a><h6>
+<a name="id676454"></a>
+ <a class="link" href="size.html#fusion.sequence.intrinsic.metafunctions.size.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">size</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">size</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.size.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id463662"></a>
<a href="size.html#fusion.sequence.intrinsic.metafunctions.size.example">Example</a>
+=======
+<a name="id715163"></a>
+=======
+<a name="id677424"></a>
+=======
+<a name="id669779"></a>
+=======
+<a name="id691184"></a>
+=======
+<a name="id679846"></a>
+=======
+<a name="id676569"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="size.html#fusion.sequence.intrinsic.metafunctions.size.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="keyword">typedef</span> result_of::size<span class="special"><</span><span class="identifier">vec</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">size_mpl_integral_constant</span><span class="special">;</span>
@@ -109,7 +227,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 © 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/sequence/intrinsic/metafunctions/swap.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/swap.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>swap</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="value_at_key.html" title="value_at_key">
<link rel="next" href="../../operator.html" title="Operator">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.swap.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id469266"></a>
<a href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.description">Description</a>
+=======
+<a name="id720274"></a>
+=======
+<a name="id682916"></a>
+=======
+<a name="id675271"></a>
+=======
+<a name="id698861"></a>
+=======
+<a name="id686430"></a>
+=======
+<a name="id683154"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the return type of swap.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.swap.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id469297"></a>
<a href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.synopsis">Synopsis</a>
+=======
+<a name="id720294"></a>
+=======
+<a name="id682937"></a>
+=======
+<a name="id675291"></a>
+=======
+<a name="id698881"></a>
+=======
+<a name="id686451"></a>
+=======
+<a name="id683174"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">swap</span>
@@ -47,8 +105,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id469414"></a><p class="title"><b>Table 1.32. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id720378"></a><p class="title"><b>Table 1.32. Parameters</b></p>
+=======
+<a name="id683021"></a><p class="title"><b>Table 1.36. Parameters</b></p>
+=======
+<a name="id675375"></a><p class="title"><b>Table 1.36. Parameters</b></p>
+=======
+<a name="id698965"></a><p class="title"><b>Table 1.36. Parameters</b></p>
+=======
+<a name="id686535"></a><p class="title"><b>Table 1.36. Parameters</b></p>
+=======
+<a name="id683258"></a><p class="title"><b>Table 1.36. 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>
@@ -80,9 +163,15 @@
</tr></tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.swap.expression_semantics"></a><h6>
<a name="id469528"></a>
<a href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.swap.expression_semantics"></a><h6>
+<a name="id683348"></a>
+ <a class="link" href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">swap</span><span class="special"><</span><span class="identifier">Seq1</span><span class="special">,</span> <span class="identifier">Seq2</span><span class="special">>::</span><span class="identifier">type</span>
@@ -93,13 +182,17 @@
<p>
<span class="bold"><b>Semantics</b></span>: Always returns <tt class="computeroutput"><span class="keyword">void</span></tt>.
</p>
-<p>
- /sequence/intrinsic/swap.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.swap.header"></a><h6>
+<a name="id683431"></a>
+ <a class="link" href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">swap</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">swap</span><span class="special">.</span><span class="identifier">hpp</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 © 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/sequence/intrinsic/metafunctions/value_at.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.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>value_at</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="at_c.html" title="at_c">
<link rel="next" href="value_at_c.html" title="value_at_c">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.value_at.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id465491"></a>
<a href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.description">Description</a>
+=======
+<a name="id717519"></a>
+=======
+<a name="id678911"></a>
+=======
+<a name="id671265"></a>
+=======
+<a name="id692671"></a>
+=======
+<a name="id681333"></a>
+=======
+<a name="id678056"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the actual type at a given index from the Sequence.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.value_at.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id465529"></a>
<a href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.synopsis">Synopsis</a>
+=======
+<a name="id717547"></a>
+=======
+<a name="id678939"></a>
+=======
+<a name="id671293"></a>
+=======
+<a name="id692699"></a>
+=======
+<a name="id681360"></a>
+=======
+<a name="id678084"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -49,8 +107,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id465644"></a><p class="title"><b>Table 1.27. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id717633"></a><p class="title"><b>Table 1.27. Parameters</b></p>
+=======
+<a name="id679025"></a><p class="title"><b>Table 1.31. Parameters</b></p>
+=======
+<a name="id671379"></a><p class="title"><b>Table 1.31. Parameters</b></p>
+=======
+<a name="id692785"></a><p class="title"><b>Table 1.31. Parameters</b></p>
+=======
+<a name="id681447"></a><p class="title"><b>Table 1.31. Parameters</b></p>
+=======
+<a name="id678170"></a><p class="title"><b>Table 1.31. 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,9 +179,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.value_at.expression_semantics"></a><h6>
<a name="id465789"></a>
<a href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.value_at.expression_semantics"></a><h6>
+<a name="id678286"></a>
+ <a class="link" href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">N</span><span class="special">>::</span><span class="identifier">type</span>
@@ -110,12 +199,41 @@
<span class="bold"><b>Semantics</b></span>: Returns the actual type at
the <tt class="computeroutput"><span class="identifier">N</span></tt>th element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
</p>
-<p>
- /sequence/intrinsic/value_at.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.value_at.header"></a><h6>
+<a name="id678369"></a>
+ <a class="link" href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">value_at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">value_at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.value_at.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id465918"></a>
<a href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.example">Example</a>
+=======
+<a name="id717838"></a>
+=======
+<a name="id679342"></a>
+=======
+<a name="id671696"></a>
+=======
+<a name="id694878"></a>
+=======
+<a name="id683607"></a>
+=======
+<a name="id680331"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::value_at<span class="special"><</span><span class="identifier">vec</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special"><</span><span class="number">1</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">>));</span>
@@ -123,7 +241,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 © 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/sequence/intrinsic/metafunctions/value_at_c.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.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>value_at_c</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="value_at.html" title="value_at">
<link rel="next" href="has_key.html" title="has_key">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.value_at_c.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id466177"></a>
<a href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.description">Description</a>
+=======
+<a name="id718018"></a>
+=======
+<a name="id680274"></a>
+=======
+<a name="id672628"></a>
+=======
+<a name="id695058"></a>
+=======
+<a name="id683787"></a>
+=======
+<a name="id680511"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the actual type at a given index from the Sequence.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.value_at_c.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id466216"></a>
<a href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.synopsis">Synopsis</a>
+=======
+<a name="id718046"></a>
+=======
+<a name="id680301"></a>
+=======
+<a name="id672655"></a>
+=======
+<a name="id695085"></a>
+=======
+<a name="id683815"></a>
+=======
+<a name="id680538"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -49,8 +107,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id466331"></a><p class="title"><b>Table 1.28. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id718132"></a><p class="title"><b>Table 1.28. Parameters</b></p>
+=======
+<a name="id680388"></a><p class="title"><b>Table 1.32. Parameters</b></p>
+=======
+<a name="id672742"></a><p class="title"><b>Table 1.32. Parameters</b></p>
+=======
+<a name="id695172"></a><p class="title"><b>Table 1.32. Parameters</b></p>
+=======
+<a name="id683901"></a><p class="title"><b>Table 1.32. Parameters</b></p>
+=======
+<a name="id680625"></a><p class="title"><b>Table 1.32. 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,9 +178,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.value_at_c.expression_semantics"></a><h6>
<a name="id466468"></a>
<a href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.value_at_c.expression_semantics"></a><h6>
+<a name="id680737"></a>
+ <a class="link" href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_c</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">M</span><span class="special">>::</span><span class="identifier">type</span>
@@ -109,12 +198,41 @@
<span class="bold"><b>Semantics</b></span>: Returns the actual type at
the <tt class="computeroutput"><span class="identifier">M</span></tt>th element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
</p>
-<p>
- /sequence/intrinsic/value_at.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.value_at_c.header"></a><h6>
+<a name="id680823"></a>
+ <a class="link" href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">value_at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">value_at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.value_at_c.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id466598"></a>
<a href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.example">Example</a>
+=======
+<a name="id718334"></a>
+=======
+<a name="id680706"></a>
+=======
+<a name="id673060"></a>
+=======
+<a name="id695490"></a>
+=======
+<a name="id684219"></a>
+=======
+<a name="id680943"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::value_at_c<span class="special"><</span><span class="identifier">vec</span><span class="special">,</span> <span class="number">1</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">>));</span>
@@ -122,7 +240,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 © 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/sequence/intrinsic/metafunctions/value_at_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_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>value_at_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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../metafunctions.html" title="Metafunctions">
<link rel="previous" href="at_key.html" title="at_key">
<link rel="next" href="swap.html" title="swap">
@@ -30,15 +38,65 @@
<div></div>
</div>
<a name="fusion.sequence.intrinsic.metafunctions.value_at_key.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id468523"></a>
<a href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.description">Description</a>
+=======
+<a name="id719741"></a>
+=======
+<a name="id682267"></a>
+=======
+<a name="id674621"></a>
+=======
+<a name="id698212"></a>
+=======
+<a name="id685781"></a>
+=======
+<a name="id682504"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Returns the actual element type associated with a Key from the Sequence.
</p>
<a name="fusion.sequence.intrinsic.metafunctions.value_at_key.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id468561"></a>
<a href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.synopsis">Synopsis</a>
+=======
+<a name="id719765"></a>
+=======
+<a name="id682291"></a>
+=======
+<a name="id674645"></a>
+=======
+<a name="id698236"></a>
+=======
+<a name="id685805"></a>
+=======
+<a name="id682528"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -49,8 +107,33 @@
<span class="special">};</span>
</pre>
<div class="table">
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id468676"></a><p class="title"><b>Table 1.31. Parameters</b></p>
<table class="table" summary="Parameters">
+=======
+<a name="id719851"></a><p class="title"><b>Table 1.31. Parameters</b></p>
+=======
+<a name="id682378"></a><p class="title"><b>Table 1.35. Parameters</b></p>
+=======
+<a name="id674732"></a><p class="title"><b>Table 1.35. Parameters</b></p>
+=======
+<a name="id698322"></a><p class="title"><b>Table 1.35. Parameters</b></p>
+=======
+<a name="id685892"></a><p class="title"><b>Table 1.35. Parameters</b></p>
+=======
+<a name="id682615"></a><p class="title"><b>Table 1.35. 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,9 +178,15 @@
</tbody>
</table>
</div>
+<<<<<<< .working
<a name="fusion.sequence.intrinsic.metafunctions.value_at_key.expression_semantics"></a><h6>
<a name="id468815"></a>
<a href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.expression_semantics">Expression
+=======
+<br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.value_at_key.expression_semantics"></a><h6>
+<a name="id682726"></a>
+ <a class="link" href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_key</span><span class="special"><</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">>::</span><span class="identifier">type</span>
@@ -110,12 +199,41 @@
type associated with key type <tt class="computeroutput"><span class="identifier">Key</span></tt>
in <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
</p>
-<p>
- /sequence/intrinsic/value_at_key.hpp>
- </p>
+<a name="fusion.sequence.intrinsic.metafunctions.value_at_key.header"></a><h6>
+<a name="id682812"></a>
+ <a class="link" href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.header">Header</a>
+ </h6>
+<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">value_at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">value_at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
+</pre>
<a name="fusion.sequence.intrinsic.metafunctions.value_at_key.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id468944"></a>
<a href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.example">Example</a>
+=======
+<a name="id720052"></a>
+=======
+<a name="id682694"></a>
+=======
+<a name="id675049"></a>
+=======
+<a name="id698639"></a>
+=======
+<a name="id686208"></a>
+=======
+<a name="id682932"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">typedef</span> map<span class="special"><</span>pair<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">>,</span> pair<span class="special"><</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">>,</span> pair<span class="special"><</span><span class="keyword">double</span><span class="special">,</span> <span cla
ss="keyword">char</span><span class="special">></span> <span class="special">></span> <span class="identifier">mymap</span><span class="special">;</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span>result_of::at_key<span class="special"><</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">int</span><span class="special">>::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">char</span><span class="special">>));</span>
@@ -123,7 +241,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 © 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/sequence/operator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator.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>Operator</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="../sequence.html" title="Sequence">
<link rel="previous" href="intrinsic/metafunctions/swap.html" title="swap">
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison.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>Comparison</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="../operator.html" title="Operator">
<link rel="previous" href="i_o/out.html" title="out">
@@ -51,10 +55,17 @@
elementary comparisons start from the first elements and are performed
only until the result is clear.
</p>
+<<<<<<< .working
<a name="fusion.sequence.operator.comparison.header"></a><h5>
<a name="id472612"></a>
<a href="comparison.html#fusion.sequence.operator.comparison.header">Header</a>
</h5>
+=======
+<a name="fusion.sequence.operator.comparison.header"></a><h6>
+<a name="id678811"></a>
+ <a class="link" href="comparison.html#fusion.sequence.operator.comparison.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/equal.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/equal.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/equal.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>equal</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../comparison.html" title="Comparison">
<link rel="previous" href="../comparison.html" title="Comparison">
<link rel="next" href="not_equal.html" title="not
@@ -31,23 +39,98 @@
<div></div>
</div>
<a name="fusion.sequence.operator.comparison.equal.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id472785"></a>
<a href="equal.html#fusion.sequence.operator.comparison.equal.description">Description</a>
+=======
+<a name="id723820"></a>
+=======
+<a name="id686575"></a>
+=======
+<a name="id678929"></a>
+=======
+<a name="id701427"></a>
+=======
+<a name="id688996"></a>
+=======
+<a name="id685720"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Compare two sequences for equality.
</p>
<a name="fusion.sequence.operator.comparison.equal.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id472815"></a>
<a href="equal.html#fusion.sequence.operator.comparison.equal.synopsis">Synopsis</a>
+=======
+<a name="id723838"></a>
+=======
+<a name="id686593"></a>
+=======
+<a name="id678947"></a>
+=======
+<a name="id701445"></a>
+=======
+<a name="id689014"></a>
+=======
+<a name="id685738"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">></span>
<span class="keyword">bool</span>
<span class="keyword">operator</span><span class="special">==(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">b</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.operator.comparison.equal.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id472966"></a>
<a href="equal.html#fusion.sequence.operator.comparison.equal.parameters">Parameters</a>
+=======
+<a name="id723945"></a>
+=======
+<a name="id686700"></a>
+=======
+<a name="id679054"></a>
+=======
+<a name="id701552"></a>
+=======
+<a name="id689121"></a>
+=======
+<a name="id685844"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -80,8 +163,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.operator.comparison.equal.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id473097"></a>
<a href="equal.html#fusion.sequence.operator.comparison.equal.expression_semantics">Expression
+=======
+<a name="id724048"></a>
+=======
+<a name="id686803"></a>
+=======
+<a name="id679157"></a>
+=======
+<a name="id701655"></a>
+=======
+<a name="id689224"></a>
+=======
+<a name="id685948"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">a</span> <span class="special">==</span> <span class="identifier">b</span>
@@ -115,15 +223,65 @@
true.
</p>
<a name="fusion.sequence.operator.comparison.equal.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id473355"></a>
<a href="equal.html#fusion.sequence.operator.comparison.equal.header">Header</a>
+=======
+<a name="id724222"></a>
+=======
+<a name="id686977"></a>
+=======
+<a name="id679331"></a>
+=======
+<a name="id701829"></a>
+=======
+<a name="id689398"></a>
+=======
+<a name="id686122"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.operator.comparison.equal.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id473522"></a>
<a href="equal.html#fusion.sequence.operator.comparison.equal.example">Example</a>
+=======
+<a name="id724338"></a>
+=======
+<a name="id687092"></a>
+=======
+<a name="id679446"></a>
+=======
+<a name="id701944"></a>
+=======
+<a name="id689514"></a>
+=======
+<a name="id686237"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">></span> <span class="identifier">v1</span><span class="special">(</span><span class="number">5</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"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">></span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
@@ -132,7 +290,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 © 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/sequence/operator/comparison/greater_than.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>greater
than</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../comparison.html" title="Comparison">
<link rel="previous" href="less_than_equal.html" title="less
than equal">
@@ -38,16 +46,66 @@
Lexicographically compare two sequences.
</p>
<a name="fusion.sequence.operator.comparison.greater_than.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id476656"></a>
<a href="greater_than.html#fusion.sequence.operator.comparison.greater_than.synopsis">Synopsis</a>
+=======
+<a name="id728882"></a>
+=======
+<a name="id689588"></a>
+=======
+<a name="id681942"></a>
+=======
+<a name="id705260"></a>
+=======
+<a name="id692829"></a>
+=======
+<a name="id689552"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="greater_than.html#fusion.sequence.operator.comparison.greater_than.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">></span>
<span class="keyword">bool</span>
<span class="keyword">operator</span><span class="special">>(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">b</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.operator.comparison.greater_than.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id476808"></a>
<a href="greater_than.html#fusion.sequence.operator.comparison.greater_than.parameters">Parameters</a>
+=======
+<a name="id728993"></a>
+=======
+<a name="id689700"></a>
+=======
+<a name="id682054"></a>
+=======
+<a name="id705371"></a>
+=======
+<a name="id692940"></a>
+=======
+<a name="id689664"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="greater_than.html#fusion.sequence.operator.comparison.greater_than.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -80,8 +138,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.operator.comparison.greater_than.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id476940"></a>
<a href="greater_than.html#fusion.sequence.operator.comparison.greater_than.expression_semantics">Expression
+=======
+<a name="id729096"></a>
+=======
+<a name="id689803"></a>
+=======
+<a name="id682157"></a>
+=======
+<a name="id705474"></a>
+=======
+<a name="id693044"></a>
+=======
+<a name="id689767"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="greater_than.html#fusion.sequence.operator.comparison.greater_than.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">a</span> <span class="special">></span> <span class="identifier">b</span>
@@ -107,15 +190,65 @@
<span class="bold"><b>Semantics</b></span>: Returns b < a.
</p>
<a name="fusion.sequence.operator.comparison.greater_than.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id477117"></a>
<a href="greater_than.html#fusion.sequence.operator.comparison.greater_than.header">Header</a>
+=======
+<a name="id729213"></a>
+=======
+<a name="id689919"></a>
+=======
+<a name="id682273"></a>
+=======
+<a name="id705591"></a>
+=======
+<a name="id693160"></a>
+=======
+<a name="id689883"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="greater_than.html#fusion.sequence.operator.comparison.greater_than.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">less_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">less_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.operator.comparison.greater_than.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id477284"></a>
<a href="greater_than.html#fusion.sequence.operator.comparison.greater_than.example">Example</a>
+=======
+<a name="id729330"></a>
+=======
+<a name="id690037"></a>
+=======
+<a name="id682391"></a>
+=======
+<a name="id705708"></a>
+=======
+<a name="id693278"></a>
+=======
+<a name="id690001"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="greater_than.html#fusion.sequence.operator.comparison.greater_than.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</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"><</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
@@ -126,7 +259,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 © 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/sequence/operator/comparison/greater_than_equal.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>greater
than equal</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../comparison.html" title="Comparison">
<link rel="previous" href="greater_than.html" title="greater
than">
@@ -37,16 +45,66 @@
Lexicographically compare two sequences.
</p>
<a name="fusion.sequence.operator.comparison.greater_than_equal.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id477625"></a>
<a href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.synopsis">Synopsis</a>
+=======
+<a name="id729575"></a>
+=======
+<a name="id691921"></a>
+=======
+<a name="id684275"></a>
+=======
+<a name="id706636"></a>
+=======
+<a name="id694206"></a>
+=======
+<a name="id690929"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">></span>
<span class="keyword">bool</span>
<span class="keyword">operator</span><span class="special">>=(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">b</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.operator.comparison.greater_than_equal.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id477779"></a>
<a href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.parameters">Parameters</a>
+=======
+<a name="id729684"></a>
+=======
+<a name="id692030"></a>
+=======
+<a name="id684384"></a>
+=======
+<a name="id706746"></a>
+=======
+<a name="id694315"></a>
+=======
+<a name="id691038"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -79,8 +137,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.operator.comparison.greater_than_equal.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id477911"></a>
<a href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.expression_semantics">Expression
+=======
+<a name="id729854"></a>
+=======
+<a name="id692131"></a>
+=======
+<a name="id684485"></a>
+=======
+<a name="id706846"></a>
+=======
+<a name="id694416"></a>
+=======
+<a name="id691139"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">a</span> <span class="special">>=</span> <span class="identifier">b</span>
@@ -106,15 +189,65 @@
<span class="bold"><b>Semantics</b></span>: Returns !(a < b).
</p>
<a name="fusion.sequence.operator.comparison.greater_than_equal.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id478087"></a>
<a href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.header">Header</a>
+=======
+<a name="id729973"></a>
+=======
+<a name="id692249"></a>
+=======
+<a name="id684604"></a>
+=======
+<a name="id706965"></a>
+=======
+<a name="id694534"></a>
+=======
+<a name="id691258"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">greater_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">greater_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.operator.comparison.greater_than_equal.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id478255"></a>
<a href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.example">Example</a>
+=======
+<a name="id730093"></a>
+=======
+<a name="id692369"></a>
+=======
+<a name="id684724"></a>
+=======
+<a name="id707085"></a>
+=======
+<a name="id694654"></a>
+=======
+<a name="id691378"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</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"><</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
@@ -125,7 +258,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 © 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/sequence/operator/comparison/less_than.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>less
than</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../comparison.html" title="Comparison">
<link rel="previous" href="not_equal.html" title="not
equal">
@@ -38,16 +46,66 @@
Lexicographically compare two sequences.
</p>
<a name="fusion.sequence.operator.comparison.less_than.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id474689"></a>
<a href="less_than.html#fusion.sequence.operator.comparison.less_than.synopsis">Synopsis</a>
+=======
+<a name="id725161"></a>
+=======
+<a name="id688189"></a>
+=======
+<a name="id680543"></a>
+=======
+<a name="id703860"></a>
+=======
+<a name="id691430"></a>
+=======
+<a name="id688153"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="less_than.html#fusion.sequence.operator.comparison.less_than.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">></span>
<span class="keyword">bool</span>
<span class="keyword">operator</span><span class="special"><(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">b</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.operator.comparison.less_than.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id474841"></a>
<a href="less_than.html#fusion.sequence.operator.comparison.less_than.parameters">Parameters</a>
+=======
+<a name="id727592"></a>
+=======
+<a name="id688298"></a>
+=======
+<a name="id680652"></a>
+=======
+<a name="id703970"></a>
+=======
+<a name="id691539"></a>
+=======
+<a name="id688262"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="less_than.html#fusion.sequence.operator.comparison.less_than.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -80,8 +138,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.operator.comparison.less_than.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id474973"></a>
<a href="less_than.html#fusion.sequence.operator.comparison.less_than.expression_semantics">Expression
+=======
+<a name="id727695"></a>
+=======
+<a name="id688401"></a>
+=======
+<a name="id680755"></a>
+=======
+<a name="id704073"></a>
+=======
+<a name="id691642"></a>
+=======
+<a name="id688365"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="less_than.html#fusion.sequence.operator.comparison.less_than.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">a</span> <span class="special"><</span> <span class="identifier">b</span>
@@ -109,15 +192,65 @@
and <tt class="computeroutput"><span class="identifier">b</span></tt>.
</p>
<a name="fusion.sequence.operator.comparison.less_than.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id475172"></a>
<a href="less_than.html#fusion.sequence.operator.comparison.less_than.header">Header</a>
+=======
+<a name="id727826"></a>
+=======
+<a name="id688532"></a>
+=======
+<a name="id680886"></a>
+=======
+<a name="id704204"></a>
+=======
+<a name="id691773"></a>
+=======
+<a name="id688496"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="less_than.html#fusion.sequence.operator.comparison.less_than.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">less</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">less</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.operator.comparison.less_than.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id475339"></a>
<a href="less_than.html#fusion.sequence.operator.comparison.less_than.example">Example</a>
+=======
+<a name="id727941"></a>
+=======
+<a name="id688647"></a>
+=======
+<a name="id681001"></a>
+=======
+<a name="id704319"></a>
+=======
+<a name="id691888"></a>
+=======
+<a name="id688611"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="less_than.html#fusion.sequence.operator.comparison.less_than.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</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"><</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
@@ -128,7 +261,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 © 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/sequence/operator/comparison/less_than_equal.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than_equal.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than_equal.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>less
than equal</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../comparison.html" title="Comparison">
<link rel="previous" href="less_than.html" title="less
than">
@@ -38,16 +46,66 @@
Lexicographically compare two sequences.
</p>
<a name="fusion.sequence.operator.comparison.less_than_equal.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id475682"></a>
<a href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.synopsis">Synopsis</a>
+=======
+<a name="id728183"></a>
+=======
+<a name="id688890"></a>
+=======
+<a name="id681244"></a>
+=======
+<a name="id704561"></a>
+=======
+<a name="id692130"></a>
+=======
+<a name="id688854"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">></span>
<span class="keyword">bool</span>
<span class="keyword">operator</span><span class="special"><=(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">b</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.operator.comparison.less_than_equal.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id475835"></a>
<a href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.parameters">Parameters</a>
+=======
+<a name="id728295"></a>
+=======
+<a name="id689001"></a>
+=======
+<a name="id681355"></a>
+=======
+<a name="id704673"></a>
+=======
+<a name="id692242"></a>
+=======
+<a name="id688965"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -80,8 +138,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.operator.comparison.less_than_equal.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id475968"></a>
<a href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.expression_semantics">Expression
+=======
+<a name="id728398"></a>
+=======
+<a name="id689104"></a>
+=======
+<a name="id681459"></a>
+=======
+<a name="id704776"></a>
+=======
+<a name="id692345"></a>
+=======
+<a name="id689068"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">a</span> <span class="special"><=</span> <span class="identifier">b</span>
@@ -107,15 +190,65 @@
<span class="bold"><b>Semantics</b></span>: Returns !(b < a).
</p>
<a name="fusion.sequence.operator.comparison.less_than_equal.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id476144"></a>
<a href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.header">Header</a>
+=======
+<a name="id728517"></a>
+=======
+<a name="id689223"></a>
+=======
+<a name="id681577"></a>
+=======
+<a name="id704895"></a>
+=======
+<a name="id692464"></a>
+=======
+<a name="id689187"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">less_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">less_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.operator.comparison.less_than_equal.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id476312"></a>
<a href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.example">Example</a>
+=======
+<a name="id728637"></a>
+=======
+<a name="id689343"></a>
+=======
+<a name="id681697"></a>
+=======
+<a name="id705015"></a>
+=======
+<a name="id692584"></a>
+=======
+<a name="id689307"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</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"><</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">></span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
@@ -126,7 +259,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 © 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/sequence/operator/comparison/not_equal.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/not_equal.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/not_equal.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -1,11 +1,19 @@
<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>not
equal</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../comparison.html" title="Comparison">
<link rel="previous" href="equal.html" title="equal">
<link rel="next" href="less_than.html" title="less
@@ -37,16 +45,66 @@
Compare two sequences for inequality.
</p>
<a name="fusion.sequence.operator.comparison.not_equal.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id473757"></a>
<a href="not_equal.html#fusion.sequence.operator.comparison.not_equal.synopsis">Synopsis</a>
+=======
+<a name="id724501"></a>
+=======
+<a name="id687255"></a>
+=======
+<a name="id679609"></a>
+=======
+<a name="id702108"></a>
+=======
+<a name="id689677"></a>
+=======
+<a name="id686400"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="not_equal.html#fusion.sequence.operator.comparison.not_equal.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">></span>
<span class="keyword">bool</span>
<span class="keyword">operator</span><span class="special">!=(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&</span> <span class="identifier">b</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.operator.comparison.not_equal.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id473909"></a>
<a href="not_equal.html#fusion.sequence.operator.comparison.not_equal.parameters">Parameters</a>
+=======
+<a name="id724610"></a>
+=======
+<a name="id687364"></a>
+=======
+<a name="id679719"></a>
+=======
+<a name="id702217"></a>
+=======
+<a name="id689786"></a>
+=======
+<a name="id686509"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="not_equal.html#fusion.sequence.operator.comparison.not_equal.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -79,8 +137,33 @@
</tr></tbody>
</table></div>
<a name="fusion.sequence.operator.comparison.not_equal.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id474042"></a>
<a href="not_equal.html#fusion.sequence.operator.comparison.not_equal.expression_semantics">Expression
+=======
+<a name="id724713"></a>
+=======
+<a name="id687468"></a>
+=======
+<a name="id679822"></a>
+=======
+<a name="id702320"></a>
+=======
+<a name="id689889"></a>
+=======
+<a name="id686612"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="not_equal.html#fusion.sequence.operator.comparison.not_equal.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">a</span> <span class="special">!=</span> <span class="identifier">b</span>
@@ -109,15 +192,65 @@
Returns !(a == b).
</p>
<a name="fusion.sequence.operator.comparison.not_equal.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id474221"></a>
<a href="not_equal.html#fusion.sequence.operator.comparison.not_equal.header">Header</a>
+=======
+<a name="id724833"></a>
+=======
+<a name="id687588"></a>
+=======
+<a name="id679942"></a>
+=======
+<a name="id702440"></a>
+=======
+<a name="id690009"></a>
+=======
+<a name="id686732"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="not_equal.html#fusion.sequence.operator.comparison.not_equal.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">not_equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">not_equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.operator.comparison.not_equal.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id474388"></a>
<a href="not_equal.html#fusion.sequence.operator.comparison.not_equal.example">Example</a>
+=======
+<a name="id724948"></a>
+=======
+<a name="id687703"></a>
+=======
+<a name="id680057"></a>
+=======
+<a name="id703648"></a>
+=======
+<a name="id691217"></a>
+=======
+<a name="id687940"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="not_equal.html#fusion.sequence.operator.comparison.not_equal.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">></span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="char">'b'</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"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">></span> <span class="identifier">t4</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
@@ -128,7 +261,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 © 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/sequence/operator/i_o.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o.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>I/O</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="../operator.html" title="Operator">
<link rel="previous" href="../operator.html" title="Operator">
@@ -115,10 +119,17 @@
not generally work, since the streamed Sequence
representation may not be unambiguously parseable.
</p>
+<<<<<<< .working
<a name="fusion.sequence.operator.i_o.header"></a><h5>
<a name="id470864"></a>
<a href="i_o.html#fusion.sequence.operator.i_o.header">Header</a>
</h5>
+=======
+<a name="fusion.sequence.operator.i_o.header"></a><h6>
+<a name="id676501"></a>
+ <a class="link" href="i_o.html#fusion.sequence.operator.i_o.header">Header</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">io</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">io</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/in.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/in.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/in.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>in</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../i_o.html" title="I/O">
<link rel="previous" href="../i_o.html" title="I/O">
<link rel="next" href="out.html" title="out">
@@ -30,24 +38,99 @@
<div></div>
</div>
<a name="fusion.sequence.operator.i_o.in.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id471038"></a>
<a href="in.html#fusion.sequence.operator.i_o.in.description">Description</a>
+=======
+<a name="id721510"></a>
+=======
+<a name="id684264"></a>
+=======
+<a name="id676618"></a>
+=======
+<a name="id700209"></a>
+=======
+<a name="id687778"></a>
+=======
+<a name="id684501"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="in.html#fusion.sequence.operator.i_o.in.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Read a Sequence from an input
stream.
</p>
<a name="fusion.sequence.operator.i_o.in.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id471075"></a>
<a href="in.html#fusion.sequence.operator.i_o.in.synopsis">Synopsis</a>
+=======
+<a name="id721531"></a>
+=======
+<a name="id684286"></a>
+=======
+<a name="id676640"></a>
+=======
+<a name="id700230"></a>
+=======
+<a name="id687800"></a>
+=======
+<a name="id684523"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="in.html#fusion.sequence.operator.i_o.in.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">IStream</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="identifier">IStream</span><span class="special">&</span>
<span class="keyword">operator</span><span class="special">>>(</span><span class="identifier">IStream</span><span class="special">&</span> <span class="identifier">is</span><span class="special">,</span> <span class="identifier">Sequence</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.operator.i_o.in.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id471219"></a>
<a href="in.html#fusion.sequence.operator.i_o.in.parameters">Parameters</a>
+=======
+<a name="id721632"></a>
+=======
+<a name="id684386"></a>
+=======
+<a name="id676741"></a>
+=======
+<a name="id700331"></a>
+=======
+<a name="id687901"></a>
+=======
+<a name="id684624"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="in.html#fusion.sequence.operator.i_o.in.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -92,8 +175,33 @@
</tbody>
</table></div>
<a name="fusion.sequence.operator.i_o.in.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id471348"></a>
<a href="in.html#fusion.sequence.operator.i_o.in.expression_semantics">Expression
+=======
+<a name="id721738"></a>
+=======
+<a name="id684492"></a>
+=======
+<a name="id676846"></a>
+=======
+<a name="id700437"></a>
+=======
+<a name="id688006"></a>
+=======
+<a name="id684730"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="in.html#fusion.sequence.operator.i_o.in.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">is</span> <span class="special">>></span> <span class="identifier">seq</span>
@@ -107,15 +215,65 @@
<span class="identifier">e</span></tt>.
</p>
<a name="fusion.sequence.operator.i_o.in.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id471465"></a>
<a href="in.html#fusion.sequence.operator.i_o.in.header">Header</a>
+=======
+<a name="id721817"></a>
+=======
+<a name="id685664"></a>
+=======
+<a name="id678018"></a>
+=======
+<a name="id700516"></a>
+=======
+<a name="id688086"></a>
+=======
+<a name="id684809"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="in.html#fusion.sequence.operator.i_o.in.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">io</span><span class="special">/</span><span class="identifier">in</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">in</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.operator.i_o.in.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id471630"></a>
<a href="in.html#fusion.sequence.operator.i_o.in.example">Example</a>
+=======
+<a name="id723025"></a>
+=======
+<a name="id685779"></a>
+=======
+<a name="id678133"></a>
+=======
+<a name="id700632"></a>
+=======
+<a name="id688201"></a>
+=======
+<a name="id684924"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="in.html#fusion.sequence.operator.i_o.in.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting">vector<span class="special"><</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">,</span> <span class="keyword">char</span><span class="special">></span> <span class="identifier">v</span><span class="special">;</span>
<span class="identifier">std</span><span class="special">::</span><span class="identifier">cin</span> <span class="special">>></span> <span class="identifier">v</span><span class="special">;</span>
@@ -123,7 +281,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 © 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/sequence/operator/i_o/out.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/out.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/out.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>out</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="up" href="../i_o.html" title="I/O">
<link rel="previous" href="in.html" title="in">
<link rel="next" href="../comparison.html" title="Comparison">
@@ -30,24 +38,99 @@
<div></div>
</div>
<a name="fusion.sequence.operator.i_o.out.description"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id471787"></a>
<a href="out.html#fusion.sequence.operator.i_o.out.description">Description</a>
+=======
+<a name="id723130"></a>
+=======
+<a name="id685885"></a>
+=======
+<a name="id678239"></a>
+=======
+<a name="id700737"></a>
+=======
+<a name="id688306"></a>
+=======
+<a name="id685030"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="out.html#fusion.sequence.operator.i_o.out.description">Description</a>
+>>>>>>> .merge-right.r57125
</h6>
<p>
Write a Sequence to an output
stream.
</p>
<a name="fusion.sequence.operator.i_o.out.synopsis"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id471825"></a>
<a href="out.html#fusion.sequence.operator.i_o.out.synopsis">Synopsis</a>
+=======
+<a name="id723152"></a>
+=======
+<a name="id685906"></a>
+=======
+<a name="id678261"></a>
+=======
+<a name="id700759"></a>
+=======
+<a name="id688328"></a>
+=======
+<a name="id685051"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="out.html#fusion.sequence.operator.i_o.out.synopsis">Synopsis</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">OStream</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="identifier">OStream</span><span class="special">&</span>
<span class="keyword">operator</span><span class="special"><<(</span><span class="identifier">OStream</span><span class="special">&</span> <span class="identifier">os</span><span class="special">,</span> <span class="identifier">Sequence</span><span class="special">&</span> <span class="identifier">seq</span><span class="special">);</span>
</pre>
<a name="fusion.sequence.operator.i_o.out.parameters"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id471969"></a>
<a href="out.html#fusion.sequence.operator.i_o.out.parameters">Parameters</a>
+=======
+<a name="id723253"></a>
+=======
+<a name="id686007"></a>
+=======
+<a name="id678361"></a>
+=======
+<a name="id700860"></a>
+=======
+<a name="id688429"></a>
+=======
+<a name="id685152"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="out.html#fusion.sequence.operator.i_o.out.parameters">Parameters</a>
+>>>>>>> .merge-right.r57125
</h6>
<div class="informaltable"><table class="table">
<colgroup>
@@ -92,8 +175,33 @@
</tbody>
</table></div>
<a name="fusion.sequence.operator.i_o.out.expression_semantics"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id472097"></a>
<a href="out.html#fusion.sequence.operator.i_o.out.expression_semantics">Expression
+=======
+<a name="id723358"></a>
+=======
+<a name="id686113"></a>
+=======
+<a name="id678467"></a>
+=======
+<a name="id700965"></a>
+=======
+<a name="id688534"></a>
+=======
+<a name="id685258"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="out.html#fusion.sequence.operator.i_o.out.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h6>
<pre class="programlisting"><span class="identifier">os</span> <span class="special"><<</span> <span class="identifier">seq</span>
@@ -107,22 +215,72 @@
<span class="identifier">e</span></tt>.
</p>
<a name="fusion.sequence.operator.i_o.out.header"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id472215"></a>
<a href="out.html#fusion.sequence.operator.i_o.out.header">Header</a>
+=======
+<a name="id723438"></a>
+=======
+<a name="id686192"></a>
+=======
+<a name="id678546"></a>
+=======
+<a name="id701044"></a>
+=======
+<a name="id688614"></a>
+=======
+<a name="id685337"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="out.html#fusion.sequence.operator.i_o.out.header">Header</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="preprocessor">#include</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">sequence</span><span class="special">/</span><span class="identifier">io</span><span class="special">/</span><span class="identifier">out</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">out</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
<a name="fusion.sequence.operator.i_o.out.example"></a><h6>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<a name="id472381"></a>
<a href="out.html#fusion.sequence.operator.i_o.out.example">Example</a>
+=======
+<a name="id723553"></a>
+=======
+<a name="id686307"></a>
+=======
+<a name="id678661"></a>
+=======
+<a name="id701160"></a>
+=======
+<a name="id688729"></a>
+=======
+<a name="id685452"></a>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+ <a class="link" href="out.html#fusion.sequence.operator.i_o.out.example">Example</a>
+>>>>>>> .merge-right.r57125
</h6>
<pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special"><<</span> make_vector<span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"Hello"</span><span class="special">,</span> <span class="char">'x'</span><span class="special">)</span> <span class="special"><<</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</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 © 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/support.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/support.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>Support</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="organization.html" title="Organization">
Modified: branches/release/libs/fusion/doc/html/fusion/support/category_of.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/category_of.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/support/category_of.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>category_of</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="../support.html" title="Support">
<link rel="previous" href="tag_of.html" title="tag_of">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="tag_of.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.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="deduce.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="id415166"></a>
<a href="category_of.html#fusion.support.category_of.description">Description</a>
</h4>
+=======
+<div class="section" title="category_of">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.support.category_of"></a><a class="link" href="category_of.html" title="category_of">category_of</a>
+</h3></div></div></div>
+<a name="fusion.support.category_of.description"></a><h5>
+<a name="id614510"></a>
+ <a class="link" href="category_of.html#fusion.support.category_of.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
A metafunction that establishes the conceptual classification of a particular
<a href="../sequence.html" title="Sequence">Sequence</a> or <a href="../iterator.html" title="Iterator">Iterator</a>
(see Iterator Concepts and
<a href="../sequence/concepts.html" title="Concepts">Sequence Concepts</a>).
</p>
+<<<<<<< .working
<a name="fusion.support.category_of.synopsis"></a><h4>
<a name="id415216"></a>
<a href="category_of.html#fusion.support.category_of.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.support.category_of.synopsis"></a><h5>
+<a name="id614546"></a>
+ <a class="link" href="category_of.html#fusion.support.category_of.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
<span class="special">{</span>
<span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">></span>
@@ -52,10 +74,17 @@
<span class="special">};</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.support.category_of.parameters"></a><h4>
<a name="id415332"></a>
<a href="category_of.html#fusion.support.category_of.parameters">Parameters</a>
</h4>
+=======
+<a name="fusion.support.category_of.parameters"></a><h5>
+<a name="id614639"></a>
+ <a class="link" href="category_of.html#fusion.support.category_of.parameters">Parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -85,9 +114,15 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.support.category_of.expression_semantics"></a><h4>
<a name="id415431"></a>
<a href="category_of.html#fusion.support.category_of.expression_semantics">Expression
+=======
+<a name="fusion.support.category_of.expression_semantics"></a><h5>
+<a name="id614722"></a>
+ <a class="link" href="category_of.html#fusion.support.category_of.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h4>
<pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">category_of</span><span class="special"><</span><span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">category</span><span class="special">;</span>
@@ -96,27 +131,7 @@
<span class="bold"><b>Return type</b></span>:
</p>
<p>
- For Iterators, the return type is derived from one of:
- </p>
-<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span> <span class="keyword">namespace</span> <span class="identifier">fusion</span>
-<span class="special">{</span>
- <span class="keyword">struct</span> <span class="identifier">incrementable_traversal_tag</span> <span class="special">{};</span>
-
- <span class="keyword">struct</span> <span class="identifier">single_pass_traversal_tag</span>
- <span class="special">:</span> <span class="identifier">incrementable_traversal_tag</span> <span class="special">{};</span>
-
- <span class="keyword">struct</span> <span class="identifier">forward_traversal_tag</span>
- <span class="special">:</span> <span class="identifier">single_pass_traversal_tag</span> <span class="special">{};</span>
-
- <span class="keyword">struct</span> <span class="identifier">bidirectional_traversal_tag</span>
- <span class="special">:</span> <span class="identifier">forward_traversal_tag</span> <span class="special">{};</span>
-
- <span class="keyword">struct</span> <span class="identifier">random_access_traversal_tag</span>
- <span class="special">:</span> <span class="identifier">bidirectional_traversal_tag</span> <span class="special">{};</span>
-<span class="special">}}</span>
-</pre>
-<p>
- For Sequences, the return type is derived from one of:
+ The return type is derived from one of:
</p>
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span> <span class="keyword">namespace</span> <span class="identifier">fusion</span>
<span class="special">{</span>
@@ -140,24 +155,38 @@
</p>
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span> <span class="keyword">namespace</span> <span class="identifier">fusion</span>
<span class="special">{</span>
- <span class="keyword">struct</span> <span class="identifier">associative_sequence_tag</span> <span class="special">{};</span>
+ <span class="keyword">struct</span> <span class="identifier">associative_tag</span> <span class="special">{};</span>
<span class="special">}}</span>
</pre>
<p>
<span class="bold"><b>Semantics</b></span>: Establishes the conceptual classification
of a particular Sequence or Iterator.
</p>
+<<<<<<< .working
<a name="fusion.support.category_of.header"></a><h4>
<a name="id415978"></a>
<a href="category_of.html#fusion.support.category_of.header">Header</a>
</h4>
+=======
+<a name="fusion.support.category_of.header"></a><h5>
+<a name="id616377"></a>
+ <a class="link" href="category_of.html#fusion.support.category_of.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">support</span><span class="special">/</span><span class="identifier">category_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">category_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.support.category_of.example"></a><h4>
<a name="id416116"></a>
<a href="category_of.html#fusion.support.category_of.example">Example</a>
</h4>
+=======
+<a name="fusion.support.category_of.example"></a><h5>
+<a name="id616485"></a>
+ <a class="link" href="category_of.html#fusion.support.category_of.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_base_of</span><span class="special">;</span>
<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">category_of</span><span class="special"><</span>list<span class="special"><></span> <span class="special">>::</span><span class="identifier">type</span> <span class="identifier">list_category</span><span class="special">;</span>
<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">category_of</span><span class="special"><</span>vector<span class="special"><></span> <span class="special">>::</span><span class="identifier">type</span> <span class="identifier">vector_category</span><span class="special">;</span>
Modified: branches/release/libs/fusion/doc/html/fusion/support/deduce.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/deduce.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/support/deduce.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>deduce</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="../support.html" title="Support">
<link rel="previous" href="category_of.html" title="category_of">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="category_of.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.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="deduce_sequence.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="id416406"></a>
<a href="deduce.html#fusion.support.deduce.description">Description</a>
</h4>
+=======
+<div class="section" title="deduce">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.support.deduce"></a><a class="link" href="deduce.html" title="deduce">deduce</a>
+</h3></div></div></div>
+<a name="fusion.support.deduce.description"></a><h5>
+<a name="id616706"></a>
+ <a class="link" href="deduce.html#fusion.support.deduce.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Metafunction to apply <a href="../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
conversion</em></span></a> to the full argument type.
@@ -42,17 +57,31 @@
references to array types are kept, even if the array is <tt class="computeroutput"><span class="keyword">const</span></tt>.
Reference wrappers are removed (see boost::ref).
</p>
+<<<<<<< .working
<a name="fusion.support.deduce.header"></a><h4>
<a name="id416503"></a>
<a href="deduce.html#fusion.support.deduce.header">Header</a>
</h4>
+=======
+<a name="fusion.support.deduce.header"></a><h5>
+<a name="id616763"></a>
+ <a class="link" href="deduce.html#fusion.support.deduce.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">support</span><span class="special">/</span><span class="identifier">deduce</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">deduce</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.support.deduce.synopsis"></a><h4>
<a name="id416658"></a>
<a href="deduce.html#fusion.support.deduce.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.support.deduce.synopsis"></a><h5>
+<a name="id616871"></a>
+ <a class="link" href="deduce.html#fusion.support.deduce.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
<span class="special">{</span>
<span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">></span>
@@ -62,10 +91,17 @@
<span class="special">};</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.support.deduce.example"></a><h4>
<a name="id416787"></a>
<a href="deduce.html#fusion.support.deduce.example">Example</a>
</h4>
+=======
+<a name="fusion.support.deduce.example"></a><h5>
+<a name="id616965"></a>
+ <a class="link" href="deduce.html#fusion.support.deduce.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">holder</span>
<span class="special">{</span>
@@ -82,11 +118,19 @@
<span class="keyword">return</span> <span class="identifier">holder</span><span class="special"><</span><span class="identifier">T</span><span class="special">>(</span><span class="identifier">a</span><span class="special">);</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.support.deduce.see_also"></a><h4>
<a name="id417150"></a>
<a href="deduce.html#fusion.support.deduce.see_also">See also</a>
</h4>
<div class="itemizedlist"><ul type="disc"><li>deduce_sequence</li></ul></div>
+=======
+<a name="fusion.support.deduce.see_also"></a><h5>
+<a name="id617233"></a>
+ <a class="link" href="deduce.html#fusion.support.deduce.see_also">See also</a>
+ </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="deduce_sequence.html" title="deduce_sequence"><code class="computeroutput"><span class="identifier">deduce_sequence</span></code></a></li></ul></div>
+>>>>>>> .merge-right.r57125
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
Modified: branches/release/libs/fusion/doc/html/fusion/support/deduce_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/deduce_sequence.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/support/deduce_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>deduce_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="../support.html" title="Support">
<link rel="previous" href="deduce.html" title="deduce">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="deduce.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.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="pair.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="id417217"></a>
<a href="deduce_sequence.html#fusion.support.deduce_sequence.description">Description</a>
</h4>
+=======
+<div class="section" title="deduce_sequence">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.support.deduce_sequence"></a><a class="link" href="deduce_sequence.html" title="deduce_sequence">deduce_sequence</a>
+</h3></div></div></div>
+<a name="fusion.support.deduce_sequence.description"></a><h5>
+<a name="id617273"></a>
+ <a class="link" href="deduce_sequence.html#fusion.support.deduce_sequence.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Applies <a href="../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
conversion</em></span></a> to each element in a <a href="../sequence/concepts/forward_sequence.html" title="Forward
@@ -42,17 +57,31 @@
Access Sequence</a> that provides a converting constructor accepting the
original type as its argument.
</p>
+<<<<<<< .working
<a name="fusion.support.deduce_sequence.header"></a><h4>
<a name="id417277"></a>
<a href="deduce_sequence.html#fusion.support.deduce_sequence.header">Header</a>
</h4>
+=======
+<a name="fusion.support.deduce_sequence.header"></a><h5>
+<a name="id617306"></a>
+ <a class="link" href="deduce_sequence.html#fusion.support.deduce_sequence.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">support</span><span class="special">/</span><span class="identifier">deduce_sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">deduce_sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.support.deduce_sequence.synopsis"></a><h4>
<a name="id417432"></a>
<a href="deduce_sequence.html#fusion.support.deduce_sequence.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.support.deduce_sequence.synopsis"></a><h5>
+<a name="id617414"></a>
+ <a class="link" href="deduce_sequence.html#fusion.support.deduce_sequence.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
<span class="special">{</span>
<span class="keyword">template</span> <span class="special"><</span><span class="keyword">class</span> <span class="identifier">Sequence</span><span class="special">></span>
@@ -62,10 +91,17 @@
<span class="special">};</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.support.deduce_sequence.example"></a><h4>
<a name="id417561"></a>
<a href="deduce_sequence.html#fusion.support.deduce_sequence.example">Example</a>
</h4>
+=======
+<a name="fusion.support.deduce_sequence.example"></a><h5>
+<a name="id617507"></a>
+ <a class="link" href="deduce_sequence.html#fusion.support.deduce_sequence.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">holder</span>
<span class="special">{</span>
@@ -84,11 +120,19 @@
<span class="keyword">return</span> <span class="identifier">holder</span><span class="special"><</span><span class="identifier">arg_vec_t</span><span class="special">>(</span> <span class="identifier">arg_vec_t</span><span class="special">(</span><span class="identifier">a0</span><span class="special">,</span><span class="identifier">a1</span><span class="special">)</span> <span class="special">);</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.support.deduce_sequence.see_also"></a><h4>
<a name="id418120"></a>
<a href="deduce_sequence.html#fusion.support.deduce_sequence.see_also">See also</a>
</h4>
<div class="itemizedlist"><ul type="disc"><li>deduce</li></ul></div>
+=======
+<a name="fusion.support.deduce_sequence.see_also"></a><h5>
+<a name="id617918"></a>
+ <a class="link" href="deduce_sequence.html#fusion.support.deduce_sequence.see_also">See also</a>
+ </h5>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li></ul></div>
+>>>>>>> .merge-right.r57125
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
Modified: branches/release/libs/fusion/doc/html/fusion/support/is_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/is_sequence.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/support/is_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>is_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="../support.html" title="Support">
<link rel="previous" href="../support.html" title="Support">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="../support.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.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="is_view.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="id412300"></a>
<a href="is_sequence.html#fusion.support.is_sequence.description">Description</a>
</h4>
+=======
+<div class="section" title="is_sequence">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.support.is_sequence"></a><a class="link" href="is_sequence.html" title="is_sequence">is_sequence</a>
+</h3></div></div></div>
+<a name="fusion.support.is_sequence.description"></a><h5>
+<a name="id612247"></a>
+ <a class="link" href="is_sequence.html#fusion.support.is_sequence.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Metafunction that evaluates to <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>
if a certain type <tt class="computeroutput"><span class="identifier">T</span></tt> is a
@@ -40,10 +55,17 @@
otherwise. This may be specialized to accomodate clients which provide Fusion
conforming sequences.
</p>
+<<<<<<< .working
<a name="fusion.support.is_sequence.synopsis"></a><h4>
<a name="id412380"></a>
<a href="is_sequence.html#fusion.support.is_sequence.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.support.is_sequence.synopsis"></a><h5>
+<a name="id612305"></a>
+ <a class="link" href="is_sequence.html#fusion.support.is_sequence.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
<span class="special">{</span>
<span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">></span>
@@ -53,10 +75,17 @@
<span class="special">};</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.support.is_sequence.parameters"></a><h4>
<a name="id412496"></a>
<a href="is_sequence.html#fusion.support.is_sequence.parameters">Parameters</a>
</h4>
+=======
+<a name="fusion.support.is_sequence.parameters"></a><h5>
+<a name="id612398"></a>
+ <a class="link" href="is_sequence.html#fusion.support.is_sequence.parameters">Parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -86,9 +115,15 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.support.is_sequence.expression_semantics"></a><h4>
<a name="id412595"></a>
<a href="is_sequence.html#fusion.support.is_sequence.expression_semantics">Expression
+=======
+<a name="fusion.support.is_sequence.expression_semantics"></a><h5>
+<a name="id612481"></a>
+ <a class="link" href="is_sequence.html#fusion.support.is_sequence.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h4>
<pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special"><</span><span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">c</span><span class="special">;</span>
@@ -103,17 +138,31 @@
is a conforming Fusion sequence, <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt>
otherwise.
</p>
+<<<<<<< .working
<a name="fusion.support.is_sequence.header"></a><h4>
<a name="id412744"></a>
<a href="is_sequence.html#fusion.support.is_sequence.header">Header</a>
</h4>
+=======
+<a name="fusion.support.is_sequence.header"></a><h5>
+<a name="id612595"></a>
+ <a class="link" href="is_sequence.html#fusion.support.is_sequence.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">support</span><span class="special">/</span><span class="identifier">is_sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">is_sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.support.is_sequence.example"></a><h4>
<a name="id412883"></a>
<a href="is_sequence.html#fusion.support.is_sequence.example">Example</a>
</h4>
+=======
+<a name="fusion.support.is_sequence.example"></a><h5>
+<a name="id612703"></a>
+ <a class="link" href="is_sequence.html#fusion.support.is_sequence.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special"><</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="special">></span> <span class="special">));</span>
<span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span> <span class="identifier">is_sequence</span><span class="special"><</span> <span class="keyword">int</span> <span class="special">></span> <span class="special">));</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special"><</span>list<span class="special"><></span> <span class="special">></span> <span class="special">));</span>
Modified: branches/release/libs/fusion/doc/html/fusion/support/is_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/is_view.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/support/is_view.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>is_view</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="../support.html" title="Support">
<link rel="previous" href="is_sequence.html" title="is_sequence">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="is_sequence.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.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="tag_of.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="id413272"></a>
<a href="is_view.html#fusion.support.is_view.description">Description</a>
</h4>
+=======
+<div class="section" title="is_view">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.support.is_view"></a><a class="link" href="is_view.html" title="is_view">is_view</a>
+</h3></div></div></div>
+<a name="fusion.support.is_view.description"></a><h5>
+<a name="id613016"></a>
+ <a class="link" href="is_view.html#fusion.support.is_view.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Metafunction that evaluates to <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>
if a certain type <tt class="computeroutput"><span class="identifier">T</span></tt> is a
@@ -43,10 +58,17 @@
reference. <tt class="computeroutput"><span class="identifier">is_view</span></tt> may be
specialized to accomodate clients providing Fusion conforming views.
</p>
+<<<<<<< .working
<a name="fusion.support.is_view.synopsis"></a><h4>
<a name="id413366"></a>
<a href="is_view.html#fusion.support.is_view.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.support.is_view.synopsis"></a><h5>
+<a name="id613080"></a>
+ <a class="link" href="is_view.html#fusion.support.is_view.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
<span class="special">{</span>
<span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">></span>
@@ -56,10 +78,17 @@
<span class="special">};</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.support.is_view.parameters"></a><h4>
<a name="id413482"></a>
<a href="is_view.html#fusion.support.is_view.parameters">Parameters</a>
</h4>
+=======
+<a name="fusion.support.is_view.parameters"></a><h5>
+<a name="id613174"></a>
+ <a class="link" href="is_view.html#fusion.support.is_view.parameters">Parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -89,10 +118,17 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.support.is_view.expression_semantics"></a><h4>
<a name="id413581"></a>
<a href="is_view.html#fusion.support.is_view.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.support.is_view.expression_semantics"></a><h5>
+<a name="id613257"></a>
+ <a class="link" href="is_view.html#fusion.support.is_view.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_view</span><span class="special"><</span><span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">c</span><span class="special">;</span>
</pre>
<p>
@@ -105,17 +141,31 @@
is a conforming Fusion view, <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt>
otherwise.
</p>
+<<<<<<< .working
<a name="fusion.support.is_view.header"></a><h4>
<a name="id413730"></a>
<a href="is_view.html#fusion.support.is_view.header">Header</a>
</h4>
+=======
+<a name="fusion.support.is_view.header"></a><h5>
+<a name="id613371"></a>
+ <a class="link" href="is_view.html#fusion.support.is_view.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">support</span><span class="special">/</span><span class="identifier">is_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">is_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.support.is_view.example"></a><h4>
<a name="id413867"></a>
<a href="is_view.html#fusion.support.is_view.example">Example</a>
</h4>
+=======
+<a name="fusion.support.is_view.example"></a><h5>
+<a name="id613479"></a>
+ <a class="link" href="is_view.html#fusion.support.is_view.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_view</span><span class="special"><</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="special">></span> <span class="special">));</span>
<span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_view</span><span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="special">));</span>
Modified: branches/release/libs/fusion/doc/html/fusion/support/pair.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/pair.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/support/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>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="../support.html" title="Support">
<link rel="previous" href="deduce_sequence.html" title="deduce_sequence">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="deduce_sequence.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.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="../iterator.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,17 +38,33 @@
<a name="id418183"></a>
<a href="pair.html#fusion.support.pair.description">Description</a>
</h4>
+=======
+<div class="section" title="pair">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.support.pair"></a><a class="link" href="pair.html" title="pair">pair</a>
+</h3></div></div></div>
+<a name="fusion.support.pair.description"></a><h5>
+<a name="id617959"></a>
+ <a class="link" href="pair.html#fusion.support.pair.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Fusion <tt class="computeroutput"><span class="identifier">pair</span></tt> type is a half
runtime pair. A half runtime pair is similar to a std::pair,
but, unlike std::pair,
- the first type does not have data. It is used as elements in <span class="underline">_map</span>_s,
- for example.
+ the first type does not have data. It is used as elements in <a class="link" href="../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a>s, for example.
</p>
+<<<<<<< .working
<a name="fusion.support.pair.synopsis"></a><h4>
<a name="id418285"></a>
<a href="pair.html#fusion.support.pair.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.support.pair.synopsis"></a><h5>
+<a name="id618026"></a>
+ <a class="link" href="pair.html#fusion.support.pair.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">First</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Second</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">pair</span><span class="special">;</span>
@@ -63,10 +84,17 @@
<span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_pair</span><span class="special"><</span><span class="identifier">First</span><span class="special">,</span><span class="identifier">Second</span><span class="special">>::</span><span class="identifier">type</span>
<span class="identifier">make_pair</span><span class="special">(</span><span class="identifier">Second</span> <span class="keyword">const</span> <span class="special">&);</span>
</pre>
+<<<<<<< .working
<a name="fusion.support.pair.template_parameters"></a><h4>
<a name="id418690"></a>
<a href="pair.html#fusion.support.pair.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.support.pair.template_parameters"></a><h5>
+<a name="id618322"></a>
+ <a class="link" href="pair.html#fusion.support.pair.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -130,10 +158,17 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.support.pair.expression_semantics"></a><h4>
<a name="id418971"></a>
<a href="pair.html#fusion.support.pair.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.support.pair.expression_semantics"></a><h5>
+<a name="id618540"></a>
+ <a class="link" href="pair.html#fusion.support.pair.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -258,17 +293,31 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.support.pair.header"></a><h4>
<a name="id419746"></a>
<a href="pair.html#fusion.support.pair.header">Header</a>
</h4>
+=======
+<a name="fusion.support.pair.header"></a><h5>
+<a name="id619127"></a>
+ <a class="link" href="pair.html#fusion.support.pair.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">support</span><span class="special">/</span><span class="identifier">pair</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">pair</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.support.pair.example"></a><h4>
<a name="id419900"></a>
<a href="pair.html#fusion.support.pair.example">Example</a>
</h4>
+=======
+<a name="fusion.support.pair.example"></a><h5>
+<a name="id619235"></a>
+ <a class="link" href="pair.html#fusion.support.pair.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="identifier">pair</span><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">></span> <span class="identifier">p</span><span class="special">(</span><span class="char">'X'</span><span class="special">);</span>
<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special"><<</span> <span class="identifier">p</span> <span class="special"><<</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"><<</span> <span class="identifier">make_pair</span><span class="special"><</span><span class="keyword">int</span><span class="special">>(</span><span class="char">'X'</span><span class="special">)</span> <span class="special"><<</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
Modified: branches/release/libs/fusion/doc/html/fusion/support/tag_of.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/tag_of.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/support/tag_of.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>tag_of</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="../support.html" title="Support">
<link rel="previous" href="is_view.html" title="is_view">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="is_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.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="category_of.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="id414266"></a>
<a href="tag_of.html#fusion.support.tag_of.description">Description</a>
</h4>
+=======
+<div class="section" title="tag_of">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.support.tag_of"></a><a class="link" href="tag_of.html" title="tag_of">tag_of</a>
+</h3></div></div></div>
+<a name="fusion.support.tag_of.description"></a><h5>
+<a name="id613799"></a>
+ <a class="link" href="tag_of.html#fusion.support.tag_of.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
All conforming Fusion sequences and iterators have an associated tag type.
The purpose of the tag is to enable <a href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
@@ -43,10 +58,17 @@
This metafunction may be specialized to accomodate clients providing Fusion
conforming sequences.
</p>
+<<<<<<< .working
<a name="fusion.support.tag_of.synopsis"></a><h4>
<a name="id414314"></a>
<a href="tag_of.html#fusion.support.tag_of.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.support.tag_of.synopsis"></a><h5>
+<a name="id613830"></a>
+ <a class="link" href="tag_of.html#fusion.support.tag_of.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
<span class="special">{</span>
<span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
@@ -56,10 +78,17 @@
<span class="special">};</span>
<span class="special">}</span>
</pre>
+<<<<<<< .working
<a name="fusion.support.tag_of.parameters"></a><h4>
<a name="id414428"></a>
<a href="tag_of.html#fusion.support.tag_of.parameters">Parameters</a>
</h4>
+=======
+<a name="fusion.support.tag_of.parameters"></a><h5>
+<a name="id613923"></a>
+ <a class="link" href="tag_of.html#fusion.support.tag_of.parameters">Parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -89,10 +118,17 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.support.tag_of.expression_semantics"></a><h4>
<a name="id414528"></a>
<a href="tag_of.html#fusion.support.tag_of.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.support.tag_of.expression_semantics"></a><h5>
+<a name="id614006"></a>
+ <a class="link" href="tag_of.html#fusion.support.tag_of.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special"><</span><span class="identifier">T</span><span class="special">>::</span><span class="identifier">type</span> <span class="identifier">tag</span><span class="special">;</span>
</pre>
<p>
@@ -102,13 +138,21 @@
<span class="bold"><b>Semantics</b></span>: Returns the tag type associated
with <tt class="computeroutput"><span class="identifier">T</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.support.tag_of.header"></a><h4>
<a name="id414630"></a>
<a href="tag_of.html#fusion.support.tag_of.header">Header</a>
</h4>
+=======
+<a name="fusion.support.tag_of.header"></a><h5>
+<a name="id614086"></a>
+ <a class="link" href="tag_of.html#fusion.support.tag_of.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">support</span><span class="special">/</span><span class="identifier">tag_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">tag_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.support.tag_of.example"></a><h4>
<a name="id414767"></a>
<a href="tag_of.html#fusion.support.tag_of.example">Example</a>
@@ -117,6 +161,16 @@
<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special"><</span>list<span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</span> <span class="identifier">tag2</span><span class="special">;</span>
<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special"><</span>vector<span class="special"><></span> <span class="special">>::</span><span class="identifier">type</span> <span class="identifier">tag3</span><span class="special">;</span>
<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special"><</span>vector<span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</span> <span class="identifier">tag4</span><span class="special">;</span>
+=======
+<a name="fusion.support.tag_of.example"></a><h5>
+<a name="id614194"></a>
+ <a class="link" href="tag_of.html#fusion.support.tag_of.example">Example</a>
+ </h5>
+<pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special"><</span><a class="link" href="../container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special"><></span> <span class="special">>::</span><span class="identifier">type</span> <span class="identifier">tag1</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special"><</span><a class="link" href="../container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</span> <span class="identifier">tag2</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special"><</span><a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><></span> <span class="special">>::</span><span class="identifier">type</span> <span class="identifier">tag3</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special"><</span><a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="special">>::</span><span class="identifier">type</span> <span class="identifier">tag4</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span><span class="identifier">tag1</span><span class="special">,</span> <span class="identifier">tag2</span><span class="special">>));</span>
<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special"><</span><span class="identifier">tag3</span><span class="special">,</span> <span class="identifier">tag4</span><span class="special">>));</span>
Modified: branches/release/libs/fusion/doc/html/fusion/tuple.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/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>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="../index.html" title="Chapter 1. Fusion 2.0">
<link rel="previous" href="algorithm/transformation/metafunctions/push_front.html" title="push_front">
Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_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>Class template 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="../tuple.html" title="Tuple">
<link rel="previous" href="../tuple.html" title="Tuple">
@@ -51,10 +55,17 @@
Currently tuple is basically a synonym for vector, although this may be changed
in future releases of fusion.
</p>
+<<<<<<< .working
<a name="fusion.tuple.class_template_tuple.synopsis"></a><h4>
<a name="id592075"></a>
<a href="class_template_tuple.html#fusion.tuple.class_template_tuple.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.tuple.class_template_tuple.synopsis"></a><h5>
+<a name="id799922"></a>
+ <a class="link" href="class_template_tuple.html#fusion.tuple.class_template_tuple.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span>
<span class="keyword">typename</span> <span class="identifier">T1</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span><span class="special">,</span>
<span class="keyword">typename</span> <span class="identifier">T2</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span><span class="special">,</span>
Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/construction.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/construction.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/construction.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>Construction</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="../class_template_tuple.html" title="Class template tuple">
<link rel="previous" href="../class_template_tuple.html" title="Class template tuple">
@@ -23,6 +27,7 @@
<div class="spirit-nav">
<a accesskey="p" href="../class_template_tuple.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../class_template_tuple.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="tuple_creation_functions.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
+<<<<<<< .working
<div class="section" lang="en">
<div class="titlepage">
<div><div><h4 class="title">
@@ -34,6 +39,16 @@
<a name="id592245"></a>
<a href="construction.html#fusion.tuple.class_template_tuple.construction.description">Description</a>
</h5>
+=======
+<div class="section" title="Construction">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.tuple.class_template_tuple.construction"></a><a class="link" href="construction.html" title="Construction">Construction</a>
+</h4></div></div></div>
+<a name="fusion.tuple.class_template_tuple.construction.description"></a><h6>
+<a name="id800045"></a>
+ <a class="link" href="construction.html#fusion.tuple.class_template_tuple.construction.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
Tuple</a> type provides a default constructor, a constructor that takes
@@ -41,11 +56,19 @@
copy constructor. The details of the various constructors are described
in this section.
</p>
+<<<<<<< .working
<a name="fusion.tuple.class_template_tuple.construction.specification"></a><h5>
<a name="id592287"></a>
<a href="construction.html#fusion.tuple.class_template_tuple.construction.specification">Specification</a>
</h5>
<div class="variablelist">
+=======
+<a name="fusion.tuple.class_template_tuple.construction.specification"></a><h6>
+<a name="id800073"></a>
+ <a class="link" href="construction.html#fusion.tuple.class_template_tuple.construction.specification">Specification</a>
+ </h6>
+<div class="variablelist" title="Notation">
+>>>>>>> .merge-right.r57125
<p class="title"><b>Notation</b></p>
<dl>
<dt><span class="term"><tt class="computeroutput"><span class="identifier">T1</span>
Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/element_access.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/element_access.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/element_access.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title>Element
access</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="../class_template_tuple.html" title="Class template tuple">
<link rel="previous" href="tuple_helper_classes.html" title="Tuple
@@ -31,6 +35,7 @@
<a name="fusion.tuple.class_template_tuple.element_access"></a><a href="element_access.html" title="Element
access">Element
access</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -38,15 +43,29 @@
<a name="id594261"></a>
<a href="element_access.html#fusion.tuple.class_template_tuple.element_access.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.tuple.class_template_tuple.element_access.description"></a><h6>
+<a name="id801793"></a>
+ <a class="link" href="element_access.html#fusion.tuple.class_template_tuple.element_access.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
Tuple</a> provides the <tt class="computeroutput"><span class="identifier">get</span></tt>
function to provide access to it's elements by zero based numeric index.
</p>
+<<<<<<< .working
<a name="fusion.tuple.class_template_tuple.element_access.specification"></a><h5>
<a name="id594311"></a>
<a href="element_access.html#fusion.tuple.class_template_tuple.element_access.specification">Specification</a>
</h5>
+=======
+<a name="fusion.tuple.class_template_tuple.element_access.specification"></a><h6>
+<a name="id801828"></a>
+ <a class="link" href="element_access.html#fusion.tuple.class_template_tuple.element_access.specification">Specification</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">int</span> <span class="identifier">I</span><span class="special">,</span> <span class="identifier">T</span><span class="special">></span>
<span class="identifier">RJ</span> <span class="identifier">get</span><span class="special">(</span><span class="identifier">T</span><span class="special">&</span> <span class="identifier">t</span><span class="special">);</span>
</pre>
Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/relational_operators.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/relational_operators.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/relational_operators.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title>Relational
operators</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="../class_template_tuple.html" title="Class template tuple">
<link rel="previous" href="element_access.html" title="Element
@@ -30,6 +34,7 @@
<a name="fusion.tuple.class_template_tuple.relational_operators"></a><a href="relational_operators.html" title="Relational
operators">Relational
operators</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -37,15 +42,30 @@
<a name="id594938"></a>
<a href="relational_operators.html#fusion.tuple.class_template_tuple.relational_operators.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.tuple.class_template_tuple.relational_operators.description"></a><h6>
+<a name="id802258"></a>
+ <a class="link" href="relational_operators.html#fusion.tuple.class_template_tuple.relational_operators.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
Tuple</a> provides the standard boolean relational operators.
</p>
+<<<<<<< .working
<a name="fusion.tuple.class_template_tuple.relational_operators.specification"></a><h5>
<a name="id594976"></a>
<a href="relational_operators.html#fusion.tuple.class_template_tuple.relational_operators.specification">Specification</a>
</h5>
<div class="variablelist">
+=======
+<a name="fusion.tuple.class_template_tuple.relational_operators.specification"></a><h6>
+<a name="id802282"></a>
+ <a class="link" href="relational_operators.html#fusion.tuple.class_template_tuple.relational_operators.specification">Specification</a>
+ </h6>
+<div class="variablelist" title="Notation">
+>>>>>>> .merge-right.r57125
<p class="title"><b>Notation</b></p>
<dl>
<dt><span class="term"><tt class="computeroutput"><span class="identifier">T1</span>
Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title>Tuple
creation 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="../class_template_tuple.html" title="Class template tuple">
<link rel="previous" href="construction.html" title="Construction">
@@ -30,6 +34,7 @@
<a name="fusion.tuple.class_template_tuple.tuple_creation_functions"></a><a href="tuple_creation_functions.html" title="Tuple
creation functions">Tuple
creation functions</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -37,16 +42,30 @@
<a name="id593031"></a>
<a href="tuple_creation_functions.html#fusion.tuple.class_template_tuple.tuple_creation_functions.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.tuple.class_template_tuple.tuple_creation_functions.description"></a><h6>
+<a name="id800948"></a>
+ <a class="link" href="tuple_creation_functions.html#fusion.tuple.class_template_tuple.tuple_creation_functions.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
TR1 describes 2 utility functions for creating <span class="underline">_tr1</span><span class="underline">tuple</span>_s. <tt class="computeroutput"><span class="identifier">make_tuple</span></tt>
builds a tuple out of it's argument list, and <tt class="computeroutput"><span class="identifier">tie</span></tt>
builds a tuple of references to it's arguments. The details of these creation
functions are described in this section.
</p>
+<<<<<<< .working
<a name="fusion.tuple.class_template_tuple.tuple_creation_functions.specification"></a><h5>
<a name="id593102"></a>
<a href="tuple_creation_functions.html#fusion.tuple.class_template_tuple.tuple_creation_functions.specification">Specification</a>
</h5>
+=======
+<a name="fusion.tuple.class_template_tuple.tuple_creation_functions.specification"></a><h6>
+<a name="id800990"></a>
+ <a class="link" href="tuple_creation_functions.html#fusion.tuple.class_template_tuple.tuple_creation_functions.specification">Specification</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">></span>
<span class="identifier">tuple</span><span class="special"><</span><span class="identifier">V1</span><span class="special">,</span> <span class="identifier">V2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">VN</span><span class="special">></span> <span class="identifier">make_tuple</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">T1</span><span class="special">&</span> <span class="identifier">t1</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">T2</span><span class="special">&</span> <span class="identifier">t2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">const</span> <span class="identifier">TN</span><span class="special">&</span> <span class="identifier">tn</span><span class="special">);</span>
</pre>
Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -4,7 +4,11 @@
<title>Tuple
helper classes</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="../class_template_tuple.html" title="Class template tuple">
<link rel="previous" href="tuple_creation_functions.html" title="Tuple
@@ -31,6 +35,7 @@
<a name="fusion.tuple.class_template_tuple.tuple_helper_classes"></a><a href="tuple_helper_classes.html" title="Tuple
helper classes">Tuple
helper classes</a>
+<<<<<<< .working
</h4></div></div>
<div></div>
</div>
@@ -38,15 +43,29 @@
<a name="id593818"></a>
<a href="tuple_helper_classes.html#fusion.tuple.class_template_tuple.tuple_helper_classes.description">Description</a>
</h5>
+=======
+</h4></div></div></div>
+<a name="fusion.tuple.class_template_tuple.tuple_helper_classes.description"></a><h6>
+<a name="id801499"></a>
+ <a class="link" href="tuple_helper_classes.html#fusion.tuple.class_template_tuple.tuple_helper_classes.description">Description</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<p>
The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
Tuple</a> provides 2 helper traits, for compile time access to the
tuple size, and the element types.
</p>
+<<<<<<< .working
<a name="fusion.tuple.class_template_tuple.tuple_helper_classes.specification"></a><h5>
<a name="id593857"></a>
<a href="tuple_helper_classes.html#fusion.tuple.class_template_tuple.tuple_helper_classes.specification">Specification</a>
</h5>
+=======
+<a name="fusion.tuple.class_template_tuple.tuple_helper_classes.specification"></a><h6>
+<a name="id801522"></a>
+ <a class="link" href="tuple_helper_classes.html#fusion.tuple.class_template_tuple.tuple_helper_classes.specification">Specification</a>
+ </h6>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="identifier">tuple_size</span><span class="special"><</span><span class="identifier">T</span><span class="special">>::</span><span class="identifier">value</span>
</pre>
<p>
Modified: branches/release/libs/fusion/doc/html/fusion/tuple/pairs.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/pairs.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/pairs.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>Pairs</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="../tuple.html" title="Tuple">
<link rel="previous" href="class_template_tuple/relational_operators.html" title="Relational
@@ -23,6 +27,7 @@
<div class="spirit-nav">
<a accesskey="p" href="class_template_tuple/relational_operators.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tuple.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="../extension.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">
@@ -34,15 +39,32 @@
<a name="id598281"></a>
<a href="pairs.html#fusion.tuple.pairs.description">Description</a>
</h4>
+=======
+<div class="section" title="Pairs">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.tuple.pairs"></a><a class="link" href="pairs.html" title="Pairs">Pairs</a>
+</h3></div></div></div>
+<a name="fusion.tuple.pairs.description"></a><h5>
+<a name="id806304"></a>
+ <a class="link" href="pairs.html#fusion.tuple.pairs.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
Tuple</a> interface is specified to provide uniform access to <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>
as if it were a 2 element tuple.
</p>
+<<<<<<< .working
<a name="fusion.tuple.pairs.specification"></a><h4>
<a name="id598338"></a>
<a href="pairs.html#fusion.tuple.pairs.specification">Specification</a>
</h4>
+=======
+<a name="fusion.tuple.pairs.specification"></a><h5>
+<a name="id806341"></a>
+ <a class="link" href="pairs.html#fusion.tuple.pairs.specification">Specification</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="identifier">tuple_size</span><span class="special"><</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span><span class="special"><</span><span class="identifier">T1</span><span class="special">,</span> <span class="identifier">T2</span><span class="special">></span> <span class="special">>::</span><span class="identifier">value</span>
</pre>
<p>
Modified: branches/release/libs/fusion/doc/html/fusion/view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/view.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>View</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="container/conversion/metafunctions/as_map.html" title="as_map">
@@ -48,10 +52,17 @@
sequence(s) are actually accessed. Views' lazy nature make them very cheap
to copy and be passed around by value.
</p>
+<<<<<<< .working
<a name="fusion.view.header"></a><h3>
<a name="id517980"></a>
<a href="view.html#fusion.view.header">Header</a>
</h3>
+=======
+<a name="fusion.view.header"></a><h4>
+<a name="id722826"></a>
+ <a class="link" href="view.html#fusion.view.header">Header</a>
+ </h4>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
Modified: branches/release/libs/fusion/doc/html/fusion/view/filter_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/filter_view.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/view/filter_view.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>filter_view</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="../view.html" title="View">
<link rel="previous" href="single_view.html" title="single_view">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="single_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.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="iterator_range.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="id518972"></a>
<a href="filter_view.html#fusion.view.filter_view.description">Description</a>
</h4>
+=======
+<div class="section" title="filter_view">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.view.filter_view"></a><a class="link" href="filter_view.html" title="filter_view">filter_view</a>
+</h3></div></div></div>
+<a name="fusion.view.filter_view.description"></a><h5>
+<a name="id723629"></a>
+ <a class="link" href="filter_view.html#fusion.view.filter_view.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
<tt class="computeroutput"><span class="identifier">filter_view</span></tt> is a view into
a subset of its underlying sequence's elements satisfying a given predicate
@@ -40,24 +55,45 @@
The <tt class="computeroutput"><span class="identifier">filter_view</span></tt> presents
only those elements for which its predicate evaluates to <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>.
</p>
+<<<<<<< .working
<a name="fusion.view.filter_view.header"></a><h4>
<a name="id519054"></a>
<a href="filter_view.html#fusion.view.filter_view.header">Header</a>
</h4>
+=======
+<a name="fusion.view.filter_view.header"></a><h5>
+<a name="id723679"></a>
+ <a class="link" href="filter_view.html#fusion.view.filter_view.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">view</span><span class="special">/</span><span class="identifier">filter_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">filter_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.view.filter_view.synopsis"></a><h4>
<a name="id519209"></a>
<a href="filter_view.html#fusion.view.filter_view.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.view.filter_view.synopsis"></a><h5>
+<a name="id723787"></a>
+ <a class="link" href="filter_view.html#fusion.view.filter_view.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Pred</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">filter_view</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.view.filter_view.template_parameters"></a><h4>
<a name="id519305"></a>
<a href="filter_view.html#fusion.view.filter_view.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.view.filter_view.template_parameters"></a><h5>
+<a name="id724954"></a>
+ <a class="link" href="filter_view.html#fusion.view.filter_view.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -100,6 +136,7 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.filter_view.model_of"></a><h4>
<a name="id519472"></a>
<a href="filter_view.html#fusion.view.filter_view.model_of">Model of</a>
@@ -107,6 +144,22 @@
<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward Sequence</a></li></ul></div>
<div class="variablelist">
+=======
+<a name="fusion.view.filter_view.model_of"></a><h5>
+<a name="id725086"></a>
+ <a class="link" href="filter_view.html#fusion.view.filter_view.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>
+<li class="listitem">
+<a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">Sequence</span></code>
+ implements the <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
+<div class="variablelist" title="Notation">
+>>>>>>> .merge-right.r57125
<p class="title"><b>Notation</b></p>
<dl>
<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt></span></dt>
@@ -125,15 +178,26 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.view.filter_view.expression_semantics"></a><h4>
<a name="id519632"></a>
<a href="filter_view.html#fusion.view.filter_view.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.view.filter_view.expression_semantics"></a><h5>
+<a name="id725220"></a>
+ <a class="link" href="filter_view.html#fusion.view.filter_view.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Semantics of an expression is defined only where it differs from, or is not
+<<<<<<< .working
defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward
Sequence</a>.
+=======
+ defined in the implemented models.
+>>>>>>> .merge-right.r57242
</p>
<div class="informaltable"><table class="table">
<colgroup>
@@ -181,10 +245,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.filter_view.example"></a><h4>
<a name="id519942"></a>
<a href="filter_view.html#fusion.view.filter_view.example">Example</a>
</h4>
+=======
+<a name="fusion.view.filter_view.example"></a><h5>
+<a name="id725438"></a>
+ <a class="link" href="filter_view.html#fusion.view.filter_view.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">;</span>
<span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">not_</span><span class="special">;</span>
<span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_class</span><span class="special">;</span>
Modified: branches/release/libs/fusion/doc/html/fusion/view/iterator_range.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/iterator_range.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/view/iterator_range.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>iterator_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">
+>>>>>>> .merge-right.r57125
<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
<link rel="up" href="../view.html" title="View">
<link rel="previous" href="filter_view.html" title="filter_view">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="filter_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.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="joint_view.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,28 +38,59 @@
<a name="id520416"></a>
<a href="iterator_range.html#fusion.view.iterator_range.description">Description</a>
</h4>
+=======
+<div class="section" title="iterator_range">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.view.iterator_range"></a><a class="link" href="iterator_range.html" title="iterator_range">iterator_range</a>
+</h3></div></div></div>
+<a name="fusion.view.iterator_range.description"></a><h5>
+<a name="id725780"></a>
+ <a class="link" href="iterator_range.html#fusion.view.iterator_range.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
<tt class="computeroutput"><span class="identifier">iterator_range</span></tt> presents a
sub-range of its underlying sequence delimited by a pair of iterators.
</p>
+<<<<<<< .working
<a name="fusion.view.iterator_range.header"></a><h4>
<a name="id520456"></a>
<a href="iterator_range.html#fusion.view.iterator_range.header">Header</a>
</h4>
+=======
+<a name="fusion.view.iterator_range.header"></a><h5>
+<a name="id725804"></a>
+ <a class="link" href="iterator_range.html#fusion.view.iterator_range.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">view</span><span class="special">/</span><span class="identifier">iterator_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">iterator_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.view.iterator_range.synopsis"></a><h4>
<a name="id520612"></a>
<a href="iterator_range.html#fusion.view.iterator_range.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.view.iterator_range.synopsis"></a><h5>
+<a name="id725912"></a>
+ <a class="link" href="iterator_range.html#fusion.view.iterator_range.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">First</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Last</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">iterator_range</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.view.iterator_range.template_parameters"></a><h4>
<a name="id520708"></a>
<a href="iterator_range.html#fusion.view.iterator_range.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.view.iterator_range.template_parameters"></a><h5>
+<a name="id725977"></a>
+ <a class="link" href="iterator_range.html#fusion.view.iterator_range.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -95,6 +131,7 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.iterator_range.model_of"></a><h4>
<a name="id520861"></a>
<a href="iterator_range.html#fusion.view.iterator_range.model_of">Model of</a>
@@ -106,10 +143,29 @@
Sequence">Bidirectional
Sequence</a> or <a href="../sequence/concepts/random_access_sequence.html" title="Random
Access Sequence">Random
+=======
+<a name="fusion.view.iterator_range.model_of"></a><h5>
+<a name="id726099"></a>
+ <a class="link" href="iterator_range.html#fusion.view.iterator_range.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>,
+ <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> or <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+>>>>>>> .merge-right.r57125
Access Sequence</a> depending on the traversal characteristics (see
<a href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence Traversal Concept</a>)
of its underlying sequence.
- </li></ul></div>
+ </li>
+<li class="listitem">
+<a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">First</span></code>
+ and <code class="computeroutput"><span class="identifier">Last</span></code> implement the
+ <a class="link" href="../iterator/concepts/associative_iterator.html" title="Associative Iterator">Associative
+ Iterator</a> model.
+ </li>
+</ul></div>
<div class="variablelist">
<p class="title"><b>Notation</b></p>
<dl>
@@ -132,16 +188,26 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.view.iterator_range.expression_semantics"></a><h4>
<a name="id521090"></a>
<a href="iterator_range.html#fusion.view.iterator_range.expression_semantics">Expression
+=======
+<a name="fusion.view.iterator_range.expression_semantics"></a><h5>
+<a name="id726283"></a>
+ <a class="link" href="iterator_range.html#fusion.view.iterator_range.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h4>
<p>
Semantics of an expression is defined only where it differs from, or is not
+<<<<<<< .working
defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward
Sequence</a>.
+=======
+ defined in the implemented models.
+>>>>>>> .merge-right.r57242
</p>
<div class="informaltable"><table class="table">
<colgroup>
@@ -191,10 +257,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.iterator_range.example"></a><h4>
<a name="id521424"></a>
<a href="iterator_range.html#fusion.view.iterator_range.example">Example</a>
</h4>
+=======
+<a name="fusion.view.iterator_range.example"></a><h5>
+<a name="id726517"></a>
+ <a class="link" href="iterator_range.html#fusion.view.iterator_range.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">char</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">s</span> <span class="special">=</span> <span class="string">"Ruby"</span><span class="special">;</span>
<span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">,</span> <span class="keyword">char</span> <span class="keyword">const</span><span class="special">*></span> <span class="identifier">vector_type</span><span class="special">;</span>
<span class="identifier">vector_type</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="number">3.3</span><span class="special">,</span> <span class="identifier">s</span><span class="special">);</span>
Modified: branches/release/libs/fusion/doc/html/fusion/view/joint_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/joint_view.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/view/joint_view.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>joint_view</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="../view.html" title="View">
<link rel="previous" href="iterator_range.html" title="iterator_range">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="iterator_range.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.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="zip_view.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,28 +38,59 @@
<a name="id522089"></a>
<a href="joint_view.html#fusion.view.joint_view.description">Description</a>
</h4>
+=======
+<div class="section" title="joint_view">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.view.joint_view"></a><a class="link" href="joint_view.html" title="joint_view">joint_view</a>
+</h3></div></div></div>
+<a name="fusion.view.joint_view.description"></a><h5>
+<a name="id726993"></a>
+ <a class="link" href="joint_view.html#fusion.view.joint_view.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
<tt class="computeroutput"><span class="identifier">joint_view</span></tt> presents a view
which is a concatenation of two sequences.
</p>
+<<<<<<< .working
<a name="fusion.view.joint_view.header"></a><h4>
<a name="id522129"></a>
<a href="joint_view.html#fusion.view.joint_view.header">Header</a>
</h4>
+=======
+<a name="fusion.view.joint_view.header"></a><h5>
+<a name="id727017"></a>
+ <a class="link" href="joint_view.html#fusion.view.joint_view.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">view</span><span class="special">/</span><span class="identifier">joint_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">joint_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.view.joint_view.synopsis"></a><h4>
<a name="id522285"></a>
<a href="joint_view.html#fusion.view.joint_view.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.view.joint_view.synopsis"></a><h5>
+<a name="id730770"></a>
+ <a class="link" href="joint_view.html#fusion.view.joint_view.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence2</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">joint_view</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.view.joint_view.template_parameters"></a><h4>
<a name="id522380"></a>
<a href="joint_view.html#fusion.view.joint_view.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.view.joint_view.template_parameters"></a><h5>
+<a name="id730834"></a>
+ <a class="link" href="joint_view.html#fusion.view.joint_view.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -99,6 +135,7 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.joint_view.model_of"></a><h4>
<a name="id522535"></a>
<a href="joint_view.html#fusion.view.joint_view.model_of">Model of</a>
@@ -106,6 +143,23 @@
<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward Sequence</a></li></ul></div>
<div class="variablelist">
+=======
+<a name="fusion.view.joint_view.model_of"></a><h5>
+<a name="id730957"></a>
+ <a class="link" href="joint_view.html#fusion.view.joint_view.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>
+<li class="listitem">
+<a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">Sequence1</span></code>
+ and <code class="computeroutput"><span class="identifier">Sequence2</span></code> implement
+ the <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
+<div class="variablelist" title="Notation">
+>>>>>>> .merge-right.r57125
<p class="title"><b>Notation</b></p>
<dl>
<dt><span class="term"><tt class="computeroutput"><span class="identifier">JV</span></tt></span></dt>
@@ -127,15 +181,26 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.view.joint_view.expression_semantics"></a><h4>
<a name="id522734"></a>
<a href="joint_view.html#fusion.view.joint_view.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.view.joint_view.expression_semantics"></a><h5>
+<a name="id731125"></a>
+ <a class="link" href="joint_view.html#fusion.view.joint_view.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Semantics of an expression is defined only where it differs from, or is not
+<<<<<<< .working
defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward
Sequence</a>.
+=======
+ defined in the implemented models.
+>>>>>>> .merge-right.r57242
</p>
<div class="informaltable"><table class="table">
<colgroup>
@@ -184,12 +249,21 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.joint_view.example"></a><h4>
<a name="id523069"></a>
<a href="joint_view.html#fusion.view.joint_view.example">Example</a>
</h4>
<pre class="programlisting">vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">></span> <span class="identifier">v1</span><span class="special">(</span><span class="number">3</span><span class="special">,</span> <span class="char">'x'</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"><</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">></span> <span class="identifier">v2</span><span class="special">(</span><span class="string">"hello"</span><span class="special">,</span> <span class="number">123</span><span class="special">);</span>
+=======
+<a name="fusion.view.joint_view.example"></a><h5>
+<a name="id731359"></a>
+ <a class="link" href="joint_view.html#fusion.view.joint_view.example">Example</a>
+ </h5>
+<pre class="programlisting"><a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">></span> <span class="identifier">v1</span><span class="special">(</span><span class="number">3</span><span class="special">,</span> <span class="char">'x'</span><span class="special">);</span>
+<a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">></span> <span class="identifier">v2</span><span class="special">(</span><span class="string">"hello"</span><span class="special">,</span> <span class="number">123</span><span class="special">);</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">joint_view</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"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">></span>
<span class="special">,</span> vector<span class="special"><</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">></span>
Modified: branches/release/libs/fusion/doc/html/fusion/view/nview.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/nview.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/view/nview.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>nview</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="../view.html" title="View">
<link rel="previous" href="reverse_view.html" title="reverse_view">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="reverse_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.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="../adapted.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="id528240"></a>
<a href="nview.html#fusion.view.nview.description">Description</a>
</h4>
+=======
+<div class="section" title="nview">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.view.nview"></a><a class="link" href="nview.html" title="nview">nview</a>
+</h3></div></div></div>
+<a name="fusion.view.nview.description"></a><h5>
+<a name="id735048"></a>
+ <a class="link" href="nview.html#fusion.view.nview.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
<tt class="computeroutput"><span class="identifier">nview</span></tt> presents a view which
iterates over a given Sequence in
@@ -40,17 +55,31 @@
is constructed from an arbitrary Sequence
and a list of indicies specifying the elements to iterate over.
</p>
+<<<<<<< .working
<a name="fusion.view.nview.header"></a><h4>
<a name="id528309"></a>
<a href="nview.html#fusion.view.nview.header">Header</a>
</h4>
+=======
+<a name="fusion.view.nview.header"></a><h5>
+<a name="id735089"></a>
+ <a class="link" href="nview.html#fusion.view.nview.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">view</span><span class="special">/</span><span class="identifier">nview</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">nview</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.view.nview.synopsis"></a><h4>
<a name="id528464"></a>
<a href="nview.html#fusion.view.nview.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.view.nview.synopsis"></a><h5>
+<a name="id736290"></a>
+ <a class="link" href="nview.html#fusion.view.nview.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Indicies</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">nview</span><span class="special">;</span>
@@ -58,10 +87,17 @@
<span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">nview</span><span class="special"><</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">I1</span><span class="special">,</span> <span class="identifier">I2</span><span class="special">,</span> <span class="special">...>::</span><span class="identifier">type</span>
<span class="identifier">as_nview</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&</span> <span class="identifier">s</span><span class="special">);</span>
</pre>
+<<<<<<< .working
<a name="fusion.view.nview.template_parameters"></a><h4>
<a name="id528750"></a>
<a href="nview.html#fusion.view.nview.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.view.nview.template_parameters"></a><h5>
+<a name="id736497"></a>
+ <a class="link" href="nview.html#fusion.view.nview.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -116,6 +152,7 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.nview.model_of"></a><h4>
<a name="id529035"></a>
<a href="nview.html#fusion.view.nview.model_of">Model of</a>
@@ -124,6 +161,15 @@
<a href="../sequence/concepts/random_access_sequence.html" title="Random
Access Sequence">Random
Access Sequence</a> (see <a href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence
+=======
+<a name="fusion.view.nview.model_of"></a><h5>
+<a name="id736711"></a>
+ <a class="link" href="nview.html#fusion.view.nview.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
+ Access Sequence</a> (see <a class="link" href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence
+>>>>>>> .merge-right.r57125
Traversal Concept</a>)
</li></ul></div>
<div class="variablelist">
@@ -144,10 +190,17 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.view.nview.expression_semantics"></a><h4>
<a name="id529208"></a>
<a href="nview.html#fusion.view.nview.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.view.nview.expression_semantics"></a><h5>
+<a name="id736831"></a>
+ <a class="link" href="nview.html#fusion.view.nview.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Semantics of an expression is defined only where it differs from, or is not
defined in <a href="../sequence/concepts/random_access_sequence.html" title="Random
@@ -205,11 +258,19 @@
a Fusion vector
of references to the elements of the original Fusion Sequence
</p>
+<<<<<<< .working
<a name="fusion.view.nview.example"></a><h4>
<a name="id529549"></a>
<a href="nview.html#fusion.view.nview.example">Example</a>
</h4>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
+=======
+<a name="fusion.view.nview.example"></a><h5>
+<a name="id737073"></a>
+ <a class="link" href="nview.html#fusion.view.nview.example">Example</a>
+ </h5>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">></span> <span class="identifier">vec</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="keyword">typedef</span> <span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector_c</span><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">1</span><span class="special">,</span> <span class="number">0</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">0</span><span class="special">></span> <span class="identifier">indicies</span><span class="special">;</span>
<span class="identifier">vec</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'c'</span><span class="special">,</span> <span class="number">2.0</span><span class="special">);</span>
Modified: branches/release/libs/fusion/doc/html/fusion/view/reverse_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/reverse_view.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/view/reverse_view.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>reverse_view</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="../view.html" title="View">
<link rel="previous" href="transform_view.html" title="transform_view">
@@ -34,24 +38,45 @@
view of underlying sequence. The first element will be its last and the last
element will be its first.
</p>
+<<<<<<< .working
<a name="fusion.view.reverse_view.header"></a><h4>
<a name="id527152"></a>
<a href="reverse_view.html#fusion.view.reverse_view.header">Header</a>
</h4>
+=======
+<a name="fusion.view.reverse_view.header"></a><h5>
+<a name="id734258"></a>
+ <a class="link" href="reverse_view.html#fusion.view.reverse_view.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">view</span><span class="special">/</span><span class="identifier">reverse_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">reverse_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.view.reverse_view.synopsis"></a><h4>
<a name="id527307"></a>
<a href="reverse_view.html#fusion.view.reverse_view.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.view.reverse_view.synopsis"></a><h5>
+<a name="id734366"></a>
+ <a class="link" href="reverse_view.html#fusion.view.reverse_view.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">reverse_view</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.view.reverse_view.template_parameters"></a><h4>
<a name="id527385"></a>
<a href="reverse_view.html#fusion.view.reverse_view.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.view.reverse_view.template_parameters"></a><h5>
+<a name="id734418"></a>
+ <a class="link" href="reverse_view.html#fusion.view.reverse_view.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -82,13 +107,40 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.reverse_view.model_of"></a><h4>
<a name="id527497"></a>
<a href="reverse_view.html#fusion.view.reverse_view.model_of">Model of</a>
</h4>
<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
Sequence">Bidirectional
+=======
+<a name="fusion.view.reverse_view.model_of"></a><h5>
+<a name="id734506"></a>
+ <a class="link" href="reverse_view.html#fusion.view.reverse_view.model_of">Model of</a>
+ </h5>
+<<<<<<< .working
+<<<<<<< .working
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+>>>>>>> .merge-right.r57125
Sequence</a></li></ul></div>
+=======
+<p>
+ A model of the same sequence concept as <code class="computeroutput"><span class="identifier">Sequence</span></code>.
+ </p>
+=======
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a></li>
+<li class="listitem">
+<a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> if <code class="computeroutput"><span class="identifier">Sequence</span></code>
+ implements the <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a> model.
+ </li>
+</ul></div>
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
<div class="variablelist">
<p class="title"><b>Notation</b></p>
<dl>
@@ -107,16 +159,26 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.view.reverse_view.expression_semantics"></a><h4>
<a name="id527661"></a>
<a href="reverse_view.html#fusion.view.reverse_view.expression_semantics">Expression
+=======
+<a name="fusion.view.reverse_view.expression_semantics"></a><h5>
+<a name="id734641"></a>
+ <a class="link" href="reverse_view.html#fusion.view.reverse_view.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h4>
<p>
Semantics of an expression is defined only where it differs from, or is not
+<<<<<<< .working
defined in <a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
Sequence">Bidirectional
Sequence</a>.
+=======
+ defined in the implemented models.
+>>>>>>> .merge-right.r57242
</p>
<div class="informaltable"><table class="table">
<colgroup>
@@ -164,11 +226,19 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.reverse_view.example"></a><h4>
<a name="id527974"></a>
<a href="reverse_view.html#fusion.view.reverse_view.example">Example</a>
</h4>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">short</span><span class="special">,</span> <span class="keyword">double</span><span class="special">></span> <span class="identifier">vector_type</span><span class="special">;</span>
+=======
+<a name="fusion.view.reverse_view.example"></a><h5>
+<a name="id734860"></a>
+ <a class="link" href="reverse_view.html#fusion.view.reverse_view.example">Example</a>
+ </h5>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">short</span><span class="special">,</span> <span class="keyword">double</span><span class="special">></span> <span class="identifier">vector_type</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">vector_type</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="number">5</span><span class="special">,</span> <span class="number">3.3</span><span class="special">);</span>
<span class="identifier">reverse_view</span><span class="special"><</span><span class="identifier">vector_type</span><span class="special">></span> <span class="identifier">reverse</span><span class="special">(</span><span class="identifier">vec</span><span class="special">);</span>
Modified: branches/release/libs/fusion/doc/html/fusion/view/single_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/single_view.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/view/single_view.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>single_view</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="../view.html" title="View">
<link rel="previous" href="../view.html" title="View">
@@ -33,24 +37,45 @@
<tt class="computeroutput"><span class="identifier">single_view</span></tt> is a view into
a value as a single element sequence.
</p>
+<<<<<<< .working
<a name="fusion.view.single_view.header"></a><h4>
<a name="id353110"></a>
<a href="single_view.html#fusion.view.single_view.header">Header</a>
</h4>
+=======
+<a name="fusion.view.single_view.header"></a><h5>
+<a name="id722947"></a>
+ <a class="link" href="single_view.html#fusion.view.single_view.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">view</span><span class="special">/</span><span class="identifier">single_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">single_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.view.single_view.synopsis"></a><h4>
<a name="id518175"></a>
<a href="single_view.html#fusion.view.single_view.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.view.single_view.synopsis"></a><h5>
+<a name="id723055"></a>
+ <a class="link" href="single_view.html#fusion.view.single_view.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">single_view</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.view.single_view.template_parameters"></a><h4>
<a name="id518253"></a>
<a href="single_view.html#fusion.view.single_view.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.view.single_view.template_parameters"></a><h5>
+<a name="id723107"></a>
+ <a class="link" href="single_view.html#fusion.view.single_view.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -79,6 +104,7 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.single_view.model_of"></a><h4>
<a name="id518355"></a>
<a href="single_view.html#fusion.view.single_view.model_of">Model of</a>
@@ -86,6 +112,14 @@
<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
Sequence">Forward Sequence</a></li></ul></div>
<div class="variablelist">
+=======
+<a name="fusion.view.single_view.model_of"></a><h5>
+<a name="id723190"></a>
+ <a class="link" href="single_view.html#fusion.view.single_view.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>
+<div class="variablelist" title="Notation">
+>>>>>>> .merge-right.r57125
<p class="title"><b>Notation</b></p>
<dl>
<dt><span class="term"><tt class="computeroutput"><span class="identifier">S</span></tt></span></dt>
@@ -103,10 +137,17 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.view.single_view.expression_semantics"></a><h4>
<a name="id518518"></a>
<a href="single_view.html#fusion.view.single_view.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.view.single_view.expression_semantics"></a><h5>
+<a name="id723305"></a>
+ <a class="link" href="single_view.html#fusion.view.single_view.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Semantics of an expression is defined only where it differs from, or is not
defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
@@ -159,10 +200,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.single_view.example"></a><h4>
<a name="id518828"></a>
<a href="single_view.html#fusion.view.single_view.example">Example</a>
</h4>
+=======
+<a name="fusion.view.single_view.example"></a><h5>
+<a name="id723528"></a>
+ <a class="link" href="single_view.html#fusion.view.single_view.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="identifier">single_view</span><span class="special"><</span><span class="keyword">int</span><span class="special">></span> <span class="identifier">view</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"><<</span> <span class="identifier">view</span> <span class="special"><<</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
</pre>
Modified: branches/release/libs/fusion/doc/html/fusion/view/transform_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/transform_view.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/view/transform_view.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>transform_view</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="../view.html" title="View">
<link rel="previous" href="zip_view.html" title="zip_view">
@@ -38,17 +42,31 @@
inherits the traversal characteristics (see <a href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence
Traversal Concept</a>) of its underlying sequence or sequences.
</p>
+<<<<<<< .working
<a name="fusion.view.transform_view.header"></a><h4>
<a name="id524861"></a>
<a href="transform_view.html#fusion.view.transform_view.header">Header</a>
</h4>
+=======
+<a name="fusion.view.transform_view.header"></a><h5>
+<a name="id732614"></a>
+ <a class="link" href="transform_view.html#fusion.view.transform_view.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">view</span><span class="special">/</span><span class="identifier">transform_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">transform_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.view.transform_view.synopsis"></a><h4>
<a name="id525017"></a>
<a href="transform_view.html#fusion.view.transform_view.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.view.transform_view.synopsis"></a><h5>
+<a name="id732722"></a>
+ <a class="link" href="transform_view.html#fusion.view.transform_view.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
<span class="bold"><b>Unary Version</b></span>
</p>
@@ -61,10 +79,17 @@
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequence1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence2</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">F2</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">transform_view</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.view.transform_view.template_parameters"></a><h4>
<a name="id525221"></a>
<a href="transform_view.html#fusion.view.transform_view.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.view.transform_view.template_parameters"></a><h5>
+<a name="id732868"></a>
+ <a class="link" href="transform_view.html#fusion.view.transform_view.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -147,6 +172,7 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.transform_view.model_of"></a><h4>
<a name="id525686"></a>
<a href="transform_view.html#fusion.view.transform_view.model_of">Model of</a>
@@ -158,6 +184,16 @@
Sequence">Bidirectional
Sequence</a> or <a href="../sequence/concepts/random_access_sequence.html" title="Random
Access Sequence">Random
+=======
+<a name="fusion.view.transform_view.model_of"></a><h5>
+<a name="id733216"></a>
+ <a class="link" href="transform_view.html#fusion.view.transform_view.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>,
+ <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> or <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+>>>>>>> .merge-right.r57125
Access Sequence</a> depending on the traversal characteristics (see
<a href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence Traversal Concept</a>)
of its underlying sequence.
@@ -206,9 +242,15 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.view.transform_view.expression_semantics"></a><h4>
<a name="id526088"></a>
<a href="transform_view.html#fusion.view.transform_view.expression_semantics">Expression
+=======
+<a name="fusion.view.transform_view.expression_semantics"></a><h5>
+<a name="id733498"></a>
+ <a class="link" href="transform_view.html#fusion.view.transform_view.expression_semantics">Expression
+>>>>>>> .merge-right.r57125
Semantics</a>
</h4>
<p>
@@ -281,10 +323,17 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.transform_view.example"></a><h4>
<a name="id526566"></a>
<a href="transform_view.html#fusion.view.transform_view.example">Example</a>
</h4>
+=======
+<a name="fusion.view.transform_view.example"></a><h5>
+<a name="id733832"></a>
+ <a class="link" href="transform_view.html#fusion.view.transform_view.example">Example</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">square</span>
<span class="special">{</span>
<span class="keyword">template</span><span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sig</span><span class="special">></span>
Modified: branches/release/libs/fusion/doc/html/fusion/view/zip_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/zip_view.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/view/zip_view.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>zip_view</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="../view.html" title="View">
<link rel="previous" href="joint_view.html" title="joint_view">
@@ -22,6 +26,7 @@
<div class="spirit-nav">
<a accesskey="p" href="joint_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.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="transform_view.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="id523475"></a>
<a href="zip_view.html#fusion.view.zip_view.description">Description</a>
</h4>
+=======
+<div class="section" title="zip_view">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.view.zip_view"></a><a class="link" href="zip_view.html" title="zip_view">zip_view</a>
+</h3></div></div></div>
+<a name="fusion.view.zip_view.description"></a><h5>
+<a name="id731648"></a>
+ <a class="link" href="zip_view.html#fusion.view.zip_view.description">Description</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
<tt class="computeroutput"><span class="identifier">zip_view</span></tt> presents a view
which iterates over a collection of Sequence(s)
@@ -40,24 +55,45 @@
constructed from a Sequence of references
to the component <span class="underline">_sequence</span>_s.
</p>
+<<<<<<< .working
<a name="fusion.view.zip_view.header"></a><h4>
<a name="id523552"></a>
<a href="zip_view.html#fusion.view.zip_view.header">Header</a>
</h4>
+=======
+<a name="fusion.view.zip_view.header"></a><h5>
+<a name="id731695"></a>
+ <a class="link" href="zip_view.html#fusion.view.zip_view.header">Header</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="preprocessor">#include</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">view</span><span class="special">/</span><span class="identifier">zip_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
<span class="preprocessor">#include</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">include</span><span class="special">/</span><span class="identifier">zip_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span>
</pre>
+<<<<<<< .working
<a name="fusion.view.zip_view.synopsis"></a><h4>
<a name="id523707"></a>
<a href="zip_view.html#fusion.view.zip_view.synopsis">Synopsis</a>
</h4>
+=======
+<a name="fusion.view.zip_view.synopsis"></a><h5>
+<a name="id731803"></a>
+ <a class="link" href="zip_view.html#fusion.view.zip_view.synopsis">Synopsis</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Sequences</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">zip_view</span><span class="special">;</span>
</pre>
+<<<<<<< .working
<a name="fusion.view.zip_view.template_parameters"></a><h4>
<a name="id523785"></a>
<a href="zip_view.html#fusion.view.zip_view.template_parameters">Template parameters</a>
</h4>
+=======
+<a name="fusion.view.zip_view.template_parameters"></a><h5>
+<a name="id731854"></a>
+ <a class="link" href="zip_view.html#fusion.view.zip_view.template_parameters">Template parameters</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -88,6 +124,7 @@
</p></td>
</tr></tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.zip_view.model_of"></a><h4>
<a name="id523904"></a>
<a href="zip_view.html#fusion.view.zip_view.model_of">Model of</a>
@@ -99,6 +136,16 @@
Sequence">Bidirectional
Sequence</a> or <a href="../sequence/concepts/random_access_sequence.html" title="Random
Access Sequence">Random
+=======
+<a name="fusion.view.zip_view.model_of"></a><h5>
+<a name="id731947"></a>
+ <a class="link" href="zip_view.html#fusion.view.zip_view.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>,
+ <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+ Sequence</a> or <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+>>>>>>> .merge-right.r57125
Access Sequence</a> depending on the traversal characteristics (see
<a href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence Traversal Concept</a>)
of its underlying sequence.
@@ -121,10 +168,17 @@
</p></dd>
</dl>
</div>
+<<<<<<< .working
<a name="fusion.view.zip_view.expression_semantics"></a><h4>
<a name="id524097"></a>
<a href="zip_view.html#fusion.view.zip_view.expression_semantics">Expression Semantics</a>
</h4>
+=======
+<a name="fusion.view.zip_view.expression_semantics"></a><h5>
+<a name="id732078"></a>
+ <a class="link" href="zip_view.html#fusion.view.zip_view.expression_semantics">Expression Semantics</a>
+ </h5>
+>>>>>>> .merge-right.r57125
<p>
Semantics of an expression is defined only where it differs from, or is not
defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
@@ -177,12 +231,21 @@
</tr>
</tbody>
</table></div>
+<<<<<<< .working
<a name="fusion.view.zip_view.example"></a><h4>
<a name="id524404"></a>
<a href="zip_view.html#fusion.view.zip_view.example">Example</a>
</h4>
<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">></span> <span class="identifier">vec1</span><span class="special">;</span>
<span class="keyword">typedef</span> vector<span class="special"><</span><span class="keyword">char</span><span class="special">,</span><span class="keyword">char</span><span class="special">></span> <span class="identifier">vec2</span><span class="special">;</span>
+=======
+<a name="fusion.view.zip_view.example"></a><h5>
+<a name="id732298"></a>
+ <a class="link" href="zip_view.html#fusion.view.zip_view.example">Example</a>
+ </h5>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">></span> <span class="identifier">vec1</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special"><</span><span class="keyword">char</span><span class="special">,</span><span class="keyword">char</span><span class="special">></span> <span class="identifier">vec2</span><span class="special">;</span>
+>>>>>>> .merge-right.r57125
<span class="identifier">vec1</span> <span class="identifier">v1</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">vec2</span> <span class="identifier">v2</span><span class="special">(</span><span class="char">'a'</span><span class="special">,</span><span class="char">'b'</span><span class="special">);</span>
<span class="keyword">typedef</span> vector<span class="special"><</span><span class="identifier">vec1</span><span class="special">&,</span> <span class="identifier">vec2</span><span class="special">&></span> <span class="identifier">sequences</span><span class="special">;</span>
Modified: branches/release/libs/fusion/doc/html/index.html
==============================================================================
--- branches/release/libs/fusion/doc/html/index.html (original)
+++ branches/release/libs/fusion/doc/html/index.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">
-<title>Chapter 1. Fusion 2.0</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Chapter 1. Fusion 2.0</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 1. Fusion 2.0">
+>>>>>>> .merge-right.r58299
<link rel="next" href="fusion/preface.html" title="Preface">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -18,11 +26,16 @@
</tr></table>
<hr>
<div class="spirit-nav"><a accesskey="n" href="fusion/preface.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
+<<<<<<< .working
<div class="chapter" lang="en">
<div class="titlepage">
<div>
+=======
+<div class="chapter" title="Chapter 1. Fusion 2.0">
+<div class="titlepage"><div>
+>>>>>>> .merge-right.r58299
<div><h2 class="title">
-<a name="fusion"></a>Chapter 1. Fusion 2.0</h2></div>
+<a name="fusion"></a>Chapter 1. Fusion 2.0</h2></div>
<div><div class="author"><h3 class="author">
<span class="firstname">Joel</span> <span class="surname">de Guzman</span>
</h3></div></div>
@@ -32,9 +45,14 @@
<div><div class="author"><h3 class="author">
<span class="firstname">Tobias</span> <span class="surname">Schwinger</span>
</h3></div></div>
-<div><p class="copyright">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<div><p class="copyright">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
Schwinger</p></div>
+<<<<<<< .working
<div><div class="legalnotice"><p>
+=======
+<div><div class="legalnotice" title="Legal Notice">
+<a name="id613974"></a><p>
+>>>>>>> .merge-right.r57125
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
</p></div></div>
@@ -68,6 +86,8 @@
Iterator</a></span></dt>
<dt><span class="section"><a href="fusion/iterator/concepts/random_access_iterator.html">Random
Access Iterator</a></span></dt>
+<dt><span class="section"><a href="fusion/iterator/concepts/associative_iterator.html">Associative
+ Iterator</a></span></dt>
</dl></dd>
<dt><span class="section">Functions</span></dt>
<dd><dl>
@@ -77,6 +97,7 @@
<dt><span class="section">distance</span></dt>
<dt><span class="section">advance</span></dt>
<dt><span class="section">advance_c</span></dt>
+<dt><span class="section">deref_data</span></dt>
</dl></dd>
<dt><span class="section">Operator</span></dt>
<dd><dl>
@@ -97,6 +118,9 @@
<dt><span class="section">distance</span></dt>
<dt><span class="section">advance</span></dt>
<dt><span class="section">advance_c</span></dt>
+<dt><span class="section">key_of</span></dt>
+<dt><span class="section">value_of_data</span></dt>
+<dt><span class="section">deref_data</span></dt>
</dl></dd>
</dl></dd>
<dt><span class="section">Sequence</span></dt>
@@ -242,7 +266,31 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
<td align="left"><p><small>Last revised: October 11, 2009 at 16:05:02 GMT</small></p></td>
+=======
+<td align="left"><p><small>Last revised: October 20, 2009 at 14:59:29 GMT</small></p></td>
+=======
+<td align="left"><p><small>Last revised: October 30, 2009 at 00:09:36 GMT</small></p></td>
+=======
+<td align="left"><p><small>Last revised: November 03, 2009 at 17:25:59 GMT</small></p></td>
+=======
+<td align="left"><p><small>Last revised: December 11, 2009 at 10:57:59 GMT</small></p></td>
+=======
+<td align="left"><p><small>Last revised: December 28, 2009 at 16:58:16 GMT</small></p></td>
+=======
+<td align="left"><p><small>Last revised: December 29, 2009 at 14:02:18 GMT</small></p></td>
+>>>>>>> .merge-right.r58559
+>>>>>>> .merge-right.r58549
+>>>>>>> .merge-right.r58299
+>>>>>>> .merge-right.r57337
+>>>>>>> .merge-right.r57242
+>>>>>>> .merge-right.r57125
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: branches/release/libs/fusion/doc/iterator.qbk
==============================================================================
--- branches/release/libs/fusion/doc/iterator.qbk (original)
+++ branches/release/libs/fusion/doc/iterator.qbk 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -20,7 +20,9 @@
Fusion iterators are divided into different traversal categories.
__forward_iterator__ is the most basic concept. __bidirectional_iterator__
is a refinement of __forward_iterator__. __random_access_iterator__ is a
-refinement of __bidirectional_iterator__.
+refinement of __bidirectional_iterator__. __associative_iterator__ is a
+refinement of __forward_iterator__, __bidirectional_iterator__ or
+__random_access_iterator__.
[section Forward Iterator]
@@ -210,6 +212,47 @@
[endsect]
+[section Associative Iterator]
+[heading Description]
+An Associative Iterator provides additional semantics to obtain the properties
+of the element of an associative forward, bidirectional or random access sequence.
+
+[variablelist Notation
+ [[`i`] [Associative Iterator]]
+ [[`I`] [Associative Iterator type]]
+]
+
+[heading Refinement of]
+__forward_iterator__, __bidirectional_iterator__ or __random_access_iterator__
+
+[heading Expression requirements]
+In addition to the requirements defined in __forward_iterator__,
+__bidirectional_iterator__ or __random_access_iterator__ the following
+expressions must be valid:
+
+[table
+ [[Expression] [Return type] [Runtime Complexity]]
+ [[`__deref_data__(i)`][`__result_of_deref_data__<I>::type`][Constant]]
+]
+
+[heading Meta Expressions]
+[table
+ [[Expression] [Compile Time Complexity]]
+ [[`__result_of_key_of__<I>::type`][Amortized constant time]]
+ [[`__result_of_value_of_data__<I>::type`][Amortized constant time]]
+ [[`__result_of_deref_data__<I>::type`][Amortized constant time]]
+]
+
+[heading Models]
+* __map__ iterator
+* __set__ iterator
+* __filter_view__ iterator (where adapted sequence is an __associative_sequence__ and a __forward_sequence__)
+* __iterator_range__ iterator (where adapted iterators are __associative_iterator__\ s)
+* __joint_view__ iterator (where adapted sequences are __associative_sequence__\ s and __forward_sequence__\ s)
+* __reverse_view__ iterator (where adapted sequence is an __associative_sequence__ and a __bidirectional_sequence__)
+
+[endsect]
+
[endsect]
[section Functions]
@@ -437,6 +480,43 @@
[endsect]
+[section deref_data]
+
+[heading Description]
+Deferences the data property associated with the element referenced by an associative iterator.
+
+[heading Synopsis]
+ template<
+ typename I
+ >
+ typename __result_of_deref_data__<I>::type deref(I const& i);
+
+[table Parameters
+ [[Parameter] [Requirement] [Description]]
+ [[`i`] [Model of __associative_iterator__] [Operation's argument]]
+]
+
+[heading Expression Semantics]
+ __deref_data__(i);
+
+[*Return type]: `__result_of_deref_data__<I>::type`
+
+[*Semantics]: Dereferences the data property associated with the element referenced by an associative iterator `i`.
+
+[heading Header]
+ #include <boost/fusion/iterator/deref_data.hpp>
+ #include <boost/fusion/include/deref_data.hpp>
+
+[heading Example]
+ typedef __map__<__pair__<float,int&> > map;
+
+ int i(0);
+ map m(1.0f,i);
+ assert(__deref_data__(__begin__(m)) == 0);
+ assert(&(__deref_data__(__begin__(m))) == &i);
+
+[endsect]
+
[endsect]
[section Operator]
@@ -876,6 +956,122 @@
[endsect]
+[section key_of]
+
+[heading Description]
+
+Returns the key type associated with the element referenced by an associative iterator.
+
+[heading Synopsis]
+ template<
+ typename I
+ >
+ struct key_of
+ {
+ typedef __unspecified__ type;
+ };
+
+[table Parameters
+ [[Parameter] [Requirement] [Description]]
+ [[`I`] [Model of __associative_iterator__] [Operation's argument]]
+]
+
+[heading Expression Semantics]
+ __result_of_key_of__<I>::type
+
+[*Return type]: Any type
+
+[*Semantics]: Returns the key type associated with the element referenced by an associative iterator `I`.
+
+[heading Header]
+ #include <boost/fusion/iterator/key_of.hpp>
+ #include <boost/fusion/include/key_of.hpp>
+
+[heading Example]
+ typedef __map__<__pair__<float,int> > vec;
+ typedef __result_of_begin__<vec>::type first;
+
+ BOOST_MPL_ASSERT((boost::is_same<__result_of_key_of__<first>::type, float>));
+
+[endsect]
+
+[section value_of_data]
+
+[heading Description]
+
+Returns the type of the data property associated with the element referenced by an associative iterator references.
+
+[heading Synopsis]
+ template<
+ typename I
+ >
+ struct value_of_data
+ {
+ typedef __unspecified__ type;
+ };
+
+[table Parameters
+ [[Parameter] [Requirement] [Description]]
+ [[`I`] [Model of __associative_iterator__] [Operation's argument]]
+]
+
+[heading Expression Semantics]
+ __result_of_value_of_data__<I>::type
+
+[*Return type]: Any type
+
+[*Semantics]: Returns the type of the data property associated with the element referenced by an associative iterator `I`.
+
+[heading Header]
+ #include <boost/fusion/iterator/value_of_data.hpp>
+ #include <boost/fusion/include/value_of_data.hpp>
+
+[heading Example]
+ typedef __map__<__pair__<float,int> > vec;
+ typedef __result_of_begin__<vec>::type first;
+
+ BOOST_MPL_ASSERT((boost::is_same<__result_of_value_of_data__<first>::type, int>));
+
+[endsect]
+
+[section deref_data]
+
+[heading Description]
+Returns the type that will be returned by dereferencing the data property referenced by an associative iterator.
+
+[heading Synposis]
+ template<
+ typename I
+ >
+ struct deref_data
+ {
+ typedef __unspecified__ type;
+ };
+
+[table Parameters
+ [[Parameter] [Requirement] [Description]]
+ [[`I`] [Model of __associative_iterator__] [Operation's argument]]
+]
+
+[heading Expression Semantics]
+ __result_of_deref_data__<I>::type
+
+[*Return type]: Any type
+
+[*Semantics]: Returns the result of dereferencing the data property referenced by an associative iterator of type `I`.
+
+[heading Header]
+ #include <boosta/fusion/iterator/deref_data.hpp>
+ #include <boost/fusion/include/deref_data.hpp>
+
+[heading Example]
+ typedef __map__<__pair__<float,int> > map;
+ typedef __result_of_begin__<vec>::type first;
+
+ BOOST_MPL_ASSERT((boost::is_same<__result_of_deref_data__<first>::type, int&>));
+
+[endsect]
+
[endsect]
[endsect]
Modified: branches/release/libs/fusion/doc/sequence.qbk
==============================================================================
--- branches/release/libs/fusion/doc/sequence.qbk (original)
+++ branches/release/libs/fusion/doc/sequence.qbk 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -191,7 +191,7 @@
* __reverse_view__
* __iterator_range__ (where adapted sequence is a Bidirectional Sequence)
* __transform_view__ (where adapted sequence is a Bidirectional Sequence)
-* __zip_view__ (where adapted sequences are models Bidirectional Sequence)
+* __zip_view__ (where adapted sequences are models of Bidirectional Sequence)
[endsect]
@@ -266,7 +266,7 @@
* __reverse_view__
* __iterator_range__ (where adapted sequence is a Random Access Sequence)
* __transform_view__ (where adapted sequence is a Random Access Sequence)
-* __zip_view__ (where adapted sequences are models Random Access Sequence)
+* __zip_view__ (where adapted sequences are models of Random Access Sequence)
[endsect]
@@ -277,13 +277,7 @@
An Associative Sequence allows efficient retrieval of elements based on keys.
Like associative sequences in __mpl__, and unlike associative containers in
__stl__, Fusion associative sequences have no implied ordering relation.
-Instead, type identity is used to impose an equivalence relation on keys, and
-the order in which sequence elements are traversed during iteration is left
-unspecified. In addition, unlike __stl__, Associative Sequences have mutable
-iterators. This is due to the fact that there is no associated ordering relation
-and the runtime value of the keys themselves do not have any effect on the
-associativity of the sequence.
-
+Instead, type identity is used to impose an equivalence relation on keys.
[variablelist Notation
[[`s`] [An Associative Sequence]]
@@ -340,6 +334,10 @@
* __set__
* __map__
+* __filter_view__ (where adapted sequence is an __associative_sequence__ and a __forward_sequence__)
+* __iterator_range__ (where adapted iterators are __associative_iterator__\ s)
+* __joint_view__ (where adapted sequences are __associative_sequence__\ s and __forward_sequence__\ s)
+* __reverse_view__ (where adapted sequence is an __associative_sequence__ and a __bidirectional_sequence__)
[endsect]
@@ -388,9 +386,12 @@
begin(seq);
-[*Return type]: __forward_iterator__ if `seq` is a __forward_sequence__
+[*Return type]:
+
+* A model of __forward_iterator__ if `seq` is a __forward_sequence__
else, __bidirectional_iterator__ if `seq` is a __bidirectional_sequence__
else, __random_access_iterator__ if `seq` is a __random_access_sequence__.
+* A model of __associative_iterator__ if `seq` is an __associative_sequence__.
[*Semantics]: Returns an iterator pointing to the first element in the sequence.
@@ -433,9 +434,12 @@
end(seq);
-[*Return type]: __forward_iterator__ if `seq` is a __forward_sequence__
+[*Return type]:
+
+* A model of __forward_iterator__ if `seq` is a __forward_sequence__
else, __bidirectional_iterator__ if `seq` is a __bidirectional_sequence__
else, __random_access_iterator__ if `seq` is a __random_access_sequence__.
+* A model of __associative_iterator__ if `seq` is an __associative_sequence__.
[*Semantics]: Returns an iterator pointing to one element past the end of
the sequence.
@@ -888,11 +892,19 @@
[heading Expression Semantics]
result_of::begin<Seq>::type
-[*Return type]: An iterator modelling the same traversal concept as `Seq`.
+[*Return type]:
+
+* A model of __forward_iterator__ if `seq` is a __forward_sequence__
+else, __bidirectional_iterator__ if `seq` is a __bidirectional_sequence__
+else, __random_access_iterator__ if `seq` is a __random_access_sequence__.
+* A model of __associative_iterator__ if `seq` is an __associative_sequence__.
[*Semantics]: Returns the type of an iterator to the first element of `Seq`.
-/sequence/intrinsic/begin.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/begin.hpp>
+ #include <boost/fusion/include/begin.hpp>
[heading Example]
typedef __vector__<int> vec;
@@ -921,11 +933,19 @@
[heading Expression Semantics]
result_of::end<Seq>::type
-[*Return type]: A model of the same traversal concept as `Seq`.
+[*Return type]:
+
+* A model of __forward_iterator__ if `seq` is a __forward_sequence__
+else, __bidirectional_iterator__ if `seq` is a __bidirectional_sequence__
+else, __random_access_iterator__ if `seq` is a __random_access_sequence__.
+* A model of __associative_iterator__ if `seq` is an __associative_sequence__.
[*Semantics]: Returns the type of an iterator one past the end of `Seq`.
-/sequence/intrinsic/end.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/end.hpp>
+ #include <boost/fusion/include/end.hpp>
[heading Example]
typedef __vector__<int> vec;
@@ -958,7 +978,10 @@
[*Semantics]: Returns `mpl::true_` if `Seq` has zero elements, `mpl::false_` otherwise.
-/sequence/intrinsic/empty.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/empty.hpp>
+ #include <boost/fusion/include/empty.hpp>
[heading Example]
typedef __vector__<> empty_vec;
@@ -993,7 +1016,10 @@
[*Semantics]: The type returned by dereferencing an iterator to the first element in `Seq`. Equivalent to `__result_of_deref__<__result_of_begin__<Seq>::type>::type`.
-/sequence/intrinsic/front.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/front.hpp>
+ #include <boost/fusion/include/front.hpp>
[heading Example]
typedef __vector__<int,char> vec;
@@ -1025,7 +1051,10 @@
[*Semantics]: The type returned by dereferencing an iterator to the last element in the sequence. Equivalent to `__result_of_deref__<__result_of_prior__<__result_of_end__<Seq>::type>::type>::type`.
-/sequence/intrinsic/back.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/back.hpp>
+ #include <boost/fusion/include/back.hpp>
[heading Example]
typedef __vector__<int,char> vec;
@@ -1057,7 +1086,10 @@
[*Semantics]: Returns the number of elements in `Seq`.
-/sequence/intrinsic/size.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/size.hpp>
+ #include <boost/fusion/include/size.hpp>
[heading Example]
typedef __vector__<int,float,char> vec;
@@ -1097,7 +1129,10 @@
[*Semantics]: Returns the result type of using __at__ to access the `N`th element of `Seq`.
-/sequence/intrinsic/at.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/at.hpp>
+ #include <boost/fusion/include/at.hpp>
[heading Example]
typedef __vector__<int,float,char> vec;
@@ -1136,7 +1171,10 @@
[*Semantics]: Returns the result type of using __at_c__ to access the `M`th element of `Seq`.
-/sequence/intrinsic/at.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/at.hpp>
+ #include <boost/fusion/include/at.hpp>
[heading Example]
typedef __vector__<int,float,char> vec;
@@ -1172,7 +1210,10 @@
[*Semantics]: Returns the actual type at the `N`th element of `Seq`.
-/sequence/intrinsic/value_at.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/value_at.hpp>
+ #include <boost/fusion/include/value_at.hpp>
[heading Example]
typedef __vector__<int,float,char> vec;
@@ -1208,7 +1249,10 @@
[*Semantics]: Returns the actual type at the `M`th element of `Seq`.
-/sequence/intrinsic/value_at.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/value_at.hpp>
+ #include <boost/fusion/include/value_at.hpp>
[heading Example]
typedef __vector__<int,float,char> vec;
@@ -1243,7 +1287,10 @@
[*Semantics]: Returns `mpl::true_` if `Seq` contains an element with key type `Key`, returns `mpl::false_` otherwise.
-/sequence/intrinsic/has_key.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/has_key.hpp>
+ #include <boost/fusion/include/has_key.hpp>
[heading Example]
typedef __map__<__pair__<int, char>, __pair__<char, char>, __pair__<double, char> > mymap;
@@ -1283,7 +1330,10 @@
[*Semantics]: Returns the result of using __at_key__ to access the element with key type `Key` in `Seq`.
-/sequence/intrinsic/at_key.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/at_key.hpp>
+ #include <boost/fusion/include/at_key.hpp>
[heading Example]
typedef __map__<__pair__<int, char>, __pair__<char, char>, __pair__<double, char> > mymap;
@@ -1319,8 +1369,11 @@
[*Semantics]: Returns the actual element type associated with key type
`Key` in `Seq`.
-/sequence/intrinsic/value_at_key.hpp>
+[heading Header]
+ #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
+ #include <boost/fusion/include/value_at_key.hpp>
+
[heading Example]
typedef __map__<__pair__<int, char>, __pair__<char, char>, __pair__<double, char> > mymap;
BOOST_MPL_ASSERT((boost::is_same<__result_of_at_key__<mymap, int>::type, char>));
@@ -1351,7 +1404,10 @@
[*Semantics]: Always returns `void`.
-/sequence/intrinsic/swap.hpp>
+[heading Header]
+
+ #include <boost/fusion/sequence/intrinsic/swap.hpp>
+ #include <boost/fusion/include/swap.hpp>
[endsect]
Modified: branches/release/libs/fusion/doc/support.qbk
==============================================================================
--- branches/release/libs/fusion/doc/support.qbk (original)
+++ branches/release/libs/fusion/doc/support.qbk 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -202,7 +202,7 @@
[*Return type]:
-For Iterators, the return type is derived from one of:
+The return type is derived from one of:
namespace boost { namespace fusion
{
@@ -221,30 +221,11 @@
: bidirectional_traversal_tag {};
}}
-For Sequences, the return type is derived from one of:
-
- namespace boost { namespace fusion
- {
- struct incrementable_sequence_tag {};
-
- struct single_pass_sequence_tag
- : incrementable_sequence_tag {};
-
- struct forward_traversal_tag
- : single_pass_sequence_tag {};
-
- struct bidirectional_traversal_tag
- : forward_traversal_tag {};
-
- struct random_access_traversal_tag
- : bidirectional_traversal_tag {};
- }}
-
And optionally from:
namespace boost { namespace fusion
{
- struct associative_sequence_tag {};
+ struct associative_tag {};
}}
[*Semantics]: Establishes the conceptual classification of a particular
@@ -363,7 +344,7 @@
Fusion `pair` type is a half runtime pair. A half runtime pair is similar
to a __std_pair__, but, unlike __std_pair__, the first type does not have data.
-It is used as elements in __map__s, for example.
+It is used as elements in __map__\ s, for example.
[heading Synopsis]
Modified: branches/release/libs/fusion/doc/view.qbk
==============================================================================
--- branches/release/libs/fusion/doc/view.qbk (original)
+++ branches/release/libs/fusion/doc/view.qbk 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -101,6 +101,7 @@
[heading Model of]
* __forward_sequence__
+* __associative_sequence__ if `Sequence` implements the __associative_sequence__ model.
[variablelist Notation
[[`F`] [A `filter_view` type]]
@@ -111,7 +112,7 @@
[heading Expression Semantics]
Semantics of an expression is defined only where it differs from, or is not
-defined in __forward_sequence__.
+defined in the implemented models.
[table
[[Expression] [Semantics]]
@@ -164,6 +165,7 @@
* __forward_sequence__, __bidirectional_sequence__ or
__random_access_sequence__ depending on the traversal characteristics (see
__traversal_concept__) of its underlying sequence.
+* __associative_sequence__ if `First` and `Last` implement the __associative_iterator__ model.
[variablelist Notation
[[`IR`] [An `iterator_range` type]]
@@ -175,7 +177,7 @@
[heading Expression Semantics]
Semantics of an expression is defined only where it differs from, or is not
-defined in __forward_sequence__.
+defined in the implemented models.
[table
[[Expression] [Semantics]]
@@ -230,6 +232,7 @@
[heading Model of]
* __forward_sequence__
+* __associative_sequence__ if `Sequence1` and `Sequence2` implement the __associative_sequence__ model.
[variablelist Notation
[[`JV`] [A `joint_view` type]]
@@ -241,7 +244,7 @@
[heading Expression Semantics]
Semantics of an expression is defined only where it differs from, or is not
-defined in __forward_sequence__.
+defined in the implemented models.
[table
[[Expression] [Semantics]]
@@ -443,7 +446,9 @@
[heading Model of]
-* __bidirectional_sequence__
+* A model of __bidirectional_sequence__ if `Sequence` is a __bidirectional_sequence__
+else, __random_access_sequence__ if `Sequence` is a __random_access_sequence__.
+* __associative_sequence__ if `Sequence` implements the __associative_sequence__ model.
[variablelist Notation
[[`RV`] [A `reverse_view` type]]
@@ -454,7 +459,7 @@
[heading Expression Semantics]
Semantics of an expression is defined only where it differs from, or is not
-defined in __bidirectional_sequence__.
+defined in the implemented models.
[table
[[Expression] [Semantics]]
Modified: branches/release/libs/fusion/example/extension/detail/category_of_impl.hpp
==============================================================================
--- branches/release/libs/fusion/example/extension/detail/category_of_impl.hpp (original)
+++ branches/release/libs/fusion/example/extension/detail/category_of_impl.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -25,7 +25,7 @@
template<typename Sequence>
struct apply
{
- struct type : random_access_traversal_tag, associative_sequence_tag {};
+ struct type : random_access_traversal_tag, associative_tag {};
};
};
}
Modified: branches/release/libs/fusion/example/extension/example_struct_iterator.hpp
==============================================================================
--- branches/release/libs/fusion/example/extension/example_struct_iterator.hpp (original)
+++ branches/release/libs/fusion/example/extension/example_struct_iterator.hpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -9,6 +9,7 @@
#define BOOST_FUSION_EXAMPLE_STRUCT_ITERATOR
#include <boost/fusion/support/iterator_base.hpp>
+#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/support/tag_of_fwd.hpp>
#include <boost/mpl/int.hpp>
#include <boost/type_traits/add_const.hpp>
@@ -21,6 +22,9 @@
#include "./detail/distance_impl.hpp"
#include "./detail/value_of_impl.hpp"
#include "./detail/equal_to_impl.hpp"
+#include "./detail/key_of_impl.hpp"
+#include "./detail/value_of_data_impl.hpp"
+#include "./detail/deref_data_impl.hpp"
namespace example
{
@@ -32,8 +36,6 @@
namespace boost { namespace fusion {
- struct random_access_traversal_tag;
-
namespace traits
{
template<typename Struct, int Pos>
@@ -52,7 +54,11 @@
BOOST_STATIC_ASSERT(Pos >=0 && Pos < 3);
typedef Struct struct_type;
typedef boost::mpl::int_<Pos> index;
- typedef boost::fusion::random_access_traversal_tag category;
+
+ struct category
+ : boost::fusion::random_access_traversal_tag
+ , boost::fusion::associative_tag
+ {};
example_struct_iterator(Struct& str)
: struct_(str) {}
Modified: branches/release/libs/fusion/example/extension/test_example.cpp
==============================================================================
--- branches/release/libs/fusion/example/extension/test_example.cpp (original)
+++ branches/release/libs/fusion/example/extension/test_example.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -56,6 +56,9 @@
BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<example::example_struct, fields::name>::type, std::string>));
BOOST_MPL_ASSERT((boost::is_same<result_of::value_at_key<example::example_struct, fields::age>::type, int>));
+ BOOST_TEST(deref_data(begin(bert)) == "bert");
+ BOOST_TEST(deref_data(next(begin(bert))) == 99);
+
BOOST_TEST(size(bert) == 2);
return boost::report_errors();
Modified: branches/release/libs/fusion/example/performance/accumulate.cpp
==============================================================================
--- branches/release/libs/fusion/example/performance/accumulate.cpp (original)
+++ branches/release/libs/fusion/example/performance/accumulate.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -250,14 +250,14 @@
template<typename Lhs, typename Rhs>
struct result
{
- typedef Rhs type;
+ typedef Lhs type;
};
template<typename Lhs, typename Rhs>
typename result<Lhs,Rhs>::type
operator()(const Lhs& lhs, const Rhs& rhs) const
{
- return rhs + boost::fusion::at_c<0>(lhs) * boost::fusion::at_c<1>(lhs);
+ return lhs + boost::fusion::at_c<0>(rhs) * boost::fusion::at_c<1>(rhs);
}
};
Modified: branches/release/libs/fusion/example/performance/inner_product2.cpp
==============================================================================
--- branches/release/libs/fusion/example/performance/inner_product2.cpp (original)
+++ branches/release/libs/fusion/example/performance/inner_product2.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -121,14 +121,14 @@
template<typename Lhs, typename Rhs>
struct result<poly_combine(Lhs, Rhs)>
- : boost::remove_reference<Rhs>
+ : boost::remove_reference<Lhs>
{};
template<typename Lhs, typename Rhs>
typename result<poly_combine(Lhs,Rhs)>::type
operator()(const Lhs& lhs, const Rhs& rhs) const
{
- return rhs + boost::fusion::at_c<0>(lhs) * boost::fusion::at_c<1>(lhs);
+ return lhs + boost::fusion::at_c<0>(rhs) * boost::fusion::at_c<1>(rhs);
}
};
Modified: branches/release/libs/fusion/test/algorithm/erase_key.cpp
==============================================================================
--- branches/release/libs/fusion/test/algorithm/erase_key.cpp (original)
+++ branches/release/libs/fusion/test/algorithm/erase_key.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -66,8 +66,8 @@
std::cout << tuple_close(']');
std::cout << tuple_delimiter(", ");
- test_set(as_set(erase_key<char>(make_set(1, 'x', 1.5, std::string("hello")))));
- test_map(as_map(erase_key<_2>(make_map<_1, _2, _3, _4>(1, 'x', 1.5, "hello"))));
+ test_set(erase_key<char>(make_set(1, 'x', 1.5, std::string("hello"))));
+ test_map(erase_key<_2>(make_map<_1, _2, _3, _4>(1, 'x', 1.5, "hello")));
return boost::report_errors();
}
Modified: branches/release/libs/fusion/test/algorithm/fold.cpp
==============================================================================
--- branches/release/libs/fusion/test/algorithm/fold.cpp (original)
+++ branches/release/libs/fusion/test/algorithm/fold.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -34,22 +34,22 @@
template<typename T>
struct result;
- template <typename T, typename State>
- struct result<add_ints_only(T,State)>
+ template <typename State, typename T>
+ struct result<add_ints_only(State, T)>
{
typedef typename boost::remove_const<
typename boost::remove_reference<State>::type>::type type;
};
- template <typename T, typename State>
- State const&
- operator()(T const& x, State const& state) const
+ template <typename State, typename T>
+ State
+ operator()(State const& state, T const& x) const
{
return state;
}
int
- operator()(int x, int state) const
+ operator()(int state, int x) const
{
return x + state;
}
@@ -60,13 +60,13 @@
template<typename T>
struct result;
- template <typename T, typename CountT>
- struct result<count_ints(T,CountT)>
+ template <typename CountT, typename T>
+ struct result<count_ints(CountT, T)>
{
typedef typename boost::remove_const<
- typename boost::remove_reference<T>::type>::type elem;
- typedef typename boost::remove_const<
typename boost::remove_reference<CountT>::type>::type state;
+ typedef typename boost::remove_const<
+ typename boost::remove_reference<T>::type>::type elem;
typedef typename
if_<
@@ -77,11 +77,11 @@
type;
};
- template <typename T, typename CountT>
- typename result<count_ints(T, CountT)>::type
- operator()(T const&, CountT const&) const
+ template <typename CountT, typename T>
+ typename result<count_ints(CountT, T)>::type
+ operator()(CountT const&, T const&) const
{
- typedef typename result<count_ints(T, CountT)>::type result;
+ typedef typename result<count_ints(CountT, T)>::type result;
return result();
}
};
@@ -90,7 +90,7 @@
{
typedef std::string result_type;
- std::string operator()(char c, std::string const& str) const
+ std::string operator()(std::string const& str, char c) const
{
return str + c;
}
@@ -102,14 +102,14 @@
struct result;
template<typename T0, typename T1>
- struct result<lvalue_adder(T0&, T1)>
+ struct result<lvalue_adder(T0, T1&)>
{
// Second argument still needs to support rvalues - see definition of fusion::fold
- typedef T0 type;
+ typedef T1 type;
};
template<typename T0, typename T1>
- T0 operator()(T0& lhs, T1 const& rhs) const
+ T1 operator()(T0 const& lhs, T1& rhs) const
{
return lhs + rhs;
}
Modified: branches/release/libs/fusion/test/compile_time/fold.cpp
==============================================================================
--- branches/release/libs/fusion/test/compile_time/fold.cpp (original)
+++ branches/release/libs/fusion/test/compile_time/fold.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -22,7 +22,7 @@
typedef int result_type;
template<int n, int batch>
- int operator()(distinct<n, batch> const& d, int state) const
+ int operator()(int state, distinct<n, batch> const& d) const
{
return state + n;
}
Modified: branches/release/libs/fusion/test/functional/make_unfused.cpp
==============================================================================
--- branches/release/libs/fusion/test/functional/make_unfused.cpp (original)
+++ branches/release/libs/fusion/test/functional/make_unfused.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -67,7 +67,7 @@
typedef long result_type;
template <typename T>
- long operator()(T & elem, long value) const
+ long operator()(long value, T & elem) const
{
elem += sizeof(T);
return value + elem;
Modified: branches/release/libs/fusion/test/functional/unfused.cpp
==============================================================================
--- branches/release/libs/fusion/test/functional/unfused.cpp (original)
+++ branches/release/libs/fusion/test/functional/unfused.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -57,7 +57,7 @@
typedef long result_type;
template <typename T>
- long operator()(T & elem, long value) const
+ long operator()(long value, T & elem) const
{
elem += sizeof(T);
return value + elem;
Modified: branches/release/libs/fusion/test/functional/unfused_typed.cpp
==============================================================================
--- branches/release/libs/fusion/test/functional/unfused_typed.cpp (original)
+++ branches/release/libs/fusion/test/functional/unfused_typed.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -63,13 +63,13 @@
typedef long result_type;
template <typename T>
- long operator()(T const & elem, long value) const
+ long operator()(long value, T const & elem) const
{
return value + sizeof(T) * elem;
}
template <typename T>
- long operator()(T & elem, long value) const
+ long operator()(long value, T & elem) const
{
elem += sizeof(T);
return value;
Modified: branches/release/libs/fusion/test/sequence/adapt_assoc_struct.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_assoc_struct.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_assoc_struct.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -14,6 +14,7 @@
#include <boost/fusion/sequence/intrinsic/back.hpp>
#include <boost/fusion/sequence/intrinsic/has_key.hpp>
#include <boost/fusion/sequence/intrinsic/at_key.hpp>
+#include <boost/fusion/sequence/intrinsic/value_at.hpp>
#include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
#include <boost/fusion/sequence/io/out.hpp>
#include <boost/fusion/container/vector/vector.hpp>
@@ -26,7 +27,10 @@
#include <boost/fusion/sequence/comparison/less_equal.hpp>
#include <boost/fusion/sequence/comparison/greater.hpp>
#include <boost/fusion/sequence/comparison/greater_equal.hpp>
+#include <boost/fusion/mpl.hpp>
#include <boost/fusion/support/is_view.hpp>
+#include <boost/mpl/front.hpp>
+#include <boost/mpl/is_sequence.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/mpl/not.hpp>
#include <boost/type_traits/is_same.hpp>
@@ -126,6 +130,13 @@
BOOST_TEST(at_key<ns::y_member>(p) == 3);
}
+ {
+ BOOST_MPL_ASSERT((mpl::is_sequence<ns::point>));
+ BOOST_MPL_ASSERT((boost::is_same<
+ fusion::result_of::value_at_c<ns::point,0>::type
+ , mpl::front<ns::point>::type>));
+ }
+
return boost::report_errors();
}
Modified: branches/release/libs/fusion/test/sequence/adapt_struct.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/adapt_struct.cpp (original)
+++ branches/release/libs/fusion/test/sequence/adapt_struct.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -11,6 +11,7 @@
#include <boost/fusion/sequence/intrinsic/empty.hpp>
#include <boost/fusion/sequence/intrinsic/front.hpp>
#include <boost/fusion/sequence/intrinsic/back.hpp>
+#include <boost/fusion/sequence/intrinsic/value_at.hpp>
#include <boost/fusion/sequence/io/out.hpp>
#include <boost/fusion/container/vector/vector.hpp>
#include <boost/fusion/container/list/list.hpp>
@@ -22,7 +23,10 @@
#include <boost/fusion/sequence/comparison/less_equal.hpp>
#include <boost/fusion/sequence/comparison/greater.hpp>
#include <boost/fusion/sequence/comparison/greater_equal.hpp>
+#include <boost/fusion/mpl.hpp>
#include <boost/fusion/support/is_view.hpp>
+#include <boost/mpl/front.hpp>
+#include <boost/mpl/is_sequence.hpp>
#include <boost/mpl/assert.hpp>
#include <iostream>
#include <string>
@@ -114,6 +118,14 @@
BOOST_MPL_ASSERT((is_same<result_of::next<b>::type, e>));
}
+
+ {
+ BOOST_MPL_ASSERT((mpl::is_sequence<ns::point>));
+ BOOST_MPL_ASSERT((boost::is_same<
+ fusion::result_of::value_at_c<ns::point,0>::type
+ , mpl::front<ns::point>::type>));
+ }
+
return boost::report_errors();
}
Modified: branches/release/libs/fusion/test/sequence/array.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/array.cpp (original)
+++ branches/release/libs/fusion/test/sequence/array.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -15,8 +15,12 @@
#include <boost/fusion/support/is_sequence.hpp>
#include <boost/fusion/support/is_view.hpp>
#include <boost/fusion/iterator.hpp>
+#include <boost/fusion/mpl.hpp>
+#include <boost/mpl/is_sequence.hpp>
+#include <boost/mpl/front.hpp>
#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/is_same.hpp>
int main()
{
@@ -37,5 +41,8 @@
BOOST_TEST(size(arr) == 3);
BOOST_TEST(distance(begin(arr), end(arr)) == 3);
+ BOOST_MPL_ASSERT((boost::mpl::is_sequence<array_type>));
+ BOOST_MPL_ASSERT((boost::is_same<int, boost::mpl::front<array_type>::type>));
+
return boost::report_errors();
}
Modified: branches/release/libs/fusion/test/sequence/as_set.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/as_set.cpp (original)
+++ branches/release/libs/fusion/test/sequence/as_set.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -33,7 +33,7 @@
std::cout << as_set(make_list(1, 1.23, "harru")) << std::endl;
std::cout << as_set(push_back(empty, 999)) << std::endl;
- BOOST_TEST(as_list(as_set(make_list(1, 1.23, "harru")))
+ BOOST_TEST(as_list(as_set(make_list(1, 1.23, "harru")))
== make_list(1, 1.23, std::string("harru")));
BOOST_TEST(as_list(as_set(push_back(empty, 999)))
== push_back(empty, 999));
Modified: branches/release/libs/fusion/test/sequence/boost_tuple.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/boost_tuple.cpp (original)
+++ branches/release/libs/fusion/test/sequence/boost_tuple.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -23,8 +23,11 @@
#include <boost/fusion/sequence/comparison/less_equal.hpp>
#include <boost/fusion/sequence/comparison/greater.hpp>
#include <boost/fusion/sequence/comparison/greater_equal.hpp>
+#include <boost/fusion/mpl.hpp>
#include <boost/fusion/support/is_view.hpp>
#include <boost/tuple/tuple.hpp>
+#include <boost/mpl/is_sequence.hpp>
+#include <boost/mpl/front.hpp>
#include <boost/mpl/assert.hpp>
#include <iostream>
#include <string>
@@ -96,6 +99,12 @@
BOOST_TEST(2u == fusion::distance(fusion::begin(t), fusion::end(t)));
}
+ {
+ typedef boost::tuple<int, std::string> tuple_type;
+ BOOST_MPL_ASSERT((mpl::is_sequence<tuple_type>));
+ BOOST_MPL_ASSERT((boost::is_same<int, mpl::front<tuple_type>::type>));
+ }
+
return boost::report_errors();
}
Modified: branches/release/libs/fusion/test/sequence/filter_view.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/filter_view.cpp (original)
+++ branches/release/libs/fusion/test/sequence/filter_view.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -13,6 +13,12 @@
#include <boost/fusion/view/filter_view/filter_view.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
+#include <boost/fusion/container/map.hpp>
+#include <boost/fusion/sequence/intrinsic/has_key.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/iterator/key_of.hpp>
+#include <boost/fusion/iterator/value_of_data.hpp>
+#include <boost/fusion/iterator/deref_data.hpp>
#include <boost/type_traits/is_class.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/mpl/arg.hpp>
@@ -62,22 +68,6 @@
std::cout << tuple_close(']');
std::cout << tuple_delimiter(", ");
- { // Testing the static find_if (internal function)
-
- typedef vector<int, char, long, X> vector_type;
-
- vector_type v(1, 'x', 987654, X());
- typedef vector_iterator<vector_type, 0> begin;
- typedef vector_iterator<vector_type, 4> end;
- typedef detail::static_find_if<begin, end, is_same<_, long> > filter;
- typedef filter::type type;
-
- BOOST_TEST(*type(v) == 987654);
- std::cout << *type(v) << std::endl;
- std::cout << *filter::call(begin(v)) << std::endl;
- BOOST_TEST(*type(v) == *filter::call(begin(v)));
- }
-
{
typedef vector<Y, char, long, X, bool, double> vector_type;
@@ -115,6 +105,23 @@
BOOST_MPL_ASSERT((result_of::equal_to<result_of::begin<filter_view_type>::type, result_of::end<filter_view_type>::type>));
}
+ {
+ typedef map<pair<void, int>, pair<double, std::string> > map_type;
+ map_type m(make_pair<void>(0), make_pair<double>("Bond"));
+
+ typedef filter_view<map_type const, is_same<_, pair<double, std::string> > > filter_view_type;
+ filter_view_type f(m);
+
+ BOOST_MPL_ASSERT((result_of::has_key<filter_view_type, double>::type));
+ BOOST_MPL_ASSERT_NOT((result_of::has_key<filter_view_type, void>::type));
+
+ BOOST_MPL_ASSERT((is_same<result_of::key_of<result_of::begin<filter_view_type>::type>::type, double>));
+ BOOST_MPL_ASSERT((is_same<result_of::value_of_data<result_of::begin<filter_view_type>::type>::type, std::string>));
+
+ std::cout << deref_data(begin(f)) << std::endl;
+ BOOST_TEST((deref_data(begin(f)) == "Bond"));
+ }
+
return boost::report_errors();
}
Modified: branches/release/libs/fusion/test/sequence/iterator_range.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/iterator_range.cpp (original)
+++ branches/release/libs/fusion/test/sequence/iterator_range.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -5,15 +5,23 @@
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <boost/detail/lightweight_test.hpp>
+#include <boost/fusion/container/map.hpp>
#include <boost/fusion/container/vector/vector.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
#include <boost/fusion/sequence/comparison/equal_to.hpp>
#include <boost/fusion/sequence/io/out.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/has_key.hpp>
+#include <boost/fusion/iterator/advance.hpp>
+#include <boost/fusion/iterator/key_of.hpp>
+#include <boost/fusion/iterator/value_of_data.hpp>
+#include <boost/fusion/iterator/deref_data.hpp>
#include <boost/mpl/vector_c.hpp>
#include <boost/mpl/begin.hpp>
#include <boost/mpl/next.hpp>
+#include <boost/mpl/assert.hpp>
#include <boost/static_assert.hpp>
int
@@ -76,6 +84,31 @@
BOOST_STATIC_ASSERT(result_of::size<slice_t>::value == 2);
}
+ {
+ typedef map<pair<void,std::string>, pair<double,char>,pair<void*, int> > map_type;
+ map_type m(make_pair<void>("foo"), make_pair<double>('x'), make_pair<void*>(2));
+
+ typedef iterator_range<
+ result_of::begin<map_type>::type
+ , result_of::advance_c<result_of::begin<map_type>::type,2>::type
+ > range_type;
+ range_type r(begin(m), advance_c<2>(begin(m)));
+
+ BOOST_MPL_ASSERT((result_of::has_key<range_type, void>::type));
+ BOOST_MPL_ASSERT((result_of::has_key<range_type, double>::type));
+
+ BOOST_MPL_ASSERT((boost::is_same<result_of::key_of<result_of::begin<range_type>::type>::type, void>));
+ BOOST_MPL_ASSERT((boost::is_same<result_of::key_of<result_of::next<result_of::begin<range_type>::type>::type>::type, double>));
+
+ BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<result_of::begin<range_type>::type>::type, std::string>));
+ BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<range_type>::type>::type>::type, char>));
+
+ std::cout << deref_data(begin(r)) << std::endl;
+ std::cout << deref_data(next(begin(r))) << std::endl;
+ BOOST_TEST((deref_data(begin(r)) == "foo"));
+ BOOST_TEST((deref_data(next(begin(r))) == 'x'));
+ }
+
return boost::report_errors();
}
Modified: branches/release/libs/fusion/test/sequence/joint_view.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/joint_view.cpp (original)
+++ branches/release/libs/fusion/test/sequence/joint_view.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -5,13 +5,22 @@
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#include <boost/detail/lightweight_test.hpp>
+#include <boost/fusion/container/map.hpp>
+#include <boost/fusion/container/set.hpp>
#include <boost/fusion/container/vector/vector.hpp>
#include <boost/fusion/view/joint_view/joint_view.hpp>
#include <boost/fusion/sequence/io/out.hpp>
#include <boost/fusion/sequence/comparison/equal_to.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/mpl/vector_c.hpp>
+#include <boost/fusion/sequence/intrinsic/has_key.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/iterator/next.hpp>
+#include <boost/fusion/iterator/key_of.hpp>
+#include <boost/fusion/iterator/value_of.hpp>
+#include <boost/fusion/iterator/deref_data.hpp>
+#include <boost/mpl/assert.hpp>
+#include <string>
struct X
{
@@ -139,6 +148,40 @@
}
}
+ {
+ typedef map<pair<void,int> > map_type;
+ map_type m(make_pair<void>(0));
+
+ typedef set<std::string, float> set_type;
+ set_type s("foo", 1.3f);
+
+ typedef joint_view<map_type, set_type> joint_view_type;
+ joint_view_type j(m,s);
+
+ BOOST_MPL_ASSERT((result_of::has_key<joint_view_type, void>::type));
+ BOOST_MPL_ASSERT((result_of::has_key<joint_view_type, std::string>::type));
+ BOOST_MPL_ASSERT((result_of::has_key<joint_view_type, float>::type));
+
+ BOOST_MPL_ASSERT((boost::is_same<result_of::key_of<result_of::begin<joint_view_type>::type>::type, void>));
+ BOOST_MPL_ASSERT((boost::is_same<result_of::key_of<result_of::next<result_of::begin<joint_view_type>::type>::type>::type, std::string>));
+ BOOST_MPL_ASSERT((boost::is_same<
+ result_of::key_of<result_of::next<result_of::next<result_of::begin<joint_view_type>::type>::type>::type>::type
+ , float>));
+
+ BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<result_of::begin<joint_view_type>::type>::type, int>));
+ BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<joint_view_type>::type>::type>::type, std::string>));
+ BOOST_MPL_ASSERT((boost::is_same<
+ result_of::value_of_data<result_of::next<result_of::next<result_of::begin<joint_view_type>::type>::type>::type>::type
+ , float>));
+
+ std::cout << deref_data(begin(j)) << std::endl;
+ std::cout << deref_data(boost::fusion::next(begin(j))) << std::endl;
+ std::cout << deref_data(next(boost::fusion::next(begin(j)))) << std::endl;
+ BOOST_TEST((deref_data(begin(j)) == 0));
+ BOOST_TEST((deref_data(boost::fusion::next(begin(j))) == "foo"));
+ BOOST_TEST((deref_data(next(boost::fusion::next(begin(j)))) == 1.3f));
+ }
+
return boost::report_errors();
}
Modified: branches/release/libs/fusion/test/sequence/map.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/map.cpp (original)
+++ branches/release/libs/fusion/test/sequence/map.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -10,7 +10,12 @@
#include <boost/fusion/sequence/intrinsic/at_key.hpp>
#include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
#include <boost/fusion/sequence/intrinsic/has_key.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/io/out.hpp>
+#include <boost/fusion/iterator/key_of.hpp>
+#include <boost/fusion/iterator/deref_data.hpp>
+#include <boost/fusion/iterator/value_of_data.hpp>
+#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/support/pair.hpp>
#include <boost/fusion/support/category_of.hpp>
#include <boost/static_assert.hpp>
@@ -59,6 +64,17 @@
BOOST_STATIC_ASSERT((result_of::has_key<map_type, int>::value));
BOOST_STATIC_ASSERT((result_of::has_key<map_type, double>::value));
BOOST_STATIC_ASSERT((!result_of::has_key<map_type, std::string>::value));
+
+ std::cout << deref_data(begin(m)) << std::endl;
+ std::cout << deref_data(next(begin(m))) << std::endl;
+
+ BOOST_TEST(deref_data(begin(m)) == 'X');
+ BOOST_TEST(deref_data(next(begin(m))) == "Men");
+
+ BOOST_STATIC_ASSERT((is_same<result_of::key_of<result_of::begin<map_type>::type>::type, int>::value));
+ BOOST_STATIC_ASSERT((is_same<result_of::key_of<result_of::next<result_of::begin<map_type>::type>::type>::type, double>::value));
+ BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::begin<map_type>::type>::type, char>::value));
+ BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::next<result_of::begin<map_type>::type>::type>::type, std::string>::value));
}
{
Modified: branches/release/libs/fusion/test/sequence/reverse_view.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/reverse_view.cpp (original)
+++ branches/release/libs/fusion/test/sequence/reverse_view.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -12,12 +12,17 @@
#include <boost/fusion/sequence/comparison/equal_to.hpp>
#include <boost/fusion/view/reverse_view/reverse_view.hpp>
#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/at.hpp>
+#include <boost/fusion/sequence/intrinsic/value_at.hpp>
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/iterator/prior.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/advance.hpp>
#include <boost/fusion/iterator/distance.hpp>
+#include <boost/mpl/assert.hpp>
#include <boost/mpl/range_c.hpp>
+#include <boost/type_traits/is_same.hpp>
+
int
main()
@@ -57,6 +62,24 @@
BOOST_TEST((*prior(second_it) == s));
BOOST_TEST((*advance_c<2>(first_it) == 'x'));
BOOST_TEST((distance(first_it, second_it) == 1));
+
+ BOOST_TEST((at_c<0>(rev)==s));
+ BOOST_TEST((at_c<1>(rev)==123456789));
+ BOOST_TEST((at_c<2>(rev)=='x'));
+ BOOST_TEST((at_c<3>(rev)==123));
+
+ BOOST_MPL_ASSERT((
+ boost::is_same<result_of::value_at_c<view_type,0>::type,char const*>
+ ));
+ BOOST_MPL_ASSERT((
+ boost::is_same<result_of::value_at_c<view_type,1>::type,long>
+ ));
+ BOOST_MPL_ASSERT((
+ boost::is_same<result_of::value_at_c<view_type,2>::type,char>
+ ));
+ BOOST_MPL_ASSERT((
+ boost::is_same<result_of::value_at_c<view_type,3>::type,int>
+ ));
}
return boost::report_errors();
Modified: branches/release/libs/fusion/test/sequence/set.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/set.cpp (original)
+++ branches/release/libs/fusion/test/sequence/set.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -10,7 +10,12 @@
#include <boost/fusion/sequence/intrinsic/at_key.hpp>
#include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
#include <boost/fusion/sequence/intrinsic/has_key.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/io/out.hpp>
+#include <boost/fusion/iterator/key_of.hpp>
+#include <boost/fusion/iterator/deref_data.hpp>
+#include <boost/fusion/iterator/value_of_data.hpp>
+#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/support/pair.hpp>
#include <boost/fusion/support/category_of.hpp>
#include <boost/static_assert.hpp>
@@ -48,12 +53,23 @@
boost::is_same<result_of::value_at_key<set_type, int>::type, int>::value));
BOOST_STATIC_ASSERT((
boost::is_same<result_of::value_at_key<set_type, std::string>::type, std::string>::value));
-
+
std::cout << m << std::endl;
BOOST_STATIC_ASSERT((result_of::has_key<set_type, int>::value));
BOOST_STATIC_ASSERT((result_of::has_key<set_type, std::string>::value));
BOOST_STATIC_ASSERT((!result_of::has_key<set_type, double>::value));
+
+ std::cout << deref_data(begin(m)) << std::endl;
+ std::cout << deref_data(next(begin(m))) << std::endl;
+
+ BOOST_TEST(deref_data(begin(m)) == 123);
+ BOOST_TEST(deref_data(next(begin(m))) == "Hola");
+
+ BOOST_STATIC_ASSERT((is_same<result_of::key_of<result_of::begin<set_type>::type>::type, int>::value));
+ BOOST_STATIC_ASSERT((is_same<result_of::key_of<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
+ BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::begin<set_type>::type>::type, int>::value));
+ BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
}
{
Modified: branches/release/libs/fusion/test/sequence/std_pair.cpp
==============================================================================
--- branches/release/libs/fusion/test/sequence/std_pair.cpp (original)
+++ branches/release/libs/fusion/test/sequence/std_pair.cpp 2010-01-01 17:00:21 EST (Fri, 01 Jan 2010)
@@ -22,7 +22,10 @@
#include <boost/fusion/sequence/comparison/less_equal.hpp>
#include <boost/fusion/sequence/comparison/greater.hpp>
#include <boost/fusion/sequence/comparison/greater_equal.hpp>
+#include <boost/fusion/mpl.hpp>
#include <boost/fusion/support/is_view.hpp>
+#include <boost/mpl/is_sequence.hpp>
+#include <boost/mpl/front.hpp>
#include <boost/mpl/assert.hpp>
#include <iostream>
#include <string>
@@ -86,6 +89,12 @@
l = std::make_pair(123, "Hola!!!");
}
+ {
+ typedef std::pair<int, std::string> pair_type;
+ BOOST_MPL_ASSERT((mpl::is_sequence<pair_type>));
+ BOOST_MPL_ASSERT((boost::is_same<int, mpl::front<pair_type>::type>));
+ }
+
return boost::report_errors();
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk