Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r59021 - in branches/release/libs/fusion/doc/html: . fusion fusion/adapted fusion/algorithm fusion/algorithm/iteration fusion/algorithm/iteration/functions fusion/algorithm/iteration/metafunctions fusion/algorithm/query fusion/algorithm/query/functions fusion/algorithm/query/metafunctions fusion/algorithm/transformation fusion/algorithm/transformation/functions fusion/algorithm/transformation/metafunctions fusion/container fusion/container/conversion fusion/container/conversion/functions fusion/container/conversion/metafunctions fusion/container/generation fusion/container/generation/functions fusion/container/generation/metafunctions fusion/extension fusion/functional fusion/functional/adapters fusion/functional/concepts fusion/functional/generation fusion/functional/generation/functions fusion/functional/generation/metafunctions fusion/functional/invocation fusion/functional/invocation/functions fusion/functional/invocation/metafunctions fusion/iterator fusion/iterator/concepts fusion/iterator/functions fusion/iterator/metafunctions fusion/iterator/operator fusion/sequence fusion/sequence/concepts fusion/sequence/intrinsic fusion/sequence/intrinsic/functions fusion/sequence/intrinsic/metafunctions fusion/sequence/operator fusion/sequence/operator/comparison fusion/sequence/operator/i_o fusion/support fusion/tuple fusion/tuple/class_template_tuple fusion/view
From: daniel_james_at_[hidden]
Date: 2010-01-15 01:35:56

Author: danieljames
Date: 2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
New Revision: 59021
URL: http://svn.boost.org/trac/boost/changeset/59021

Log:
Copy generated fusion documentation from trunk.
Removed:
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_generic.html
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_lvalue_args.html
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_rvalue_args.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_genrc.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_lvargs.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_rvargs.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_genrc.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_lvargs.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_rvargs.html
Text files modified:
   branches/release/libs/fusion/doc/html/fusion/acknowledgements.html | 25
   branches/release/libs/fusion/doc/html/fusion/adapted.html | 42 -
   branches/release/libs/fusion/doc/html/fusion/adapted/adapt_assoc.html | 86 +----
   branches/release/libs/fusion/doc/html/fusion/adapted/adapt_struct.html | 82 +---
   branches/release/libs/fusion/doc/html/fusion/adapted/boost__array.html | 78 +---
   branches/release/libs/fusion/doc/html/fusion/adapted/boost__tuple.html | 67 ---
   branches/release/libs/fusion/doc/html/fusion/adapted/mpl_sequence.html | 81 +---
   branches/release/libs/fusion/doc/html/fusion/adapted/std__pair.html | 78 +---
   branches/release/libs/fusion/doc/html/fusion/algorithm.html | 84 +---
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html | 32 -
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions.html | 23
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/accumulate.html | 287 ++--------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/fold.html | 287 ++--------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/for_each.html | 281 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions.html | 23
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html | 262 +++------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/fold.html | 262 +++------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html | 245 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query.html | 32 -
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions.html | 23
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/all.html | 290 ++++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/any.html | 290 ++++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count.html | 280 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count_if.html | 278 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find.html | 276 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find_if.html | 251 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/none.html | 290 ++++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions.html | 23
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/all.html | 249 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/any.html | 249 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count.html | 239 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count_if.html | 239 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find.html | 246 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find_if.html | 248 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/none.html | 249 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation.html | 36 -
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions.html | 23
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/clear.html | 247 ++------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase.html | 324 +++++--------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase_key.html | 272 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter.html | 276 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter_if.html | 280 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert.html | 297 ++++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert_range.html | 302 ++++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/join.html | 279 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_back.html | 252 ++------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_front.html | 252 ++------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_back.html | 274 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_front.html | 274 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove.html | 276 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove_if.html | 278 +++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace.html | 301 ++++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace_if.html | 301 ++++-------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/reverse.html | 250 ++------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/transform.html | 450 ++++++++-------------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/zip.html | 263 +++------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions.html | 23
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/clear.html | 213 ++----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase.html | 278 ++++------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html | 237 ++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter.html | 247 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html | 245 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert.html | 268 ++++------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html | 271 ++++------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/join.html | 170 ---------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html | 221 ++----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html | 196 ++---------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html | 218 +++---------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html | 218 +++---------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove.html | 247 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html | 247 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace.html | 238 +++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html | 264 ++++-----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html | 221 ++----------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/transform.html | 453 ++++++++-------------------
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/zip.html | 178 +---------
   branches/release/libs/fusion/doc/html/fusion/change_log.html | 57 +-
   branches/release/libs/fusion/doc/html/fusion/container.html | 37 -
   branches/release/libs/fusion/doc/html/fusion/container/cons.html | 347 ++++++++++-----------
   branches/release/libs/fusion/doc/html/fusion/container/conversion.html | 34 -
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions.html | 23
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_list.html | 231 ++-----------
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_map.html | 239 ++-----------
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_set.html | 233 ++-----------
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_vector.html | 231 ++-----------
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions.html | 23
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_list.html | 235 ++-----------
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_map.html | 243 ++------------
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_set.html | 237 ++-----------
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_vector.html | 235 ++-----------
   branches/release/libs/fusion/doc/html/fusion/container/generation.html | 34 -
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions.html | 23
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/list_tie.html | 245 ++------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_cons.html | 290 +++--------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_list.html | 274 +++-------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_map.html | 306 ++++--------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_set.html | 276 +++-------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_vector.html | 274 +++-------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/map_tie.html | 271 +++------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/tiers.html | 100 -----
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/vector_tie.html | 245 ++------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions.html | 23
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/list_tie.html | 241 ++-----------
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_cons.html | 255 +++------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_list.html | 243 ++------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_map.html | 298 +++--------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_set.html | 245 ++------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_vector.html | 243 ++------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/map_tie.html | 267 +++------------
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/vector_tie.html | 241 ++-----------
   branches/release/libs/fusion/doc/html/fusion/container/list.html | 285 +++++++---------
   branches/release/libs/fusion/doc/html/fusion/container/map.html | 268 +++++++---------
   branches/release/libs/fusion/doc/html/fusion/container/set.html | 256 ++++++---------
   branches/release/libs/fusion/doc/html/fusion/container/vector.html | 253 ++++++--------
   branches/release/libs/fusion/doc/html/fusion/extension.html | 27 -
   branches/release/libs/fusion/doc/html/fusion/extension/ext_full.html | 353 +++++++--------------
   branches/release/libs/fusion/doc/html/fusion/extension/iterator_facade.html | 537 ++++++++++++++++----------------
   branches/release/libs/fusion/doc/html/fusion/extension/sequence_facade.html | 347 +++++++++-----------
   branches/release/libs/fusion/doc/html/fusion/functional.html | 85 +---
   branches/release/libs/fusion/doc/html/fusion/functional/adapters.html | 25
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused.html | 253 ++++++---------
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_function_object.html | 266 ++++++---------
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_procedure.html | 269 ++++++---------
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/limits.html | 47 --
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused.html | 270 ++++++---------
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_typed.html | 297 +++++++----------
   branches/release/libs/fusion/doc/html/fusion/functional/concepts.html | 25
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/callable.html | 60 --
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/def_callable.html | 164 +++------
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/poly.html | 168 +++------
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/reg_callable.html | 145 +++-----
   branches/release/libs/fusion/doc/html/fusion/functional/generation.html | 23
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions.html | 26 -
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused.html | 289 +++--------------
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html | 292 +++--------------
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_proc.html | 287 +++--------------
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused.html | 281 +++--------------
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions.html | 27 -
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused.html | 142 -------
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html | 143 -------
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html | 143 -------
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html | 140 -------
   branches/release/libs/fusion/doc/html/fusion/functional/invocation.html | 24
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions.html | 23
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke.html | 319 ++++---------------
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_fobj.html | 315 ++++---------------
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_proc.html | 319 ++++---------------
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/limits.html | 48 --
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions.html | 24
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke.html | 113 ------
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html | 117 ------
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html | 119 ------
   branches/release/libs/fusion/doc/html/fusion/introduction.html | 108 +-----
   branches/release/libs/fusion/doc/html/fusion/iterator.html | 36 -
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts.html | 41 -
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/bidirectional_iterator.html | 322 +++++++++----------
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/forward_iterator.html | 652 ++++++++++++++++++++++-----------------
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/random_access_iterator.html | 297 ++++++++---------
   branches/release/libs/fusion/doc/html/fusion/iterator/functions.html | 26 -
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance.html | 175 +++-------
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance_c.html | 175 +++-------
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref.html | 150 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/distance.html | 146 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/next.html | 150 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/prior.html | 150 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions.html | 24
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance.html | 174 +++-------
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance_c.html | 176 +++-------
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref.html | 154 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/distance.html | 148 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/equal_to.html | 149 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/next.html | 147 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/prior.html | 151 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of.html | 151 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/operator.html | 27 -
   branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_equality.html | 140 ++------
   branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_inequality.html | 137 ++-----
   branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_unary_star.html | 158 ++------
   branches/release/libs/fusion/doc/html/fusion/notes.html | 235 +++----------
   branches/release/libs/fusion/doc/html/fusion/organization.html | 172 +++-------
   branches/release/libs/fusion/doc/html/fusion/preface.html | 190 ++++------
   branches/release/libs/fusion/doc/html/fusion/quick_start.html | 223 +++---------
   branches/release/libs/fusion/doc/html/fusion/references.html | 41 +-
   branches/release/libs/fusion/doc/html/fusion/sequence.html | 42 -
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts.html | 64 +--
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/associative_sequence.html | 351 +++++++++++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/bidirectional_sequence.html | 354 ++++++++++----------
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/forward_sequence.html | 527 +++++++++++++++++---------------
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/random_access_sequence.html | 386 +++++++++++-----------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic.html | 68 ---
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions.html | 23
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at.html | 268 +++------------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_c.html | 268 +++------------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_key.html | 264 +++------------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/back.html | 244 ++------------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/begin.html | 253 ++------------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/empty.html | 240 ++-----------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/end.html | 253 ++------------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/front.html | 244 ++------------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/has_key.html | 260 +++------------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/size.html | 234 ++-----------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/swap.html | 209 ++----------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions.html | 23
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at.html | 249 +++-----------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html | 249 +++-----------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html | 253 +++-----------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/back.html | 194 ++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html | 199 ++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html | 200 ++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/end.html | 199 ++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/front.html | 196 ++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html | 220 +++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/size.html | 194 ++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html | 159 ++-------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html | 214 +++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html | 214 +++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html | 216 +++---------
   branches/release/libs/fusion/doc/html/fusion/sequence/operator.html | 25
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison.html | 40 -
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/equal.html | 256 +++------------
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than.html | 228 +++----------
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html | 225 +++----------
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than.html | 232 +++-----------
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than_equal.html | 228 +++----------
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/not_equal.html | 225 +++----------
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o.html | 86 ++---
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/in.html | 251 +++------------
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/out.html | 251 +++------------
   branches/release/libs/fusion/doc/html/fusion/support.html | 25
   branches/release/libs/fusion/doc/html/fusion/support/category_of.html | 138 +++-----
   branches/release/libs/fusion/doc/html/fusion/support/deduce.html | 73 ---
   branches/release/libs/fusion/doc/html/fusion/support/deduce_sequence.html | 77 ---
   branches/release/libs/fusion/doc/html/fusion/support/is_sequence.html | 134 ++-----
   branches/release/libs/fusion/doc/html/fusion/support/is_view.html | 131 ++-----
   branches/release/libs/fusion/doc/html/fusion/support/pair.html | 387 ++++++++++++-----------
   branches/release/libs/fusion/doc/html/fusion/support/tag_of.html | 125 ++-----
   branches/release/libs/fusion/doc/html/fusion/tuple.html | 29 -
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple.html | 37 -
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/construction.html | 91 +---
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/element_access.html | 82 +---
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/relational_operators.html | 162 +++------
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html | 67 +--
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html | 72 +---
   branches/release/libs/fusion/doc/html/fusion/tuple/pairs.html | 76 +---
   branches/release/libs/fusion/doc/html/fusion/view.html | 34 -
   branches/release/libs/fusion/doc/html/fusion/view/filter_view.html | 249 ++++++--------
   branches/release/libs/fusion/doc/html/fusion/view/iterator_range.html | 268 +++++++---------
   branches/release/libs/fusion/doc/html/fusion/view/joint_view.html | 255 ++++++---------
   branches/release/libs/fusion/doc/html/fusion/view/nview.html | 275 +++++++---------
   branches/release/libs/fusion/doc/html/fusion/view/reverse_view.html | 240 ++++++--------
   branches/release/libs/fusion/doc/html/fusion/view/single_view.html | 209 +++++-------
   branches/release/libs/fusion/doc/html/fusion/view/transform_view.html | 389 +++++++++++------------
   branches/release/libs/fusion/doc/html/fusion/view/zip_view.html | 233 +++++--------
   branches/release/libs/fusion/doc/html/index.html | 53 --
   254 files changed, 13648 insertions(+), 35516 deletions(-)

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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">
+<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="change_log.html" title="Change log">
<link rel="next" href="references.html" title="References">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="change_log.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="references.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.acknowledgements"></a>Acknowledgements
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Acknowledgements">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.acknowledgements"></a><a class="link" href="acknowledgements.html" title="Acknowledgements">Acknowledgements</a>
+</h2></div></div></div>

 Special thanks to David Abrahams, Douglas Gregor, Hartmut Kaiser, Aleksey Gurtovoy,
 Peder Holt, Daniel Wallin, Jaakko Jarvi, Jeremiah Willcock, Dan Marsden, Eric
@@ -50,7 +43,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
 Distributed under the 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/adapted.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted.html 2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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">
+<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="view/nview.html" title="nview">
<link rel="next" href="adapted/std__pair.html" title="std::pair">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="view/nview.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="adapted/std__pair.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.adapted"></a>Adapted
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Adapted">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.adapted"></a><a class="link" href="adapted.html" title="Adapted">Adapted</a>
+</h2></div></div></div>
<div class="toc"><dl>
<dt>std::pair</dt>
<dt>mpl sequence</dt>
@@ -42,10 +35,10 @@
<dt> BOOST_FUSION_ADAPT_ASSOC_STRUCT</dt>
</dl></div>

- Fusion provides a couple of adapters for other sequences such as <tt class="computeroutput">std::pair</tt>,
+ Fusion provides a couple of adapters for other sequences such as <code class="computeroutput">std::pair</code>,
 <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a> sequences,
- and <tt class="computeroutput">boost::array</tt>. These adapters are written using Fusion's
- non-intrusive Extension mechanism.
+ and <code class="computeroutput">boost::array</code>. These adapters are written using Fusion's
+ non-intrusive <a class="link" href="extension.html" title="Extension">Extension</a> mechanism.
 If you wish to use these sequences with fusion, simply include the necessary
 files and they will be regarded as first-class, fully conforming fusion sequences.
 
@@ -53,23 +46,16 @@
 Fusion also provides various schemes to make it easy for the user to adapt
 various data structures, non-intrusively, as full fledged Fusion sequences.
 
-<<<<<<< .working
-<a name="fusion.adapted.header"></a><h3>
-<a name="id530111"></a>
- Header
- </h3>
-=======
<a name="fusion.adapted.header"></a><h4>
-<a name="id737474"></a>
+<a name="id738203"></a>
 <a class="link" href="adapted.html#fusion.adapted.header">Header</a>
 </h4>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/adapted.hpp>
#include <boost/fusion/include/adapted.hpp>
</pre>

 Fusion sequences may also be adapted as fully conforming MPL
- sequences (see Intrinsics).
+ sequences (see <a class="link" href="sequence/intrinsic.html" title="Intrinsic">Intrinsics</a>).
 That way, we can have 2-way adaptation to and from MPL
 and Fusion. To make Fusion sequences fully conforming MPL
 sequences, include:
@@ -88,7 +74,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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> BOOST_FUSION_ADAPT_ASSOC_STRUCT</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<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="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">
+<link rel="prev" href="adapt_struct.html" title="BOOST_FUSION_ADAPT_STRUCT">
<link rel="next" href="../algorithm.html" title="Algorithm">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,47 +22,24 @@
<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">
-<a name="fusion.adapted.adapt_assoc"></a> BOOST_FUSION_ADAPT_ASSOC_STRUCT
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.adapted.adapt_assoc.description"></a><h4>
-<a name="id534295"></a>
- Description
- </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 name="id741666"></a>
 <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.description">Description</a>
 </h5>
->>>>>>> .merge-right.r57125

 BOOST_FUSION_ADAPT_ASSOC_STRUCT is a macro that can be used to generate all
- the necessary boilerplate to make an arbitrary struct into a model of <a href="../sequence/concepts/random_access_sequence.html" title="Random
- Access Sequence">Random Access Sequence</a>
- and <a href="../sequence/concepts/associative_sequence.html" title="Associative
- Sequence">Associative
+ the necessary boilerplate to make an arbitrary struct into a model of <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random Access Sequence</a>
+ and <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
 Sequence</a>.
 
-<<<<<<< .working
-<a name="fusion.adapted.adapt_assoc.synopsis"></a><h4>
-<a name="id534343"></a>
- Synopsis
- </h4>
-=======
<a name="fusion.adapted.adapt_assoc.synopsis"></a><h5>
-<a name="id741490"></a>
+<a name="id742513"></a>
 <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.synopsis">Synopsis</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">BOOST_FUSION_ADAPT_ASSOC_STRUCT(
 struct_name,
 (member_type0, member_name0, key_type0)
@@ -74,58 +47,35 @@
 ...
 )
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_assoc.semantics"></a><h4>
-<a name="id534485"></a>
- Semantics
- </h4>
-=======
<a name="fusion.adapted.adapt_assoc.semantics"></a><h5>
-<a name="id741591"></a>
+<a name="id742613"></a>
 <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.semantics">Semantics</a>
 </h5>
->>>>>>> .merge-right.r57125

- The above macro generates the necessary code to adapt <tt class="computeroutput">struct_name</tt>
- as a model of <a href="../sequence/concepts/random_access_sequence.html" title="Random
- Access Sequence">Random
- Access Sequence</a> and <a href="../sequence/concepts/associative_sequence.html" title="Associative
- Sequence">Associative
- Sequence</a>. The sequence of <tt class="computeroutput">(member_typeN,
+ The above macro generates the necessary code to adapt <code class="computeroutput">struct_name</code>
+ as a model of <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+ Access Sequence</a> and <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+ Sequence</a>. The sequence of <code class="computeroutput">(member_typeN,
 member_nameN,
- key_typeN)</tt>
+ key_typeN)</code>
 triples declare the type, name and key type of each of the struct members
 that will be part of the sequence.
 

- The macro should be used at global scope, and <tt class="computeroutput">struct_name</tt>
+ The macro should be used at global scope, and <code class="computeroutput">struct_name</code>
 should be the fully namespace qualified name of the struct to be converted.
 
-<<<<<<< .working
-<a name="fusion.adapted.adapt_assoc.header"></a><h4>
-<a name="id534609"></a>
- Header
- </h4>
-=======
<a name="fusion.adapted.adapt_assoc.header"></a><h5>
-<a name="id742214"></a>
+<a name="id742690"></a>
 <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.header">Header</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
#include <boost/fusion/include/adapt_assoc_struct.hpp>
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_assoc.example"></a><h4>
-<a name="id534774"></a>
- Example
- </h4>
-=======
<a name="fusion.adapted.adapt_assoc.example"></a><h5>
-<a name="id742330"></a>
+<a name="id742805"></a>
 <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.example">Example</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">namespace demo
{
 struct employee
@@ -152,7 +102,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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,13 @@
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> BOOST_FUSION_ADAPT_STRUCT</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<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="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">
-<link rel="next" href="adapt_assoc.html" title=" BOOST_FUSION_ADAPT_ASSOC_STRUCT">
+<link rel="prev" href="boost__tuple.html" title="boost::tuple">
+<link rel="next" href="adapt_assoc.html" title="BOOST_FUSION_ADAPT_ASSOC_STRUCT">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -26,45 +22,23 @@
<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">
-<a name="fusion.adapted.adapt_struct"></a> BOOST_FUSION_ADAPT_STRUCT
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.adapted.adapt_struct.description"></a><h4>
-<a name="id533623"></a>
- Description
- </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 name="id741207"></a>
 <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.description">Description</a>
 </h5>
->>>>>>> .merge-right.r57125

 BOOST_FUSION_ADAPT_STRUCT is a macro that can be used to generate all the
- necessary boilerplate to make an arbitrary struct into a <a href="../sequence/concepts/random_access_sequence.html" title="Random
- Access Sequence">Random
+ necessary boilerplate to make an arbitrary struct into a <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
 Access Sequence</a>.
 
-<<<<<<< .working
-<a name="fusion.adapted.adapt_struct.synopsis"></a><h4>
-<a name="id533662"></a>
- Synopsis
- </h4>
-=======
<a name="fusion.adapted.adapt_struct.synopsis"></a><h5>
-<a name="id741026"></a>
+<a name="id741228"></a>
 <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.synopsis">Synopsis</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">BOOST_FUSION_ADAPT_STRUCT(
 struct_name,
 (member_type0, member_name0)
@@ -72,55 +46,33 @@
 ...
 )
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_struct.semantics"></a><h4>
-<a name="id533781"></a>
- Semantics
- </h4>
-=======
<a name="fusion.adapted.adapt_struct.semantics"></a><h5>
-<a name="id741110"></a>
+<a name="id741312"></a>
 <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.semantics">Semantics</a>
 </h5>
->>>>>>> .merge-right.r57125

- The above macro generates the necessary code to adapt <tt class="computeroutput">struct_name</tt>
- as a model of <a href="../sequence/concepts/random_access_sequence.html" title="Random
- Access Sequence">Random
- Access Sequence</a>. The sequence of <tt class="computeroutput">(member_typeN,
- member_nameN)</tt>
+ The above macro generates the necessary code to adapt <code class="computeroutput">struct_name</code>
+ as a model of <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+ Access Sequence</a>. The sequence of <code class="computeroutput">(member_typeN,
+ member_nameN)</code>
 pairs declare the type and names of each of the struct members that will
 be part of the sequence.
 

- The macro should be used at global scope, and <tt class="computeroutput">struct_name</tt>
+ The macro should be used at global scope, and <code class="computeroutput">struct_name</code>
 should be the fully namespace qualified name of the struct to be converted.
 
-<<<<<<< .working
-<a name="fusion.adapted.adapt_struct.header"></a><h4>
-<a name="id533884"></a>
- Header
- </h4>
-=======
<a name="fusion.adapted.adapt_struct.header"></a><h5>
-<a name="id741173"></a>
+<a name="id741376"></a>
 <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.header">Header</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/adapted/struct/adapt_struct.hpp>
#include <boost/fusion/include/adapt_struct.hpp>
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_struct.example"></a><h4>
-<a name="id534049"></a>
- Example
- </h4>
-=======
<a name="fusion.adapted.adapt_struct.example"></a><h5>
-<a name="id741288"></a>
+<a name="id741491"></a>
 <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.example">Example</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">namespace demo
{
 struct employee
@@ -139,7 +91,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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="mpl_sequence.html" title="mpl sequence">
<link rel="next" href="boost__tuple.html" title="boost::tuple">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,86 +22,52 @@
<div class="spirit-nav">
<a accesskey="p" href="mpl_sequence.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="boost__tuple.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.adapted.boost__array"></a>boost::array
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="boost::array">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.adapted.boost__array"></a><a class="link" href="boost__array.html" title="boost::array">boost::array</a>
+</h3></div></div></div>

- This module provides adapters for <tt class="computeroutput">boost::array</tt>.
- Including the module header makes <tt class="computeroutput">boost::array</tt>
- a fully conforming <a href="../sequence/concepts/random_access_sequence.html" title="Random
- Access Sequence">Random
+ This module provides adapters for <code class="computeroutput">boost::array</code>.
+ Including the module header makes <code class="computeroutput">boost::array</code>
+ a fully conforming <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
 Access Sequence</a>.
 
-<<<<<<< .working
-<a name="fusion.adapted.boost__array.header"></a><h4>
-<a name="id532132"></a>
- Header
- </h4>
-=======
<a name="fusion.adapted.boost__array.header"></a><h5>
-<a name="id739972"></a>
+<a name="id740175"></a>
 <a class="link" href="boost__array.html#fusion.adapted.boost__array.header">Header</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/adapted/array.hpp>
#include <boost/fusion/include/array.hpp>
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.boost__array.model_of"></a><h4>
-<a name="id532287"></a>
- Model of
- </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 name="id740283"></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>
- Example
- </h4>
-=======
<a name="fusion.adapted.boost__array.example"></a><h5>
-<a name="id740105"></a>
+<a name="id740308"></a>
 <a class="link" href="boost__array.html#fusion.adapted.boost__array.example">Example</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">boost::array<int,3> arr = {{1,2,3}};

-std::cout << *begin(arr) << std::endl;
-std::cout << *next(begin(arr)) << std::endl;
-std::cout << *advance_c<2>(begin(arr)) << std::endl;
-std::cout << *prior(end(arr)) << std::endl;
-std::cout << at_c<2>(arr) << std::endl;
+std::cout << *<a class="link" href="../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput">begin</code></a>(arr) << std::endl;
+std::cout << *<a class="link" href="../iterator/functions/next.html" title="next"><code class="computeroutput">next</code></a>(<a class="link" href="../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput">begin</code></a>(arr)) << std::endl;
+std::cout << *<a class="link" href="../iterator/functions/advance_c.html" title="advance_c"><code class="computeroutput">advance_c</code></a><2>(<a class="link" href="../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput">begin</code></a>(arr)) << std::endl;
+std::cout << *<a class="link" href="../iterator/functions/prior.html" title="prior"><code class="computeroutput">prior</code></a>(<a class="link" href="../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput">end</code></a>(arr)) << std::endl;
+std::cout << <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput">at_c</code></a><2>(arr) << std::endl;
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.boost__array.see_also"></a><h4>
-<a name="id532945"></a>
- See also
- </h4>
-=======
<a name="fusion.adapted.boost__array.see_also"></a><h5>
-<a name="id740541"></a>
+<a name="id740744"></a>
 <a class="link" href="boost__array.html#fusion.adapted.boost__array.see_also">See also</a>
 </h5>
->>>>>>> .merge-right.r57125

 <a href="http://www.boost.org/doc/html/array.html" target="_top">Boost.Array Library</a>
 
</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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,13 @@
<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>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="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">
-<link rel="next" href="adapt_struct.html" title=" BOOST_FUSION_ADAPT_STRUCT">
+<link rel="prev" href="boost__array.html" title="boost::array">
+<link rel="next" href="adapt_struct.html" title="BOOST_FUSION_ADAPT_STRUCT">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -26,71 +22,40 @@
<div class="spirit-nav">
<a accesskey="p" href="boost__array.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_struct.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.adapted.boost__tuple"></a>boost::tuple
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="boost::tuple">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.adapted.boost__tuple"></a><a class="link" href="boost__tuple.html" title="boost::tuple">boost::tuple</a>
+</h3></div></div></div>

- This module provides adapters for <tt class="computeroutput">boost::tuple</tt>.
- Including the module header makes <tt class="computeroutput">boost::tuple</tt>
- a fully conforming <a href="../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+ This module provides adapters for <code class="computeroutput">boost::tuple</code>.
+ Including the module header makes <code class="computeroutput">boost::tuple</code>
+ a fully conforming <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>.
 
-<<<<<<< .working
-<a name="fusion.adapted.boost__tuple.header"></a><h4>
-<a name="id533058"></a>
- Header
- </h4>
-=======
<a name="fusion.adapted.boost__tuple.header"></a><h5>
-<a name="id740610"></a>
+<a name="id740813"></a>
 <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.header">Header</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/adapted/boost_tuple.hpp>
#include <boost/fusion/include/boost_tuple.hpp>
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.boost__tuple.model_of"></a><h4>
-<a name="id533213"></a>
- Model of
- </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward Sequence</a></li></ul></div>
-<a name="fusion.adapted.boost__tuple.example"></a><h4>
-<a name="id533252"></a>
- Example
- </h4>
-=======
<a name="fusion.adapted.boost__tuple.model_of"></a><h5>
-<a name="id740718"></a>
+<a name="id740921"></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 name="id740946"></a>
 <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.example">Example</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">boost::tuple<int,std::string> example_tuple(101, "hello");
std::cout << *boost::fusion::begin(example_tuple) << '\n';
std::cout << *boost::fusion::next(boost::fusion::begin(example_tuple)) << '\n';
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.boost__tuple.see_also"></a><h4>
-<a name="id533568"></a>
- See also
- </h4>
-=======
<a name="fusion.adapted.boost__tuple.see_also"></a><h5>
-<a name="id740970"></a>
+<a name="id741173"></a>
 <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.see_also">See also</a>
 </h5>
->>>>>>> .merge-right.r57125

 <a href="http://www.boost.org/libs/tuple/doc/tuple_users_guide.html" target="_top">Boost.Tuple
 Library</a>
@@ -98,7 +63,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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="std__pair.html" title="std::pair">
<link rel="next" href="boost__array.html" title="boost::array">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,104 +22,67 @@
<div class="spirit-nav">
<a accesskey="p" href="std__pair.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="boost__array.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.adapted.mpl_sequence"></a>mpl sequence
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="mpl sequence">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.adapted.mpl_sequence"></a><a class="link" href="mpl_sequence.html" title="mpl sequence">mpl sequence</a>
+</h3></div></div></div>

 This module provides adapters for MPL
 sequences. Including the module header makes all MPL
 sequences fully conforming fusion sequences.
 
-<<<<<<< .working
-<a name="fusion.adapted.mpl_sequence.header"></a><h4>
-<a name="id531191"></a>
- Header
- </h4>
-=======
<a name="fusion.adapted.mpl_sequence.header"></a><h5>
-<a name="id738223"></a>
+<a name="id739518"></a>
 <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.header">Header</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/adapted/mpl.hpp>
#include <boost/fusion/include/mpl.hpp>
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.mpl_sequence.model_of"></a><h4>
-<a name="id531346"></a>
- Model of
- </h4>
-<div class="itemizedlist"><ul type="disc">
-<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 name="id739626"></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>
-<li>
-<a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
- Sequence">Bidirectional
+<li class="listitem">
+<a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
 Sequence</a> (If the MPL
 sequence is a bidirectional sequence.)
 </li>
-<li>
-<a href="../sequence/concepts/random_access_sequence.html" title="Random
- Access Sequence">Random
+<li class="listitem">
+<a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
 Access Sequence</a> (If the MPL
 sequence is a random access sequence.)
 </li>
</ul></div>
-<<<<<<< .working
-<a name="fusion.adapted.mpl_sequence.example"></a><h4>
-<a name="id531436"></a>
- Example
- </h4>
-=======
<a name="fusion.adapted.mpl_sequence.example"></a><h5>
-<a name="id739482"></a>
+<a name="id739685"></a>
 <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.example">Example</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">mpl::vector_c<int, 123, 456> vec_c;
fusion::vector2<int, long> v(vec_c);
-std::cout << at_c<0>(v) << std::endl;
-std::cout << at_c<1>(v) << std::endl;
+std::cout << <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput">at_c</code></a><0>(v) << std::endl;
+std::cout << <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput">at_c</code></a><1>(v) << std::endl;

v = mpl::vector_c<int, 456, 789>();
-std::cout << at_c<0>(v) << std::endl;
-std::cout << at_c<1>(v) << std::endl;
+std::cout << <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput">at_c</code></a><0>(v) << std::endl;
+std::cout << <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput">at_c</code></a><1>(v) << std::endl;
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.mpl_sequence.see_also"></a><h4>
-<a name="id532022"></a>
- See also
- </h4>
-=======
<a name="fusion.adapted.mpl_sequence.see_also"></a><h5>
-<a name="id739902"></a>
+<a name="id740105"></a>
 <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.see_also">See also</a>
 </h5>
->>>>>>> .merge-right.r57125

 <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a>
 
</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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="../adapted.html" title="Adapted">
<link rel="next" href="mpl_sequence.html" title="mpl sequence">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,85 +22,51 @@
<div class="spirit-nav">
<a accesskey="p" href="../adapted.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="mpl_sequence.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.adapted.std__pair"></a>std::pair
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="std::pair">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.adapted.std__pair"></a><a class="link" href="std__pair.html" title="std::pair">std::pair</a>
+</h3></div></div></div>

- This module provides adapters for <tt class="computeroutput">std::pair</tt>.
- Including the module header makes <tt class="computeroutput">std::pair</tt>
- a fully conforming <a href="../sequence/concepts/random_access_sequence.html" title="Random
- Access Sequence">Random
+ This module provides adapters for <code class="computeroutput">std::pair</code>.
+ Including the module header makes <code class="computeroutput">std::pair</code>
+ a fully conforming <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
 Access Sequence</a>.
 
-<<<<<<< .working
-<a name="fusion.adapted.std__pair.header"></a><h4>
-<a name="id530512"></a>
- Header
- </h4>
-=======
<a name="fusion.adapted.std__pair.header"></a><h5>
-<a name="id737752"></a>
+<a name="id738481"></a>
 <a class="link" href="std__pair.html#fusion.adapted.std__pair.header">Header</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/adapted/std_pair.hpp>
#include <boost/fusion/include/std_pair.hpp>
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.std__pair.model_of"></a><h4>
-<a name="id530668"></a>
- Model of
- </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 name="id738589"></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>
- Example
- </h4>
-=======
<a name="fusion.adapted.std__pair.example"></a><h5>
-<a name="id737886"></a>
+<a name="id738614"></a>
 <a class="link" href="std__pair.html#fusion.adapted.std__pair.example">Example</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">std::pair<int, std::string> p(123, "Hola!!!");
-std::cout << at_c<0>(p) << std::endl;
-std::cout << at_c<1>(p) << std::endl;
+std::cout << <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput">at_c</code></a><0>(p) << std::endl;
+std::cout << <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput">at_c</code></a><1>(p) << std::endl;
std::cout << p << std::endl;
</pre>
-<<<<<<< .working
-<a name="fusion.adapted.std__pair.see_also"></a><h4>
-<a name="id531057"></a>
- See also
- </h4>
-=======
<a name="fusion.adapted.std__pair.see_also"></a><h5>
-<a name="id738136"></a>
+<a name="id738865"></a>
 <a class="link" href="std__pair.html#fusion.adapted.std__pair.see_also">See also</a>
 </h5>
->>>>>>> .merge-right.r57125

- std::pair,
- <a href="../tuple/pairs.html" title="Pairs"><tt class="computeroutput">TR1
- and std::pair</tt></a>
+ std::pair,
+ <a class="link" href="../tuple/pairs.html" title="Pairs"><code class="computeroutput">TR1
+ and std::pair</code></a>
 
</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
 Distributed under the 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.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm.html 2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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">
+<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="adapted/adapt_assoc.html" title="BOOST_FUSION_ADAPT_ASSOC_STRUCT">
<link rel="next" href="algorithm/iteration.html" title="Iteration">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="adapted/adapt_assoc.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="algorithm/iteration.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.algorithm"></a>Algorithm
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Algorithm">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.algorithm"></a><a class="link" href="algorithm.html" title="Algorithm">Algorithm</a>
+</h2></div></div></div>
<div class="toc"><dl>
<dt>Iteration</dt>
<dd><dl>
@@ -50,17 +43,10 @@
<dt>Metafunctions</dt>
</dl></dd>
</dl></div>
-<<<<<<< .working
-<a name="fusion.algorithm.lazy_evaluation"></a><h3>
-<a name="id535132"></a>
- Lazy Evaluation
- </h3>
-=======
<a name="fusion.algorithm.lazy_evaluation"></a><h4>
-<a name="id742590"></a>
+<a name="id743066"></a>
 <a class="link" href="algorithm.html#fusion.algorithm.lazy_evaluation">Lazy Evaluation</a>
 </h4>
->>>>>>> .merge-right.r57125

 Unlike MPL, Fusion
 algorithms are lazy and non sequence-type preserving. What does that mean?
@@ -72,62 +58,48 @@
 fusion algorithms are functional in nature such that algorithms are non mutating
 (no side effects). However, due to the high cost of returning full sequences
 such as vectors and lists, Views are returned from Fusion
- algorithms instead. For example, the transform algorithm does not actually
- return a transformed version of the original sequence. transform returns a transform_view. This view holds a
+ algorithms instead. For example, the <a class="link" href="algorithm/transformation/functions/transform.html" title="transform"><code class="computeroutput">transform</code></a> algorithm does not actually
+ return a transformed version of the original sequence. <a class="link" href="algorithm/transformation/functions/transform.html" title="transform"><code class="computeroutput">transform</code></a> returns a <a class="link" href="view/transform_view.html" title="transform_view"><code class="computeroutput">transform_view</code></a>. This view holds a
 reference to the original sequence plus the transform function. Iteration over
- the transform_view
+ the <a class="link" href="view/transform_view.html" title="transform_view"><code class="computeroutput">transform_view</code></a>
 will apply the transform function over the sequence elements on demand. This
 lazy evaluation scheme allows us to chain as many algorithms
 as we want without incurring a high runtime penalty.
 
-<<<<<<< .working
-<a name="fusion.algorithm.sequence_extension"></a><h3>
-<a name="id535279"></a>
- Sequence Extension
- </h3>
-=======
<a name="fusion.algorithm.sequence_extension"></a><h4>
-<a name="id742667"></a>
+<a name="id743143"></a>
 <a class="link" href="algorithm.html#fusion.algorithm.sequence_extension">Sequence Extension</a>
 </h4>
->>>>>>> .merge-right.r57125

- The lazy evaluation scheme where Algorithms
- return Views also allows operations such
- as push_back to be totally generic. In
- Fusion, push_back is actually a generic algorithm
- that works on all sequences. Given an input sequence <tt class="computeroutput">s</tt>
- and a value <tt class="computeroutput">x</tt>, Fusion's push_back algorithm simply returns
- a joint_view:
- a view that holds a reference to the original sequence <tt class="computeroutput">s</tt>
- and the value <tt class="computeroutput">x</tt>. Functions
+ The lazy evaluation scheme where <a class="link" href="algorithm.html" title="Algorithm">Algorithms</a>
+ return <a class="link" href="view.html" title="View">Views</a> also allows operations such
+ as <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput">push_back</code></a> to be totally generic. In
+ Fusion, <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput">push_back</code></a> is actually a generic algorithm
+ that works on all sequences. Given an input sequence <code class="computeroutput">s</code>
+ and a value <code class="computeroutput">x</code>, Fusion's <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput">push_back</code></a> algorithm simply returns
+ a <a class="link" href="view/joint_view.html" title="joint_view"><code class="computeroutput">joint_view</code></a>:
+ a view that holds a reference to the original sequence <code class="computeroutput">s</code>
+ and the value <code class="computeroutput">x</code>. Functions
 that were once sequence specific and need to be implemented N times over N
 different sequences are now implemented only once. That is to say that Fusion
 sequences are cheaply extensible. However, an important caveat is that the
- result of a sequence extending operation like push_back does not retain the properties
- of the original sequence such as associativity of set(s). To regain the original sequence,
- Conversion functions
- are provided. You may use one of the Conversion
+ result of a sequence extending operation like <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput">push_back</code></a> does not retain the properties
+ of the original sequence such as associativity of <a class="link" href="container/set.html" title="set"><code class="computeroutput">set</code></a>(s). To regain the original sequence,
+ <a class="link" href="container/conversion/functions.html" title="Functions">Conversion</a> functions
+ are provided. You may use one of the <a class="link" href="container/conversion/functions.html" title="Functions">Conversion</a>
 functions to convert back to the original sequence type.
 
-<<<<<<< .working
-<a name="fusion.algorithm.header"></a><h3>
-<a name="id535506"></a>
- Header
- </h3>
-=======
<a name="fusion.algorithm.header"></a><h4>
-<a name="id742794"></a>
+<a name="id743270"></a>
 <a class="link" href="algorithm.html#fusion.algorithm.header">Header</a>
 </h4>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/algorithm.hpp>
#include <boost/fusion/include/algorithm.hpp>
</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
 Distributed under the 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.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html (original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html 2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="../algorithm.html" title="Algorithm">
<link rel="next" href="iteration/functions.html" title="Functions">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="../algorithm.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../algorithm.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="iteration/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.algorithm.iteration"></a>Iteration
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Iteration">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.algorithm.iteration"></a><a class="link" href="iteration.html" title="Iteration">Iteration</a>
+</h3></div></div></div>
<div class="toc"><dl>
<dt>Functions</dt>
<dt>Metafunctions</dt>
@@ -41,24 +34,17 @@
 The iteration algorithms provide the fundamental algorithms for traversing
 a sequence repeatedly applying an operation to its elements.
 
-<<<<<<< .working
-<a name="fusion.algorithm.iteration.header"></a><h4>
-<a name="id535675"></a>
- Header
- </h4>
-=======
<a name="fusion.algorithm.iteration.header"></a><h5>
-<a name="id742908"></a>
+<a name="id743384"></a>
 <a class="link" href="iteration.html#fusion.algorithm.iteration.header">Header</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/algorithm/iteration.hpp>
#include <boost/fusion/include/iteration.hpp>
</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
 Distributed under the 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.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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="../iteration.html" title="Iteration">
<link rel="next" href="functions/fold.html" title="fold">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="../iteration.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iteration.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/fold.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.iteration.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.iteration.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
<div class="toc"><dl>
<dt>fold</dt>
<dt>accumulate</dt>
@@ -41,7 +34,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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="fold.html" title="fold">
<link rel="next" href="for_each.html" title="for_each">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,50 +22,15 @@
<div class="spirit-nav">
<a accesskey="p" href="fold.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="for_each.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.functions.accumulate"></a>accumulate
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="accumulate">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.functions.accumulate"></a><a class="link" href="accumulate.html" title="accumulate">accumulate</a>
+</h5></div></div></div>
<a name="fusion.algorithm.iteration.functions.accumulate.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id537581"></a>
- Description
-=======
-<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 name="id745856"></a>
 <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

-<<<<<<< .working
- For a sequence <tt class="computeroutput">Seq</tt>, initial
- state, and binary function object or function pointer <tt class="computeroutput">f</tt>,
- accumulate repeatedly applies binary <tt class="computeroutput">f</tt>
- to each element of <tt class="computeroutput">Seq</tt>
- and the previous state.
-=======
 For a sequence <code class="computeroutput">seq</code>, initial
 state <code class="computeroutput">initial_state</code>,
 and binary function object or function pointer <code class="computeroutput">f</code>,
@@ -82,105 +39,46 @@
 previous <code class="computeroutput">f</code> invocation
 (<code class="computeroutput">inital_state</code> if it is
 the first call) and each element of <code class="computeroutput">seq</code>.
->>>>>>> .merge-right.r57125
 
<a name="fusion.algorithm.iteration.functions.accumulate.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id537658"></a>
- Synopsis
-=======
-<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 name="id745930"></a>
 <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
 typename State,
 typename F
 >
-typename result_of::accumulate<Sequence, State, F>::type accumulate(
+typename <a class="link" href="../metafunctions/accumulate.html" title="accumulate"><code class="computeroutput">result_of::accumulate</code></a><Sequence, State, F>::type accumulate(
 Sequence& seq, State const& initial_state, F const& f);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id537917"></a>Table 1.34. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id789627"></a>Table 1.34. Parameters
-=======
-<a name="id752184"></a>Table 1.38. Parameters
-=======
-<a name="id744560"></a>Table 1.38. Parameters
-=======
-<a name="id767352"></a>Table 1.38. Parameters
-=======
-<a name="id755947"></a>Table 1.38. Parameters
-=======
-<a name="id752670"></a>Table 1.38. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id746116"></a>Table 1.38. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<<<<<<< .working
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>, <tt class="computeroutput">f(eN
- ....f(e2,f(e1,initial_state)))</tt> must be a valid expression for
- each element <tt class="computeroutput">e1</tt>
- to <tt class="computeroutput">eN</tt> in <tt class="computeroutput">seq</tt>
- </td>
-<td>
-=======
<td>
 
 <code class="computeroutput">seq</code>
@@ -197,33 +95,28 @@
 </td>
<td>
 
->>>>>>> .merge-right.r57125
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">initial_state</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">initial_state</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Initial state
- </td>
+ 
+ </td>
</tr>
<tr>
-<<<<<<< .working
-<td>
- <tt class="computeroutput">f</tt>
- </td>
-<td>
- <tt class="computeroutput">boost::result_of<F(E,S)>::type</tt> is the return type of <tt class="computeroutput">f(e,s)</tt>
- for each element <tt class="computeroutput">e</tt>
- of type <tt class="computeroutput">E</tt> in <tt class="computeroutput">seq</tt>, and current state <tt class="computeroutput">s</tt> of type <tt class="computeroutput">S</tt>
- </td>
-<td>
-=======
<td>
 
 <code class="computeroutput">f</code>
@@ -240,131 +133,45 @@
 </td>
<td>
 
->>>>>>> .merge-right.r57125
 Operation's argument
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.iteration.functions.accumulate.expression_semantics"></a><h6>
-<a name="id752970"></a>
+<a name="id746416"></a>
 <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.expression_semantics">Expression
->>>>>>> .merge-right.r57125
 Semantics</a>
 </h6>
<pre class="programlisting">accumulate(seq, initial_state, f);
</pre>

- Return type: Any type
+ Return type: Any type
 

-<<<<<<< .working
- Semantics: Equivalent to <tt class="computeroutput">f(eN ....f(e2,f(e1,initial_state)))</tt>
- where <tt class="computeroutput">e1 ...eN</tt> are the elements of <tt class="computeroutput">seq</tt>.
-=======
 Semantics: Equivalent to <code class="computeroutput">f(... f(f(initial_state,e1),e2) ...eN)</code> where <code class="computeroutput">e1
 ...eN</code>
 are the elements of <code class="computeroutput">seq</code>.
->>>>>>> .merge-right.r57125
 
<a name="fusion.algorithm.iteration.functions.accumulate.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id538575"></a>
- Complexity
-=======
-<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 name="id746568"></a>
 <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear, exactly <tt class="computeroutput">result_of::size<Sequence>::value</tt> applications of <tt class="computeroutput">f</tt>.
+ Linear, exactly <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> applications of <code class="computeroutput">f</code>.
 
<a name="fusion.algorithm.iteration.functions.accumulate.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id538669"></a>
- Header
-=======
-<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 name="id746628"></a>
 <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/iteration/accumulate.hpp>
#include <boost/fusion/include/accumulate.hpp>
</pre>
<a name="fusion.algorithm.iteration.functions.accumulate.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id538836"></a>
- Example
-=======
-<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 name="id746743"></a>
 <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">struct make_string
{
@@ -377,8 +184,8 @@
 }
};
...
-const vector<int,int> vec(1,2);
-assert(accumulate(vec,std::string(""), make_string()) == "12");
+const <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput">vector</code></a><int,int> vec(1,2);
+assert(<a class="link" href="accumulate.html" title="accumulate"><code class="computeroutput">accumulate</code></a>(vec,std::string(""), make_string()) == "12");
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="../functions.html" title="Functions">
<link rel="next" href="accumulate.html" title="accumulate">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,154 +22,60 @@
<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="accumulate.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.functions.fold"></a>fold
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="fold">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.functions.fold"></a><a class="link" href="fold.html" title="fold">fold</a>
+</h5></div></div></div>
<a name="fusion.algorithm.iteration.functions.fold.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id535870"></a>
- Description
-=======
-<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 name="id743511"></a>
 <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

-<<<<<<< .working
- For a sequence <tt class="computeroutput">Seq</tt>, initial
- state, and binary function object or function pointer <tt class="computeroutput">f</tt>,
- fold repeatedly applies binary <tt class="computeroutput">f</tt>
- to each element of <tt class="computeroutput">Seq</tt>
- and the previous state.
-=======
 For a sequence <code class="computeroutput">seq</code>, initial
 state <code class="computeroutput">initial_state</code>,
 and binary function object or function pointer <code class="computeroutput">f</code>,
 fold returns the result of the repeated application of binary <code class="computeroutput">f</code> to the result of the previous <code class="computeroutput">f</code> invocation (<code class="computeroutput">inital_state</code>
 if it is the first call) and each element of <code class="computeroutput">seq</code>.
->>>>>>> .merge-right.r57125
 
<a name="fusion.algorithm.iteration.functions.fold.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id535948"></a>
- Synopsis
-=======
-<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 name="id743581"></a>
 <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
 typename State,
 typename F
 >
-typename result_of::fold<Sequence, State, F>::type fold(
+typename <a class="link" href="../metafunctions/fold.html" title="fold"><code class="computeroutput">result_of::fold</code></a><Sequence, State, F>::type fold(
 Sequence& seq, State const& initial_state, F const& f);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id536204"></a>Table 1.33. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id788379"></a>Table 1.33. Parameters
-=======
-<a name="id750913"></a>Table 1.37. Parameters
-=======
-<a name="id743288"></a>Table 1.37. Parameters
-=======
-<a name="id766092"></a>Table 1.37. Parameters
-=======
-<a name="id753595"></a>Table 1.37. Parameters
-=======
-<a name="id750318"></a>Table 1.37. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id743764"></a>Table 1.37. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<<<<<<< .working
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>,<tt class="computeroutput">f(e,s)</tt> must be a valid expression for
- each element <tt class="computeroutput">e</tt>
- in <tt class="computeroutput">seq</tt>, and current
- state <tt class="computeroutput">s</tt>
- </td>
-<td>
-=======
<td>
 
 <code class="computeroutput">seq</code>
@@ -194,33 +92,28 @@
 </td>
<td>
 
->>>>>>> .merge-right.r57125
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">initial_state</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">initial_state</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Initial state
- </td>
+ 
+ </td>
</tr>
<tr>
-<<<<<<< .working
-<td>
- <tt class="computeroutput">f</tt>
- </td>
-<td>
- <tt class="computeroutput">boost::result_of<F(E,S)>::type</tt> is the return type of <tt class="computeroutput">f(e,s)</tt>
- for each element <tt class="computeroutput">e</tt>
- of type <tt class="computeroutput">E</tt> in <tt class="computeroutput">seq</tt>, and current state <tt class="computeroutput">s</tt> of type <tt class="computeroutput">S</tt>
- </td>
-<td>
-=======
<td>
 
 <code class="computeroutput">f</code>
@@ -237,131 +130,45 @@
 </td>
<td>
 
->>>>>>> .merge-right.r57125
 Operation's argument
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.iteration.functions.fold.expression_semantics"></a><h6>
-<a name="id750620"></a>
+<a name="id744067"></a>
 <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.expression_semantics">Expression
->>>>>>> .merge-right.r57125
 Semantics</a>
 </h6>
<pre class="programlisting">fold(seq, initial_state, f);
</pre>

- Return type: Any type
+ Return type: Any type
 

-<<<<<<< .working
- Semantics: Equivalent to <tt class="computeroutput">f(eN ....f(e2,f(e1,initial_state)))</tt>
- where <tt class="computeroutput">e1 ...eN</tt> are the elements of <tt class="computeroutput">seq</tt>.
-=======
 Semantics: Equivalent to <code class="computeroutput">f(... f(f(initial_state,e1),e2) ...eN)</code> where <code class="computeroutput">e1
 ...eN</code>
 are the elements of <code class="computeroutput">seq</code>.
->>>>>>> .merge-right.r57125
 
<a name="fusion.algorithm.iteration.functions.fold.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id536820"></a>
- Complexity
-=======
-<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 name="id744218"></a>
 <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear, exactly <tt class="computeroutput">result_of::size<Sequence>::value</tt> applications of <tt class="computeroutput">f</tt>.
+ Linear, exactly <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> applications of <code class="computeroutput">f</code>.
 
<a name="fusion.algorithm.iteration.functions.fold.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id536913"></a>
- Header
-=======
-<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 name="id744275"></a>
 <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/iteration/fold.hpp>
#include <boost/fusion/include/fold.hpp>
</pre>
<a name="fusion.algorithm.iteration.functions.fold.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id537079"></a>
- Example
-=======
-<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 name="id744391"></a>
 <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">struct make_string
{
@@ -374,8 +181,8 @@
 }
};
...
-const vector<int,int> vec(1,2);
-assert(fold(vec,std::string(""), make_string()) == "12");
+const <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput">vector</code></a><int,int> vec(1,2);
+assert(<a class="link" href="fold.html" title="fold"><code class="computeroutput">fold</code></a>(vec,std::string(""), make_string()) == "12");
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="accumulate.html" title="accumulate">
<link rel="next" href="../metafunctions.html" title="Metafunctions">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,269 +22,126 @@
<div class="spirit-nav">
<a accesskey="p" href="accumulate.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="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.functions.for_each"></a>for_each
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="for_each">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.functions.for_each"></a><a class="link" href="for_each.html" title="for_each">for_each</a>
+</h5></div></div></div>
<a name="fusion.algorithm.iteration.functions.for_each.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id539334"></a>
- Description
-=======
-<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 name="id747104"></a>
 <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

 Applies a unary function object to each element of a sequence.
 
<a name="fusion.algorithm.iteration.functions.for_each.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id539364"></a>
- Synopsis
-=======
-<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 name="id747123"></a>
 <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
 typename F
 >
-typename result_of::for_each<Sequence, F>::type for_each(
+typename <a class="link" href="../metafunctions/for_each.html" title="for_each"><code class="computeroutput">result_of::for_each</code></a><Sequence, F>::type for_each(
 Sequence& seq, F const& f);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id539564"></a>Table 1.35. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id791320"></a>Table 1.35. Parameters
-=======
-<a name="id753331"></a>Table 1.39. Parameters
-=======
-<a name="id745707"></a>Table 1.39. Parameters
-=======
-<a name="id768499"></a>Table 1.39. Parameters
-=======
-<a name="id757094"></a>Table 1.39. Parameters
-=======
-<a name="id753817"></a>Table 1.39. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id747264"></a>Table 1.39. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>, <tt class="computeroutput">f(e)</tt> must be a valid expression for
- each element <tt class="computeroutput">e</tt>
- in <tt class="computeroutput">seq</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>, <code class="computeroutput">f(e)</code> must be a valid expression for
+ each element <code class="computeroutput">e</code>
+ in <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">f</tt>
- </td>
-<td>
- A unary <a href="../../../functional/concepts/reg_callable.html" title=" Regular Callable
- Object">Regular
+<td>
+ 
+ <code class="computeroutput">f</code>
+ 
+ </td>
+<td>
+ 
+ A unary <a class="link" href="../../../functional/concepts/reg_callable.html" title="Regular Callable Object">Regular
 Callable Object</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.iteration.functions.for_each.expression_semantics"></a><h6>
-<a name="id753970"></a>
+<a name="id747416"></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(seq, f);
+<pre class="programlisting"><a class="link" href="for_each.html" title="for_each"><code class="computeroutput">for_each</code></a>(seq, f);
</pre>

- Return type: <tt class="computeroutput">void</tt>
+ Return type: <code class="computeroutput">void</code>
 

- Semantics: Calls <tt class="computeroutput">f(e)</tt> for each element <tt class="computeroutput">e</tt>
- in <tt class="computeroutput">seq</tt>.
+ Semantics: Calls <code class="computeroutput">f(e)</code> for each element <code class="computeroutput">e</code>
+ in <code class="computeroutput">seq</code>.
 
<a name="fusion.algorithm.iteration.functions.for_each.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id539918"></a>
- Complexity
-=======
-<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 name="id747520"></a>
 <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear, exactly <tt class="computeroutput">result_of::size<Sequence>::value</tt> applications of <tt class="computeroutput">f</tt>.
+ Linear, exactly <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> applications of <code class="computeroutput">f</code>.
 
<a name="fusion.algorithm.iteration.functions.for_each.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id540012"></a>
- Header
-=======
-<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 name="id747580"></a>
 <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/iteration/for_each.hpp>
#include <boost/fusion/include/for_each.hpp>
</pre>
<a name="fusion.algorithm.iteration.functions.for_each.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id540179"></a>
- Example
-=======
-<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 name="id747696"></a>
 <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">struct increment
{
@@ -303,9 +152,9 @@
 }
};
...
-vector<int,int> vec(1,2);
-for_each(vec, increment());
-assert(vec == make_vector(2,3));
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput">vector</code></a><int,int> vec(1,2);
+<a class="link" href="for_each.html" title="for_each"><code class="computeroutput">for_each</code></a>(vec, increment());
+assert(vec == <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(2,3));
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="functions/for_each.html" title="for_each">
<link rel="next" href="metafunctions/fold.html" title="fold">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="functions/for_each.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iteration.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="metafunctions/fold.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.iteration.metafunctions"></a>Metafunctions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Metafunctions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.iteration.metafunctions"></a><a class="link" href="metafunctions.html" title="Metafunctions">Metafunctions</a>
+</h4></div></div></div>
<div class="toc"><dl>
<dt>fold</dt>
<dt>accumulate</dt>
@@ -41,7 +34,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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="fold.html" title="fold">
<link rel="next" href="for_each.html" title="for_each">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
<div class="spirit-nav">
<a accesskey="p" href="fold.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="for_each.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.metafunctions.accumulate"></a>accumulate
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="accumulate">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.metafunctions.accumulate"></a><a class="link" href="accumulate.html" title="accumulate">accumulate</a>
+</h5></div></div></div>
<a name="fusion.algorithm.iteration.metafunctions.accumulate.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id541535"></a>
- Description
-=======
-<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 name="id748646"></a>
 <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- Returns the result type of accumulate.
+ Returns the result type of <a class="link" href="../functions/accumulate.html" title="accumulate"><code class="computeroutput">accumulate</code></a>.
 
<a name="fusion.algorithm.iteration.metafunctions.accumulate.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id541582"></a>
- Synopsis
-=======
-<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 name="id748678"></a>
 <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -108,86 +47,67 @@
};
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id541715"></a>Table 1.37. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id793380"></a>Table 1.37. Parameters
-=======
-<a name="id755937"></a>Table 1.41. Parameters
-=======
-<a name="id748313"></a>Table 1.41. Parameters
-=======
-<a name="id770013"></a>Table 1.41. Parameters
-=======
-<a name="id758608"></a>Table 1.41. Parameters
-=======
-<a name="id755331"></a>Table 1.41. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id748777"></a>Table 1.41. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">Sequence</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">Sequence</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The sequence to iterate
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">State</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">State</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
- The initial state for the first application of <tt class="computeroutput">F</tt>
- </td>
+ 
+ </td>
+<td>
+ 
+ The initial state for the first application of <code class="computeroutput">F</code>
+ 
+ </td>
</tr>
<tr>
-<<<<<<< .working
-<td>
- <tt class="computeroutput">F</tt>
- </td>
-<td>
- <tt class="computeroutput">boost::result_of<F(E,S)>::type</tt> is the return type of <tt class="computeroutput">f(e,s)</tt>
- for each element <tt class="computeroutput">e</tt>
- of type <tt class="computeroutput">E</tt> in <tt class="computeroutput">seq</tt>, and current state <tt class="computeroutput">s</tt> of type <tt class="computeroutput">S</tt>
- </td>
-<td>
-=======
<td>
 
 <code class="computeroutput">F</code>
@@ -204,96 +124,40 @@
 </td>
<td>
 
->>>>>>> .merge-right.r57125
 The operation to be applied on forward traversal
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.iteration.metafunctions.accumulate.expression_semantics"></a><h6>
-<a name="id755590"></a>
+<a name="id749036"></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<Sequence, State, F>::type
+<pre class="programlisting"><a class="link" href="accumulate.html" title="accumulate"><code class="computeroutput">result_of::accumulate</code></a><Sequence, State, F>::type
</pre>

- Return type: Any type
+ Return type: Any type
 

- Semantics: Returns the result of applying
- <tt class="computeroutput">accumulate</tt> to a sequence
- of type <tt class="computeroutput">Sequence</tt>, with
- an initial state of type <tt class="computeroutput">State</tt>
- and binary function object or function pointer of type <tt class="computeroutput">F</tt>.
+ Semantics: Returns the result of applying
+ <code class="computeroutput">accumulate</code> to a sequence
+ of type <code class="computeroutput">Sequence</code>, with
+ an initial state of type <code class="computeroutput">State</code>
+ and binary function object or function pointer of type <code class="computeroutput">F</code>.
 
<a name="fusion.algorithm.iteration.metafunctions.accumulate.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id542240"></a>
- Complexity
-=======
-<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 name="id749149"></a>
 <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear, exactly <tt class="computeroutput">result_of::size<Sequence>::value</tt> applications of <tt class="computeroutput">F</tt>.
+ Linear, exactly <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> applications of <code class="computeroutput">F</code>.
 
<a name="fusion.algorithm.iteration.metafunctions.accumulate.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id542334"></a>
- Header
-=======
-<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 name="id749212"></a>
 <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/iteration/accumulate.hpp>
#include <boost/fusion/include/accumulate.hpp>

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="../metafunctions.html" title="Metafunctions">
<link rel="next" href="accumulate.html" title="accumulate">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
<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="accumulate.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.metafunctions.fold"></a>fold
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="fold">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.metafunctions.fold"></a><a class="link" href="fold.html" title="fold">fold</a>
+</h5></div></div></div>
<a name="fusion.algorithm.iteration.metafunctions.fold.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id540554"></a>
- Description
-=======
-<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 name="id747960"></a>
 <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- Returns the result type of fold.
+ Returns the result type of <a class="link" href="../functions/fold.html" title="fold"><code class="computeroutput">fold</code></a>.
 
<a name="fusion.algorithm.iteration.metafunctions.fold.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id540601"></a>
- Synopsis
-=======
-<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 name="id747989"></a>
 <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -108,86 +47,67 @@
};
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id540735"></a>Table 1.36. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id792142"></a>Table 1.36. Parameters
-=======
-<a name="id754153"></a>Table 1.40. Parameters
-=======
-<a name="id746529"></a>Table 1.40. Parameters
-=======
-<a name="id769322"></a>Table 1.40. Parameters
-=======
-<a name="id757916"></a>Table 1.40. Parameters
-=======
-<a name="id754640"></a>Table 1.40. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id748086"></a>Table 1.40. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">Sequence</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">Sequence</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The sequence to iterate
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">State</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">State</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
- The initial state for the first application of <tt class="computeroutput">F</tt>
- </td>
+ 
+ </td>
+<td>
+ 
+ The initial state for the first application of <code class="computeroutput">F</code>
+ 
+ </td>
</tr>
<tr>
-<<<<<<< .working
-<td>
- <tt class="computeroutput">F</tt>
- </td>
-<td>
- <tt class="computeroutput">boost::result_of<F(E,S)>::type</tt> is the return type of <tt class="computeroutput">f(e,s)</tt>
- for each element <tt class="computeroutput">e</tt>
- of type <tt class="computeroutput">E</tt> in <tt class="computeroutput">seq</tt>, and current state <tt class="computeroutput">s</tt> of type <tt class="computeroutput">S</tt>
- </td>
-<td>
-=======
<td>
 
 <code class="computeroutput">F</code>
@@ -204,96 +124,40 @@
 </td>
<td>
 
->>>>>>> .merge-right.r57125
 The operation to be applied on forward traversal
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.iteration.metafunctions.fold.expression_semantics"></a><h6>
-<a name="id754899"></a>
+<a name="id748345"></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<Sequence, State, F>::type
+<pre class="programlisting"><a class="link" href="fold.html" title="fold"><code class="computeroutput">result_of::fold</code></a><Sequence, State, F>::type
</pre>

- Return type: Any type
+ Return type: Any type
 

- Semantics: Returns the result of applying
- <tt class="computeroutput">fold</tt> to a sequence of
- type <tt class="computeroutput">Sequence</tt>, with an
- initial state of type <tt class="computeroutput">State</tt>
- and binary function object or function pointer of type <tt class="computeroutput">F</tt>.
+ Semantics: Returns the result of applying
+ <code class="computeroutput">fold</code> to a sequence of
+ type <code class="computeroutput">Sequence</code>, with an
+ initial state of type <code class="computeroutput">State</code>
+ and binary function object or function pointer of type <code class="computeroutput">F</code>.
 
<a name="fusion.algorithm.iteration.metafunctions.fold.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id541254"></a>
- Complexity
-=======
-<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 name="id748458"></a>
 <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear, exactly <tt class="computeroutput">result_of::size<Sequence>::value</tt> applications of <tt class="computeroutput">F</tt>.
+ Linear, exactly <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> applications of <code class="computeroutput">F</code>.
 
<a name="fusion.algorithm.iteration.metafunctions.fold.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id541349"></a>
- Header
-=======
-<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 name="id748518"></a>
 <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/iteration/fold.hpp>
#include <boost/fusion/include/fold.hpp>

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="accumulate.html" title="accumulate">
<link rel="next" href="../../query.html" title="Query">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
<div class="spirit-nav">
<a accesskey="p" href="accumulate.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="../../query.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.metafunctions.for_each"></a>for_each
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="for_each">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.metafunctions.for_each"></a><a class="link" href="for_each.html" title="for_each">for_each</a>
+</h5></div></div></div>

- A metafunction returning the result type of applying for_each to a sequence. The
- return type of for_each is always <tt class="computeroutput">void</tt>.
+ A metafunction returning the result type of applying <a class="link" href="../functions/for_each.html" title="for_each"><code class="computeroutput">for_each</code></a> to a sequence. The
+ return type of <a class="link" href="../functions/for_each.html" title="for_each"><code class="computeroutput">for_each</code></a> is always <code class="computeroutput">void</code>.
 
<a name="fusion.algorithm.iteration.metafunctions.for_each.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id542575"></a>
- Description
-=======
-<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 name="id749372"></a>
 <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>
- Synopsis
-=======
-<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 name="id749390"></a>
 <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -109,160 +48,96 @@
};
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id542720"></a>Table 1.38. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id794082"></a>Table 1.38. Parameters
-=======
-<a name="id756639"></a>Table 1.42. Parameters
-=======
-<a name="id749015"></a>Table 1.42. Parameters
-=======
-<a name="id770715"></a>Table 1.42. Parameters
-=======
-<a name="id759310"></a>Table 1.42. Parameters
-=======
-<a name="id756033"></a>Table 1.42. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id749479"></a>Table 1.42. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">Sequence</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">Sequence</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">F</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">F</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.iteration.metafunctions.for_each.expression_semantics"></a><h6>
-<a name="id756147"></a>
+<a name="id749593"></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<Sequence, F>::type
+<pre class="programlisting"><a class="link" href="for_each.html" title="for_each"><code class="computeroutput">result_of::for_each</code></a><Sequence, F>::type
</pre>

- Return type: <tt class="computeroutput">void</tt>.
+ Return type: <code class="computeroutput">void</code>.
 

- Semantics: Returns the return type of
- for_each for a sequence of type
- <tt class="computeroutput">Sequence</tt> and a unary
- function object <tt class="computeroutput">F</tt>. The
- return type is always <tt class="computeroutput">void</tt>.
+ Semantics: Returns the return type of
+ <a class="link" href="../functions/for_each.html" title="for_each"><code class="computeroutput">for_each</code></a> for a sequence of type
+ <code class="computeroutput">Sequence</code> and a unary
+ function object <code class="computeroutput">F</code>. The
+ return type is always <code class="computeroutput">void</code>.
 
<a name="fusion.algorithm.iteration.metafunctions.for_each.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id543040"></a>
- Complexity
-=======
-<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 name="id749707"></a>
 <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant.
 
<a name="fusion.algorithm.iteration.metafunctions.for_each.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id543069"></a>
- Header
-=======
-<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 name="id749729"></a>
 <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/iteration/for_each.hpp>
#include <boost/fusion/include/for_each.hpp>

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="iteration/metafunctions/for_each.html" title="for_each">
<link rel="next" href="query/functions.html" title="Functions">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="iteration/metafunctions/for_each.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../algorithm.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="query/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.algorithm.query"></a>Query
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Query">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.algorithm.query"></a><a class="link" href="query.html" title="Query">Query</a>
+</h3></div></div></div>
<div class="toc"><dl>
<dt>Functions</dt>
<dt>Metafunctions</dt>
@@ -40,24 +33,17 @@

 The query algorithms provide support for searching and analyzing sequences.
 
-<<<<<<< .working
-<a name="fusion.algorithm.query.header"></a><h4>
-<a name="id543262"></a>
- Header
- </h4>
-=======
<a name="fusion.algorithm.query.header"></a><h5>
-<a name="id749399"></a>
+<a name="id749863"></a>
 <a class="link" href="query.html#fusion.algorithm.query.header">Header</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/algorithm/query.hpp>
#include <boost/fusion/include/query.hpp>
</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
 Distributed under the 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.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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="../query.html" title="Query">
<link rel="next" href="functions/any.html" title="any">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="../query.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../query.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/any.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.query.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.query.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
<div class="toc"><dl>
<dt>any</dt>
<dt>all</dt>
@@ -45,7 +38,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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="any.html" title="any">
<link rel="next" href="none.html" title="none">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,273 +22,131 @@
<div class="spirit-nav">
<a accesskey="p" href="any.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="none.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.all"></a>all
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="all">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.all"></a><a class="link" href="all.html" title="all">all</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.functions.all.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id545520"></a>
- Description
-=======
-<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 name="id751952"></a>
 <a class="link" href="all.html#fusion.algorithm.query.functions.all.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- For a sequence <tt class="computeroutput">seq</tt> and
- unary function object <tt class="computeroutput">f</tt>,
- <tt class="computeroutput">all</tt> returns true if
- <tt class="computeroutput">f</tt> returns true for every
- element of <tt class="computeroutput">seq</tt>.
+ For a sequence <code class="computeroutput">seq</code> and
+ unary function object <code class="computeroutput">f</code>,
+ <code class="computeroutput">all</code> returns true if
+ <code class="computeroutput">f</code> returns true for every
+ element of <code class="computeroutput">seq</code>.
 
<a name="fusion.algorithm.query.functions.all.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id353686"></a>
- Synopsis
-=======
-<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 name="id752005"></a>
 <a class="link" href="all.html#fusion.algorithm.query.functions.all.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
 typename F
 >
-typename result_of::all<Sequence,F>::type all(
+typename <a class="link" href="../metafunctions/all.html" title="all"><code class="computeroutput">result_of::all</code></a><Sequence,F>::type all(
 Sequence const& seq, F f);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id546380"></a>Table 1.40. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id796744"></a>Table 1.40. Parameters
-=======
-<a name="id758481"></a>Table 1.44. Parameters
-=======
-<a name="id750857"></a>Table 1.44. Parameters
-=======
-<a name="id773444"></a>Table 1.44. Parameters
-=======
-<a name="id761971"></a>Table 1.44. Parameters
-=======
-<a name="id758694"></a>Table 1.44. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id752140"></a>Table 1.44. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>, <tt class="computeroutput">f(e)</tt> is a valid expression, convertible
- to <tt class="computeroutput">bool</tt>, for every
- element <tt class="computeroutput">e</tt> in <tt class="computeroutput">seq</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>, <code class="computeroutput">f(e)</code> is a valid expression, convertible
+ to <code class="computeroutput">bool</code>, for every
+ element <code class="computeroutput">e</code> in <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
 The sequence to search
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">f</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">f</code>
+ 
+ </td>
+<td>
+ 
 A unary function object
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The search predicate
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.functions.all.expression_semantics"></a><h6>
-<a name="id758852"></a>
+<a name="id752299"></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(seq, f);
+<pre class="programlisting"><a class="link" href="all.html" title="all"><code class="computeroutput">all</code></a>(seq, f);
</pre>

- Return type: <tt class="computeroutput">bool</tt>
+ Return type: <code class="computeroutput">bool</code>
 

- Semantics: Returns true if and only
- if <tt class="computeroutput">f(e)</tt>
- evaluates to <tt class="computeroutput">true</tt> for every
- element <tt class="computeroutput">e</tt> in <tt class="computeroutput">seq</tt>.
+ Semantics: Returns true if and only
+ if <code class="computeroutput">f(e)</code>
+ evaluates to <code class="computeroutput">true</code> for every
+ element <code class="computeroutput">e</code> in <code class="computeroutput">seq</code>.
 
<a name="fusion.algorithm.query.functions.all.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id546716"></a>
- Complexity
-=======
-<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 name="id752410"></a>
 <a class="link" href="all.html#fusion.algorithm.query.functions.all.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear. At most <tt class="computeroutput">result_of::size<Sequence>::value</tt> comparisons.
+ Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> comparisons.
 
<a name="fusion.algorithm.query.functions.all.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id546786"></a>
- Header
-=======
-<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 name="id752461"></a>
 <a class="link" href="all.html#fusion.algorithm.query.functions.all.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/all.hpp>
#include <boost/fusion/include/all.hpp>
</pre>
<a name="fusion.algorithm.query.functions.all.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id546934"></a>
- Example
-=======
-<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 name="id752576"></a>
 <a class="link" href="all.html#fusion.algorithm.query.functions.all.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">struct odd
{
@@ -307,8 +157,8 @@
 }
};
...
-assert(all(make_vector(1,3), odd()));
-assert(!all(make_vector(1,2), odd()));
+assert(<a class="link" href="all.html" title="all"><code class="computeroutput">all</code></a>(<a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(1,3), odd()));
+assert(!<a class="link" href="all.html" title="all"><code class="computeroutput">all</code></a>(<a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(1,2), odd()));
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="../functions.html" title="Functions">
<link rel="next" href="all.html" title="all">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,273 +22,131 @@
<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="all.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.any"></a>any
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="any">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.any"></a><a class="link" href="any.html" title="any">any</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.functions.any.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id543456"></a>
- Description
-=======
-<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 name="id749990"></a>
 <a class="link" href="any.html#fusion.algorithm.query.functions.any.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- For a sequence <tt class="computeroutput">seq</tt> and
- unary function object <tt class="computeroutput">f</tt>,
- <tt class="computeroutput">any</tt> returns true if
- <tt class="computeroutput">f</tt> returns true for at
- least one element of <tt class="computeroutput">seq</tt>.
+ For a sequence <code class="computeroutput">seq</code> and
+ unary function object <code class="computeroutput">f</code>,
+ <code class="computeroutput">any</code> returns true if
+ <code class="computeroutput">f</code> returns true for at
+ least one element of <code class="computeroutput">seq</code>.
 
<a name="fusion.algorithm.query.functions.any.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id543543"></a>
- Synopsis
-=======
-<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 name="id750043"></a>
 <a class="link" href="any.html#fusion.algorithm.query.functions.any.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
 typename F
 >
-typename result_of::any<Sequence,F>::type any(
+typename <a class="link" href="../metafunctions/any.html" title="any"><code class="computeroutput">result_of::any</code></a><Sequence,F>::type any(
 Sequence const& seq, F f);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id543734"></a>Table 1.39. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id794782"></a>Table 1.39. Parameters
-=======
-<a name="id757339"></a>Table 1.43. Parameters
-=======
-<a name="id749715"></a>Table 1.43. Parameters
-=======
-<a name="id771414"></a>Table 1.43. Parameters
-=======
-<a name="id761102"></a>Table 1.43. Parameters
-=======
-<a name="id757825"></a>Table 1.43. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id751272"></a>Table 1.43. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>, <tt class="computeroutput">f(e)</tt> must be a valid expression, convertible
- to <tt class="computeroutput">bool</tt>, for each
- element <tt class="computeroutput">e</tt> in <tt class="computeroutput">seq</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>, <code class="computeroutput">f(e)</code> must be a valid expression, convertible
+ to <code class="computeroutput">bool</code>, for each
+ element <code class="computeroutput">e</code> in <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
 The sequence to search
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">f</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">f</code>
+ 
+ </td>
+<td>
+ 
 A unary function object
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The search predicate
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.functions.any.expression_semantics"></a><h6>
-<a name="id757984"></a>
+<a name="id751430"></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(seq, f);
+<pre class="programlisting"><a class="link" href="any.html" title="any"><code class="computeroutput">any</code></a>(seq, f);
</pre>

- Return type: <tt class="computeroutput">bool</tt>
+ Return type: <code class="computeroutput">bool</code>
 

- Semantics: Returns true if and only
- if <tt class="computeroutput">f(e)</tt>
- evaluates to <tt class="computeroutput">true</tt> for some
- element <tt class="computeroutput">e</tt> in <tt class="computeroutput">seq</tt>.
+ Semantics: Returns true if and only
+ if <code class="computeroutput">f(e)</code>
+ evaluates to <code class="computeroutput">true</code> for some
+ element <code class="computeroutput">e</code> in <code class="computeroutput">seq</code>.
 
<a name="fusion.algorithm.query.functions.any.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id544102"></a>
- Complexity
-=======
-<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 name="id751542"></a>
 <a class="link" href="any.html#fusion.algorithm.query.functions.any.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear. At most <tt class="computeroutput">result_of::size<Sequence>::value</tt> comparisons.
+ Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> comparisons.
 
<a name="fusion.algorithm.query.functions.any.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id544184"></a>
- Header
-=======
-<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 name="id751592"></a>
 <a class="link" href="any.html#fusion.algorithm.query.functions.any.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/any.hpp>
#include <boost/fusion/include/any.hpp>
</pre>
<a name="fusion.algorithm.query.functions.any.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id544349"></a>
- Example
-=======
-<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 name="id751707"></a>
 <a class="link" href="any.html#fusion.algorithm.query.functions.any.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">struct odd
{
@@ -307,8 +157,8 @@
 }
};
...
-assert(any(make_vector(1,2), odd()));
-assert(!any(make_vector(2,4), odd()));
+assert(<a class="link" href="any.html" title="any"><code class="computeroutput">any</code></a>(<a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(1,2), odd()));
+assert(!<a class="link" href="any.html" title="any"><code class="computeroutput">any</code></a>(<a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(2,4), odd()));
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="find_if.html" title="find_if">
<link rel="next" href="count_if.html" title="count_if">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,272 +22,130 @@
<div class="spirit-nav">
<a accesskey="p" href="find_if.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="count_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.count"></a>count
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="count">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.count"></a><a class="link" href="count.html" title="count">count</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.functions.count.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id550460"></a>
- Description
-=======
-<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 name="id758127"></a>
 <a class="link" href="count.html#fusion.algorithm.query.functions.count.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

 Returns the number of elements of a given type within a sequence.
 
<a name="fusion.algorithm.query.functions.count.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id550488"></a>
- Synopsis
-=======
-<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 name="id758144"></a>
 <a class="link" href="count.html#fusion.algorithm.query.functions.count.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
 typename T
 >
-typename result_of::count<Sequence, T>::type count(
+typename <a class="link" href="../metafunctions/count.html" title="count"><code class="computeroutput">result_of::count</code></a><Sequence, T>::type count(
 Sequence const& seq, T const& t);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id550689"></a>Table 1.44. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id801654"></a>Table 1.44. Parameters
-=======
-<a name="id765586"></a>Table 1.48. Parameters
-=======
-<a name="id757962"></a>Table 1.48. Parameters
-=======
-<a name="id780549"></a>Table 1.48. Parameters
-=======
-<a name="id768120"></a>Table 1.48. Parameters
-=======
-<a name="id764843"></a>Table 1.48. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id758289"></a>Table 1.48. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>, <tt class="computeroutput">e == t</tt>
- must be a valid expression, convertible to <tt class="computeroutput">bool</tt>,
- for each element <tt class="computeroutput">e</tt>
- in <tt class="computeroutput">seq</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>, <code class="computeroutput">e == t</code>
+ must be a valid expression, convertible to <code class="computeroutput">bool</code>,
+ for each element <code class="computeroutput">e</code>
+ in <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
 The sequence to search
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">T</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">T</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The type to count
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.functions.count.expression_semantics"></a><h6>
-<a name="id764998"></a>
+<a name="id758444"></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(seq, t);
+<pre class="programlisting"><a class="link" href="count.html" title="count"><code class="computeroutput">count</code></a>(seq, t);
</pre>

- Return type: <tt class="computeroutput">int</tt>
+ Return type: <code class="computeroutput">int</code>
 

- Semantics: Returns the number of elements
- of type <tt class="computeroutput">T</tt> and equal to
- <tt class="computeroutput">t</tt> in <tt class="computeroutput">seq</tt>.
+ Semantics: Returns the number of elements
+ of type <code class="computeroutput">T</code> and equal to
+ <code class="computeroutput">t</code> in <code class="computeroutput">seq</code>.
 
<a name="fusion.algorithm.query.functions.count.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551015"></a>
- Complexity
-=======
-<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 name="id759630"></a>
 <a class="link" href="count.html#fusion.algorithm.query.functions.count.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear. At most <tt class="computeroutput">result_of::size<Sequence>::value</tt> comparisons.
+ Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> comparisons.
 
<a name="fusion.algorithm.query.functions.count.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551094"></a>
- Header
-=======
-<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 name="id759681"></a>
 <a class="link" href="count.html#fusion.algorithm.query.functions.count.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/count.hpp>
#include <boost/fusion/include/count.hpp>
</pre>
<a name="fusion.algorithm.query.functions.count.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551257"></a>
- Example
-=======
-<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 name="id759796"></a>
 <a class="link" href="count.html#fusion.algorithm.query.functions.count.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
-<pre class="programlisting">const vector<double,int,int> vec(1.0,2,3);
-assert(count(vec,2) == 1);
+<pre class="programlisting">const <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput">vector</code></a><double,int,int> vec(1.0,2,3);
+assert(<a class="link" href="count.html" title="count"><code class="computeroutput">count</code></a>(vec,2) == 1);
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="count.html" title="count">
<link rel="next" href="../metafunctions.html" title="Metafunctions">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,271 +22,129 @@
<div class="spirit-nav">
<a accesskey="p" href="count.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="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.count_if"></a>count_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="count_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.count_if"></a><a class="link" href="count_if.html" title="count_if">count_if</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.functions.count_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551462"></a>
- Description
-=======
-<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 name="id759941"></a>
 <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

 Returns the number of elements within a sequence with a type for which
- a given unary function object evaluates to <tt class="computeroutput">true</tt>.
+ a given unary function object evaluates to <code class="computeroutput">true</code>.
 
<a name="fusion.algorithm.query.functions.count_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551502"></a>
- Synopsis
-=======
-<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 name="id759965"></a>
 <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
 typename F
 >
-typename result_of::count_if<Sequence, F>::type count_if(
+typename <a class="link" href="../metafunctions/count_if.html" title="count_if"><code class="computeroutput">result_of::count_if</code></a><Sequence, F>::type count_if(
 Sequence const& seq, F f);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551692"></a>Table 1.45. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id804559"></a>Table 1.45. Parameters
-=======
-<a name="id766306"></a>Table 1.49. Parameters
-=======
-<a name="id758682"></a>Table 1.49. Parameters
-=======
-<a name="id782362"></a>Table 1.49. Parameters
-=======
-<a name="id769932"></a>Table 1.49. Parameters
-=======
-<a name="id766656"></a>Table 1.49. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id760102"></a>Table 1.49. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>, <tt class="computeroutput">f(e)</tt> is a valid expression, convertible
- to <tt class="computeroutput">bool</tt>, for each
- element <tt class="computeroutput">e</tt> in <tt class="computeroutput">seq</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>, <code class="computeroutput">f(e)</code> is a valid expression, convertible
+ to <code class="computeroutput">bool</code>, for each
+ element <code class="computeroutput">e</code> in <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
 The sequence to search
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">f</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">f</code>
+ 
+ </td>
+<td>
+ 
 A unary function object
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The search predicate
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.functions.count_if.expression_semantics"></a><h6>
-<a name="id766814"></a>
+<a name="id760260"></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(seq, f)
+<pre class="programlisting"><a class="link" href="count_if.html" title="count_if"><code class="computeroutput">count_if</code></a>(seq, f)
</pre>

- Return type: <tt class="computeroutput">int</tt>
+ Return type: <code class="computeroutput">int</code>
 

- Semantics: Returns the number of elements
- in <tt class="computeroutput">seq</tt> where <tt class="computeroutput">f</tt> evaluates to <tt class="computeroutput">true</tt>.
+ Semantics: Returns the number of elements
+ in <code class="computeroutput">seq</code> where <code class="computeroutput">f</code> evaluates to <code class="computeroutput">true</code>.
 
<a name="fusion.algorithm.query.functions.count_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552021"></a>
- Complexity
-=======
-<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 name="id760354"></a>
 <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear. At most <tt class="computeroutput">result_of::size<Sequence>::value</tt> comparisons.
+ Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> comparisons.
 
<a name="fusion.algorithm.query.functions.count_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552099"></a>
- Header
-=======
-<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 name="id760404"></a>
 <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/count_if.hpp>
#include <boost/fusion/include/count_if.hpp>
</pre>
<a name="fusion.algorithm.query.functions.count_if.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552264"></a>
- Example
-=======
-<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 name="id760520"></a>
 <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
-<pre class="programlisting">const vector<int,int,int> vec(1,2,3);
-assert(count_if(vec,odd()) == 2);
+<pre class="programlisting">const <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput">vector</code></a><int,int,int> vec(1,2,3);
+assert(<a class="link" href="count_if.html" title="count_if"><code class="computeroutput">count_if</code></a>(vec,odd()) == 2);
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="none.html" title="none">
<link rel="next" href="find_if.html" title="find_if">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
<div class="spirit-nav">
<a accesskey="p" href="none.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="find_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.find"></a>find
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="find">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.find"></a><a class="link" href="find.html" title="find">find</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.functions.find.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id548407"></a>
- Description
-=======
-<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 name="id756588"></a>
 <a class="link" href="find.html#fusion.algorithm.query.functions.find.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

 Finds the first element of a given type within a sequence.
 
<a name="fusion.algorithm.query.functions.find.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id548433"></a>
- Synopsis
-=======
-<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 name="id756604"></a>
 <a class="link" href="find.html#fusion.algorithm.query.functions.find.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename T,
@@ -111,196 +50,107 @@
unspecified find(Sequence& seq);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id548610"></a>Table 1.42. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id800124"></a>Table 1.42. Parameters
-=======
-<a name="id764046"></a>Table 1.46. Parameters
-=======
-<a name="id756422"></a>Table 1.46. Parameters
-=======
-<a name="id779009"></a>Table 1.46. Parameters
-=======
-<a name="id766580"></a>Table 1.46. Parameters
-=======
-<a name="id763303"></a>Table 1.46. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id756750"></a>Table 1.46. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The sequence to search
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">T</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">T</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The type to search for
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.functions.find.expression_semantics"></a><h6>
-<a name="id763420"></a>
+<a name="id756866"></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<T>(seq)
+<pre class="programlisting"><a class="link" href="find.html" title="find"><code class="computeroutput">find</code></a><T>(seq)
</pre>

- Return type: A model of the same iterator
- category as the iterators of <tt class="computeroutput">seq</tt>.
+ Return type: A model of the same iterator
+ category as the iterators of <code class="computeroutput">seq</code>.
 

- Semantics: Returns an iterator to the
- first element of <tt class="computeroutput">seq</tt>
- of type <tt class="computeroutput">T</tt>, or <tt class="computeroutput">end(seq)</tt> if there is no such element. Equivalent
- to <tt class="computeroutput">find_if<boost::is_same<_, T> >(seq)</tt>
+ Semantics: Returns an iterator to the
+ first element of <code class="computeroutput">seq</code>
+ of type <code class="computeroutput">T</code>, or <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput">end</code></a>(seq)</code> if there is no such element. Equivalent
+ to <code class="computeroutput"><a class="link" href="find_if.html" title="find_if"><code class="computeroutput">find_if</code></a><boost::is_same<_, T> >(seq)</code>
 
<a name="fusion.algorithm.query.functions.find.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id548963"></a>
- Complexity
-=======
-<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 name="id757034"></a>
 <a class="link" href="find.html#fusion.algorithm.query.functions.find.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear. At most <tt class="computeroutput">result_of::size<Sequence>::value</tt> comparisons.
+ Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> comparisons.
 
<a name="fusion.algorithm.query.functions.find.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id549034"></a>
- Header
-=======
-<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 name="id757084"></a>
 <a class="link" href="find.html#fusion.algorithm.query.functions.find.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/find.hpp>
#include <boost/fusion/include/find.hpp>
</pre>
<a name="fusion.algorithm.query.functions.find.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id549182"></a>
- Example
-=======
-<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 name="id757200"></a>
 <a class="link" href="find.html#fusion.algorithm.query.functions.find.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
-<pre class="programlisting">const vector<char,int> vec('a','0');
-assert(*find<int>(vec) == '0');
-assert(find<double>(vec) == end(vec));
+<pre class="programlisting">const <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput">vector</code></a><char,int> vec('a','0');
+assert(*<a class="link" href="find.html" title="find"><code class="computeroutput">find</code></a><int>(vec) == '0');
+assert(<a class="link" href="find.html" title="find"><code class="computeroutput">find</code></a><double>(vec) == <a class="link" href="../../../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput">end</code></a>(vec));
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="find.html" title="find">
<link rel="next" href="count.html" title="count">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,75 +22,22 @@
<div class="spirit-nav">
<a accesskey="p" href="find.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="count.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.find_if"></a>find_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="find_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.find_if"></a><a class="link" href="find_if.html" title="find_if">find_if</a>
+</h5></div></div></div>

 Finds the first element within a sequence with a type for which a given
 <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
- Lambda Expression</a> evaluates to <tt class="computeroutput">boost::mpl::true_</tt>.
+ Lambda Expression</a> evaluates to <code class="computeroutput">boost::mpl::true_</code>.
 
<a name="fusion.algorithm.query.functions.find_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id549491"></a>
- Description
-=======
-<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 name="id757420"></a>
 <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>
- Synopsis
-=======
-<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 name="id757434"></a>
 <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename F,
@@ -113,133 +52,94 @@
unspecified find_if(Sequence& seq);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id549709"></a>Table 1.43. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id800953"></a>Table 1.43. Parameters
-=======
-<a name="id764876"></a>Table 1.47. Parameters
-=======
-<a name="id757251"></a>Table 1.47. Parameters
-=======
-<a name="id779838"></a>Table 1.47. Parameters
-=======
-<a name="id767409"></a>Table 1.47. Parameters
-=======
-<a name="id764132"></a>Table 1.47. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id757579"></a>Table 1.47. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The sequence to search
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">F</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">F</code>
+ 
+ </td>
+<td>
+ 
 A unary <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
 Lambda Expression</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The search predicate
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.functions.find_if.expression_semantics"></a><h6>
-<a name="id764254"></a>
+<a name="id757700"></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<F>(seq)
+<pre class="programlisting"><a class="link" href="find_if.html" title="find_if"><code class="computeroutput">find_if</code></a><F>(seq)
</pre>

- Return type: An iterator of the same
- iterator category as the iterators of <tt class="computeroutput">seq</tt>.
+ Return type: An iterator of the same
+ iterator category as the iterators of <code class="computeroutput">seq</code>.
 

- Semantics: Returns the first element
- of <tt class="computeroutput">seq</tt> for which <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
- Lambda Expression</a> <tt class="computeroutput">F</tt>
- evaluates to <tt class="computeroutput">boost::mpl::true_</tt>, or <tt class="computeroutput">end(seq)</tt>
+ Semantics: Returns the first element
+ of <code class="computeroutput">seq</code> for which <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
+ Lambda Expression</a> <code class="computeroutput">F</code>
+ evaluates to <code class="computeroutput">boost::mpl::true_</code>, or <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput">end</code></a>(seq)</code>
 if there is no such element.
 
<a name="fusion.algorithm.query.functions.find_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id550050"></a>
- Complexity
-=======
-<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 name="id757834"></a>
 <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear. At most <tt class="computeroutput">result_of::size<Sequence>::value</tt> comparisons.
+ Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> comparisons.
 
<div class="orderedlist"><ol class="orderedlist" type="1">
<li class="listitem">
@@ -250,37 +150,12 @@
 </li>
</ol></div>
<a name="fusion.algorithm.query.functions.find_if.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id550133"></a>
- Example
-=======
-<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 name="id757898"></a>
 <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
-<pre class="programlisting">const vector<double,int> vec(1.0,2);
-assert(*find_if<is_integral<mpl::_> >(vec) == 2);
-assert(find_if<is_class<mpl::_> >(vec) == end(vec));
+<pre class="programlisting">const <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput">vector</code></a><double,int> vec(1.0,2);
+assert(*<a class="link" href="find_if.html" title="find_if"><code class="computeroutput">find_if</code></a><is_integral<mpl::_> >(vec) == 2);
+assert(<a class="link" href="find_if.html" title="find_if"><code class="computeroutput">find_if</code></a><is_class<mpl::_> >(vec) == <a class="link" href="../../../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput">end</code></a>(vec));
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="all.html" title="all">
<link rel="next" href="find.html" title="find">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,273 +22,131 @@
<div class="spirit-nav">
<a accesskey="p" href="all.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="find.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.none"></a>none
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="none">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.none"></a><a class="link" href="none.html" title="none">none</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.functions.none.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id547251"></a>
- Description
-=======
-<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 name="id752821"></a>
 <a class="link" href="none.html#fusion.algorithm.query.functions.none.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- For a sequence <tt class="computeroutput">seq</tt> and
- unary function object <tt class="computeroutput">f</tt>,
- <tt class="computeroutput">none</tt> returns true if
- <tt class="computeroutput">f</tt> returns false for every
- element of <tt class="computeroutput">seq</tt>.
+ For a sequence <code class="computeroutput">seq</code> and
+ unary function object <code class="computeroutput">f</code>,
+ <code class="computeroutput">none</code> returns true if
+ <code class="computeroutput">f</code> returns false for every
+ element of <code class="computeroutput">seq</code>.
 
<a name="fusion.algorithm.query.functions.none.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id547326"></a>
- Synopsis
-=======
-<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 name="id752874"></a>
 <a class="link" href="none.html#fusion.algorithm.query.functions.none.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
 typename F
 >
-typename result_of::none<Sequence,F>::type none(
+typename <a class="link" href="../metafunctions/none.html" title="none"><code class="computeroutput">result_of::none</code></a><Sequence,F>::type none(
 Sequence const& seq, F f);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id547496"></a>Table 1.41. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id797612"></a>Table 1.41. Parameters
-=======
-<a name="id759350"></a>Table 1.45. Parameters
-=======
-<a name="id751726"></a>Table 1.45. Parameters
-=======
-<a name="id774313"></a>Table 1.45. Parameters
-=======
-<a name="id762840"></a>Table 1.45. Parameters
-=======
-<a name="id759563"></a>Table 1.45. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id753009"></a>Table 1.45. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>, <tt class="computeroutput">f(e)</tt> is a valid expression, convertible
- to <tt class="computeroutput">bool</tt>, for every
- element <tt class="computeroutput">e</tt> in <tt class="computeroutput">seq</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+ Sequence</a>, <code class="computeroutput">f(e)</code> is a valid expression, convertible
+ to <code class="computeroutput">bool</code>, for every
+ element <code class="computeroutput">e</code> in <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
 The sequence to search
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">f</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">f</code>
+ 
+ </td>
+<td>
+ 
 A unary function object
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The search predicate
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.functions.none.expression_semantics"></a><h6>
-<a name="id759721"></a>
+<a name="id753168"></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(seq, f);
+<pre class="programlisting"><a class="link" href="none.html" title="none"><code class="computeroutput">none</code></a>(seq, f);
</pre>

- Return type: <tt class="computeroutput">bool</tt>
+ Return type: <code class="computeroutput">bool</code>
 

- Semantics: Returns true if and only
- if <tt class="computeroutput">f(e)</tt>
- evaluates to <tt class="computeroutput">false</tt> for every
- element <tt class="computeroutput">e</tt> in <tt class="computeroutput">seq</tt>. Result equivalent to <tt class="computeroutput">!any(seq, f)</tt>.
+ Semantics: Returns true if and only
+ if <code class="computeroutput">f(e)</code>
+ evaluates to <code class="computeroutput">false</code> for every
+ element <code class="computeroutput">e</code> in <code class="computeroutput">seq</code>. Result equivalent to <code class="computeroutput">!any(seq, f)</code>.
 
<a name="fusion.algorithm.query.functions.none.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id547871"></a>
- Complexity
-=======
-<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 name="id753309"></a>
 <a class="link" href="none.html#fusion.algorithm.query.functions.none.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear. At most <tt class="computeroutput">result_of::size<Sequence>::value</tt> comparisons.
+ Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> comparisons.
 
<a name="fusion.algorithm.query.functions.none.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id547942"></a>
- Header
-=======
-<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 name="id753360"></a>
 <a class="link" href="none.html#fusion.algorithm.query.functions.none.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/none.hpp>
#include <boost/fusion/include/none.hpp>
</pre>
<a name="fusion.algorithm.query.functions.none.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id548090"></a>
- Example
-=======
-<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 name="id756343"></a>
 <a class="link" href="none.html#fusion.algorithm.query.functions.none.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">struct odd
{
@@ -307,8 +157,8 @@
 }
};
...
-assert(none(make_vector(2,4), odd()));
-assert(!none(make_vector(1,2), odd()));
+assert(<a class="link" href="none.html" title="none"><code class="computeroutput">none</code></a>(<a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(2,4), odd()));
+assert(!<a class="link" href="none.html" title="none"><code class="computeroutput">none</code></a>(<a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(1,2), odd()));
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="functions/count_if.html" title="count_if">
<link rel="next" href="metafunctions/any.html" title="any">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="functions/count_if.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../query.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="metafunctions/any.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.query.metafunctions"></a>Metafunctions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Metafunctions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.query.metafunctions"></a><a class="link" href="metafunctions.html" title="Metafunctions">Metafunctions</a>
+</h4></div></div></div>
<div class="toc"><dl>
<dt>any</dt>
<dt>all</dt>
@@ -45,7 +38,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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="any.html" title="any">
<link rel="next" href="none.html" title="none">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
<div class="spirit-nav">
<a accesskey="p" href="any.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="none.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.all"></a>all
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="all">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.all"></a><a class="link" href="all.html" title="all">all</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.metafunctions.all.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553205"></a>
- Description
-=======
-<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 name="id761172"></a>
 <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- A metafunction returning the result type of all.
+ A metafunction returning the result type of <a class="link" href="../functions/all.html" title="all"><code class="computeroutput">all</code></a>.
 
<a name="fusion.algorithm.query.metafunctions.all.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553252"></a>
- Synopsis
-=======
-<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 name="id761200"></a>
 <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -108,164 +47,98 @@
};
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553371"></a>Table 1.47. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id805743"></a>Table 1.47. Parameters
-=======
-<a name="id767491"></a>Table 1.51. Parameters
-=======
-<a name="id759867"></a>Table 1.51. Parameters
-=======
-<a name="id783546"></a>Table 1.51. Parameters
-=======
-<a name="id771117"></a>Table 1.51. Parameters
-=======
-<a name="id767840"></a>Table 1.51. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761286"></a>Table 1.51. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">Sequence</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">Sequence</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">F</tt>
- </td>
-<td>
- A model of unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
- Object">Polymorphic
+<td>
+ 
+ <code class="computeroutput">F</code>
+ 
+ </td>
+<td>
+ 
+ A model of unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
 Function Object</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.metafunctions.all.expression_semantics"></a><h6>
-<a name="id767961"></a>
+<a name="id761408"></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<Sequence, F>::type
+<pre class="programlisting"><a class="link" href="all.html" title="all"><code class="computeroutput">result_of::all</code></a><Sequence, F>::type
</pre>

- Return type: <tt class="computeroutput">bool</tt>.
+ Return type: <code class="computeroutput">bool</code>.
 

- Semantics: Returns the return type of
- all
- given a sequence of type <tt class="computeroutput">Sequence</tt>
- and a unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
- Object">Polymorphic
- Function Object</a> of type <tt class="computeroutput">F</tt>.
- The return type is always <tt class="computeroutput">bool</tt>.
+ Semantics: Returns the return type of
+ <a class="link" href="../functions/all.html" title="all"><code class="computeroutput">all</code></a>
+ given a sequence of type <code class="computeroutput">Sequence</code>
+ and a unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
+ Function Object</a> of type <code class="computeroutput">F</code>.
+ The return type is always <code class="computeroutput">bool</code>.
 
<a name="fusion.algorithm.query.metafunctions.all.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553703"></a>
- Complexity
-=======
-<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 name="id761526"></a>
 <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant.
 
<a name="fusion.algorithm.query.metafunctions.all.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553731"></a>
- Header
-=======
-<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 name="id761543"></a>
 <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/all.hpp>
#include <boost/fusion/include/all.hpp>

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="../metafunctions.html" title="Metafunctions">
<link rel="next" href="all.html" title="all">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
<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="all.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.any"></a>any
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="any">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.any"></a><a class="link" href="any.html" title="any">any</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.metafunctions.any.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552495"></a>
- Description
-=======
-<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 name="id760676"></a>
 <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- A metafunction returning the result type of any.
+ A metafunction returning the result type of <a class="link" href="../functions/any.html" title="any"><code class="computeroutput">any</code></a>.
 
<a name="fusion.algorithm.query.metafunctions.any.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552542"></a>
- Synopsis
-=======
-<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 name="id760703"></a>
 <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -108,164 +47,98 @@
};
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552661"></a>Table 1.46. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id805247"></a>Table 1.46. Parameters
-=======
-<a name="id766994"></a>Table 1.50. Parameters
-=======
-<a name="id759370"></a>Table 1.50. Parameters
-=======
-<a name="id783049"></a>Table 1.50. Parameters
-=======
-<a name="id770620"></a>Table 1.50. Parameters
-=======
-<a name="id767343"></a>Table 1.50. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id760790"></a>Table 1.50. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">Sequence</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">Sequence</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">F</tt>
- </td>
-<td>
- A model of unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
- Object">Polymorphic
+<td>
+ 
+ <code class="computeroutput">F</code>
+ 
+ </td>
+<td>
+ 
+ A model of unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
 Function Object</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.metafunctions.any.expression_semantics"></a><h6>
-<a name="id767464"></a>
+<a name="id760911"></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<Sequence, F>::type
+<pre class="programlisting"><a class="link" href="any.html" title="any"><code class="computeroutput">result_of::any</code></a><Sequence, F>::type
</pre>

- Return type: <tt class="computeroutput">bool</tt>.
+ Return type: <code class="computeroutput">bool</code>.
 

- Semantics: Returns the return type of
- any
- given a sequence of type <tt class="computeroutput">Sequence</tt>
- and a unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
- Object">Polymorphic
- Function Object</a> of type <tt class="computeroutput">F</tt>.
- The return type is always <tt class="computeroutput">bool</tt>.
+ Semantics: Returns the return type of
+ <a class="link" href="../functions/any.html" title="any"><code class="computeroutput">any</code></a>
+ given a sequence of type <code class="computeroutput">Sequence</code>
+ and a unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
+ Function Object</a> of type <code class="computeroutput">F</code>.
+ The return type is always <code class="computeroutput">bool</code>.
 
<a name="fusion.algorithm.query.metafunctions.any.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552995"></a>
- Complexity
-=======
-<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 name="id761030"></a>
 <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant.
 
<a name="fusion.algorithm.query.metafunctions.any.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553022"></a>
- Header
-=======
-<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 name="id761046"></a>
 <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/any.hpp>
#include <boost/fusion/include/any.hpp>

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="find_if.html" title="find_if">
<link rel="next" href="count_if.html" title="count_if">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
<div class="spirit-nav">
<a accesskey="p" href="find_if.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="count_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.count"></a>count
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="count">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.count"></a><a class="link" href="count.html" title="count">count</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.metafunctions.count.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556161"></a>
- Description
-=======
-<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 name="id763247"></a>
 <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- A metafunction that returns the result type of <tt class="computeroutput">count</tt>
+ A metafunction that returns the result type of <code class="computeroutput">count</code>
 given the sequence and search types.
 
<a name="fusion.algorithm.query.metafunctions.count.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556202"></a>
- Synopsis
-=======
-<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 name="id763273"></a>
 <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -109,158 +48,94 @@
};
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556320"></a>Table 1.51. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id808494"></a>Table 1.51. Parameters
-=======
-<a name="id770929"></a>Table 1.55. Parameters
-=======
-<a name="id763305"></a>Table 1.55. Parameters
-=======
-<a name="id785892"></a>Table 1.55. Parameters
-=======
-<a name="id773190"></a>Table 1.55. Parameters
-=======
-<a name="id769913"></a>Table 1.55. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763359"></a>Table 1.55. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 heading Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">Sequence</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">Sequence</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">T</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">T</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.metafunctions.count.expression_semantics"></a><h6>
-<a name="id770029"></a>
+<a name="id763476"></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<T>::type
+<pre class="programlisting"><a class="link" href="count.html" title="count"><code class="computeroutput">result_of::count</code></a><T>::type
</pre>

- Return type: <tt class="computeroutput">int</tt>.
+ Return type: <code class="computeroutput">int</code>.
 

- Semantics: Returns the return type of
- count. The return type is always
- <tt class="computeroutput">int</tt>.
+ Semantics: Returns the return type of
+ <a class="link" href="../functions/count.html" title="count"><code class="computeroutput">count</code></a>. The return type is always
+ <code class="computeroutput">int</code>.
 
<a name="fusion.algorithm.query.metafunctions.count.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556600"></a>
- Complexity
-=======
-<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 name="id763567"></a>
 <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant.
 
<a name="fusion.algorithm.query.metafunctions.count.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556627"></a>
- Header
-=======
-<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 name="id763584"></a>
 <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/count.hpp>
#include <boost/fusion/include/count.hpp>

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="count.html" title="count">
<link rel="next" href="../../transformation.html" title="Transformation">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
<div class="spirit-nav">
<a accesskey="p" href="count.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="../../transformation.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.count_if"></a>count_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="count_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.count_if"></a><a class="link" href="count_if.html" title="count_if">count_if</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.metafunctions.count_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556811"></a>
- Description
-=======
-<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 name="id763712"></a>
 <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- A metafunction that returns the result type of <tt class="computeroutput">count_if</tt>
+ A metafunction that returns the result type of <code class="computeroutput">count_if</code>
 given the sequence and predicate types.
 
<a name="fusion.algorithm.query.metafunctions.count_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556853"></a>
- Synopsis
-=======
-<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 name="id763741"></a>
 <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -109,158 +48,94 @@
};
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556972"></a>Table 1.52. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id808962"></a>Table 1.52. Parameters
-=======
-<a name="id771397"></a>Table 1.56. Parameters
-=======
-<a name="id763773"></a>Table 1.56. Parameters
-=======
-<a name="id786360"></a>Table 1.56. Parameters
-=======
-<a name="id773658"></a>Table 1.56. Parameters
-=======
-<a name="id770381"></a>Table 1.56. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763827"></a>Table 1.56. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">Sequence</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">Sequence</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">Pred</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">Pred</code>
+ 
+ </td>
+<td>
+ 
 A unary function object
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.metafunctions.count_if.expression_semantics"></a><h6>
-<a name="id772954"></a>
+<a name="id766401"></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<Sequence, Pred>::type
+<pre class="programlisting"><a class="link" href="count_if.html" title="count_if"><code class="computeroutput">result_of::count_if</code></a><Sequence, Pred>::type
</pre>

- Return type: <tt class="computeroutput">int</tt>.
+ Return type: <code class="computeroutput">int</code>.
 

- Semantics: Returns the return type of
- count_if. The return type is
- always <tt class="computeroutput">int</tt>.
+ Semantics: Returns the return type of
+ <a class="link" href="../functions/count_if.html" title="count_if"><code class="computeroutput">count_if</code></a>. The return type is
+ always <code class="computeroutput">int</code>.
 
<a name="fusion.algorithm.query.metafunctions.count_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id557263"></a>
- Complexity
-=======
-<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 name="id766500"></a>
 <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant.
 
<a name="fusion.algorithm.query.metafunctions.count_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id557290"></a>
- Header
-=======
-<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 name="id766520"></a>
 <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/count_if.hpp>
#include <boost/fusion/include/count_if.hpp>

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="none.html" title="none">
<link rel="next" href="find_if.html" title="find_if">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,79 +22,21 @@
<div class="spirit-nav">
<a accesskey="p" href="none.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="find_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.find"></a>find
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="find">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.find"></a><a class="link" href="find.html" title="find">find</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.metafunctions.find.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554625"></a>
- Description
-=======
-<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 name="id762167"></a>
 <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

-<<<<<<< .working
- Returns the result type of <tt class="computeroutput">find</tt>,
- given the sequence and search types.
-=======
 Returns the result type of <a class="link" href="../functions/find.html" title="find"><code class="computeroutput">find</code></a>, given the sequence and
 search types.
->>>>>>> .merge-right.r57242
 
<a name="fusion.algorithm.query.metafunctions.find.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554666"></a>
- Synopsis
-=======
-<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 name="id762194"></a>
 <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -114,160 +48,96 @@
};
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554782"></a>Table 1.49. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id807417"></a>Table 1.49. Parameters
-=======
-<a name="id769849"></a>Table 1.53. Parameters
-=======
-<a name="id762225"></a>Table 1.53. Parameters
-=======
-<a name="id784812"></a>Table 1.53. Parameters
-=======
-<a name="id772110"></a>Table 1.53. Parameters
-=======
-<a name="id768833"></a>Table 1.53. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762279"></a>Table 1.53. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">Sequence</tt>
- </td>
-<td>
- Model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">Sequence</code>
+ 
+ </td>
+<td>
+ 
+ Model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">T</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">T</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.metafunctions.find.expression_semantics"></a><h6>
-<a name="id768949"></a>
+<a name="id762396"></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<Sequence, T>::type
+<pre class="programlisting"><a class="link" href="find.html" title="find"><code class="computeroutput">result_of::find</code></a><Sequence, T>::type
</pre>

- Return type: A model of the same iterator
- category as the iterators of <tt class="computeroutput">Sequence</tt>.
+ Return type: A model of the same iterator
+ category as the iterators of <code class="computeroutput">Sequence</code>.
 

- Semantics: Returns an iterator to the
- first element of type <tt class="computeroutput">T</tt>
- in <tt class="computeroutput">Sequence</tt>, or <tt class="computeroutput">result_of::end<Sequence>::type</tt>
+ Semantics: Returns an iterator to the
+ first element of type <code class="computeroutput">T</code>
+ in <code class="computeroutput">Sequence</code>, or <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/end.html" title="end"><code class="computeroutput">result_of::end</code></a><Sequence>::type</code>
 if there is no such element.
 
<a name="fusion.algorithm.query.metafunctions.find.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555121"></a>
- Complexity
-=======
-<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 name="id762528"></a>
 <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear, at most <tt class="computeroutput">result_of::size<Sequence>::value</tt> comparisons.
+ Linear, at most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> comparisons.
 
<a name="fusion.algorithm.query.metafunctions.find.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555202"></a>
- Header
-=======
-<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 name="id762578"></a>
 <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/find.hpp>
#include <boost/fusion/include/find.hpp>

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="find.html" title="find">
<link rel="next" href="count.html" title="count">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,79 +22,21 @@
<div class="spirit-nav">
<a accesskey="p" href="find.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="count.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.find_if"></a>find_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="find_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.find_if"></a><a class="link" href="find_if.html" title="find_if">find_if</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.metafunctions.find_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555388"></a>
- Description
-=======
-<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 name="id762707"></a>
 <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

-<<<<<<< .working
- Returns the result type of <tt class="computeroutput">find_if</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">find_if</code></a> given the sequence and
 predicate types.
->>>>>>> .merge-right.r57242
 
<a name="fusion.algorithm.query.metafunctions.find_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555430"></a>
- Synopsis
-=======
-<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 name="id762737"></a>
 <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -114,161 +48,97 @@
};
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555547"></a>Table 1.50. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id807957"></a>Table 1.50. Parameters
-=======
-<a name="id770392"></a>Table 1.54. Parameters
-=======
-<a name="id762767"></a>Table 1.54. Parameters
-=======
-<a name="id785354"></a>Table 1.54. Parameters
-=======
-<a name="id772652"></a>Table 1.54. Parameters
-=======
-<a name="id769375"></a>Table 1.54. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762822"></a>Table 1.54. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">Sequence</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">Sequence</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">Pred</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">Pred</code>
+ 
+ </td>
+<td>
+ 
 A model of <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
 Lambda Expression</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's arguments
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.metafunctions.find_if.expression_semantics"></a><h6>
-<a name="id769494"></a>
+<a name="id762941"></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<Sequence, Pred>::type
+<pre class="programlisting"><a class="link" href="find_if.html" title="find_if"><code class="computeroutput">result_of::find_if</code></a><Sequence, Pred>::type
</pre>

- Return type: A model of the same iterator
- category as the iterators of <tt class="computeroutput">Sequence</tt>.
+ Return type: A model of the same iterator
+ category as the iterators of <code class="computeroutput">Sequence</code>.
 

- Semantics: Returns an iterator to the
- first element in <tt class="computeroutput">Sequence</tt>
- for which <tt class="computeroutput">Pred</tt> evaluates
- to true. Returns <tt class="computeroutput">result_of::end<Sequence>::type</tt> if there is no such element.
+ Semantics: Returns an iterator to the
+ first element in <code class="computeroutput">Sequence</code>
+ for which <code class="computeroutput">Pred</code> evaluates
+ to true. Returns <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/end.html" title="end"><code class="computeroutput">result_of::end</code></a><Sequence>::type</code> if there is no such element.
 
<a name="fusion.algorithm.query.metafunctions.find_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555896"></a>
- Complexity
-=======
-<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 name="id763070"></a>
 <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

- Linear. At most <tt class="computeroutput">result_of::size<Sequence>::value</tt> comparisons.
+ Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput">result_of::size</code></a><Sequence>::value</code> comparisons.
 
<a name="fusion.algorithm.query.metafunctions.find_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555976"></a>
- Header
-=======
-<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 name="id763121"></a>
 <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/find_if.hpp>
#include <boost/fusion/include/find_if.hpp>

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="all.html" title="all">
<link rel="next" href="find.html" title="find">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
<div class="spirit-nav">
<a accesskey="p" href="all.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="find.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.none"></a>none
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="none">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.none"></a><a class="link" href="none.html" title="none">none</a>
+</h5></div></div></div>
<a name="fusion.algorithm.query.metafunctions.none.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553914"></a>
- Description
-=======
-<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 name="id761669"></a>
 <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- A metafunction returning the result type of none.
+ A metafunction returning the result type of <a class="link" href="../functions/none.html" title="none"><code class="computeroutput">none</code></a>.
 
<a name="fusion.algorithm.query.metafunctions.none.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553961"></a>
- Synopsis
-=======
-<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 name="id761697"></a>
 <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -108,164 +47,98 @@
};
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554080"></a>Table 1.48. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id806240"></a>Table 1.48. Parameters
-=======
-<a name="id767988"></a>Table 1.52. Parameters
-=======
-<a name="id760363"></a>Table 1.52. Parameters
-=======
-<a name="id784043"></a>Table 1.52. Parameters
-=======
-<a name="id771614"></a>Table 1.52. Parameters
-=======
-<a name="id768337"></a>Table 1.52. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761784"></a>Table 1.52. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">Sequence</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">Sequence</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">F</tt>
- </td>
-<td>
- A model of unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
- Object">Polymorphic
+<td>
+ 
+ <code class="computeroutput">F</code>
+ 
+ </td>
+<td>
+ 
+ A model of unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
 Function Object</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.query.metafunctions.none.expression_semantics"></a><h6>
-<a name="id768459"></a>
+<a name="id761905"></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<Sequence, F>::type
+<pre class="programlisting"><a class="link" href="none.html" title="none"><code class="computeroutput">result_of::none</code></a><Sequence, F>::type
</pre>

- Return type: <tt class="computeroutput">bool</tt>.
+ Return type: <code class="computeroutput">bool</code>.
 

- Semantics: Returns the return type of
- none
- given a sequence of type <tt class="computeroutput">Sequence</tt>
- and a unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
- Object">Polymorphic
- Function Object</a> of type <tt class="computeroutput">F</tt>.
- The return type is always <tt class="computeroutput">bool</tt>.
+ Semantics: Returns the return type of
+ <a class="link" href="../functions/none.html" title="none"><code class="computeroutput">none</code></a>
+ given a sequence of type <code class="computeroutput">Sequence</code>
+ and a unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
+ Function Object</a> of type <code class="computeroutput">F</code>.
+ The return type is always <code class="computeroutput">bool</code>.
 
<a name="fusion.algorithm.query.metafunctions.none.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554410"></a>
- Complexity
-=======
-<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 name="id762024"></a>
 <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant.
 
<a name="fusion.algorithm.query.metafunctions.none.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554438"></a>
- Header
-=======
-<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 name="id762041"></a>
 <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/query/none.hpp>
#include <boost/fusion/include/none.hpp>

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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="query/metafunctions/count_if.html" title="count_if">
<link rel="next" href="transformation/functions.html" title="Functions">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="query/metafunctions/count_if.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../algorithm.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="transformation/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.algorithm.transformation"></a>Transformation
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Transformation">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.algorithm.transformation"></a><a class="link" href="transformation.html" title="Transformation">Transformation</a>
+</h3></div></div></div>
<div class="toc"><dl>
<dt>Functions</dt>
<dt>Metafunctions</dt>
@@ -42,35 +35,28 @@
 by performing some sort of transformation. In reality the new sequences are
 views onto the data in the original sequences.
 
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
<th align="left">Note</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
+<tr><td align="left" valign="top">
 As the transformation algorithms return views onto their input arguments,
 it is important that the lifetime of the input arguments is greater than
 the period during which you wish to use the results.
 </td></tr>
</table></div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.header"></a><h4>
-<a name="id557497"></a>
- Header
- </h4>
-=======
<a name="fusion.algorithm.transformation.header"></a><h5>
-<a name="id764147"></a>
+<a name="id766659"></a>
 <a class="link" href="transformation.html#fusion.algorithm.transformation.header">Header</a>
 </h5>
->>>>>>> .merge-right.r57125
<pre class="programlisting">#include <boost/fusion/algorithm/transformation.hpp>
#include <boost/fusion/include/transformation.hpp>
</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
 Distributed under the 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.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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
<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>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="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">
+<link rel="prev" href="../transformation.html" title="Transformation">
<link rel="next" href="functions/filter.html" title="filter">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="../transformation.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../transformation.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/filter.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.transformation.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.transformation.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
<div class="toc"><dl>
<dt>filter</dt>
<dt>filter_if</dt>
@@ -57,7 +50,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
 Distributed under the 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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="reverse.html" title="reverse">
<link rel="next" href="erase.html" title="erase">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,254 +22,105 @@
<div class="spirit-nav">
<a accesskey="p" href="reverse.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="erase.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.clear"></a>clear
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="clear">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.clear"></a><a class="link" href="clear.html" title="clear">clear</a>
+</h5></div></div></div>
<a name="fusion.algorithm.transformation.functions.clear.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id566884"></a>
- Description
-=======
-<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 name="id775681"></a>
 <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- clear returns an empty sequence.
+ <a class="link" href="clear.html" title="clear"><code class="computeroutput">clear</code></a> returns an empty sequence.
 
<a name="fusion.algorithm.transformation.functions.clear.synposis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id566931"></a>
- Synposis
-=======
-<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 name="id775712"></a>
 <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.synposis">Synposis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence
 >
-typename result_of::clear<Sequence const>::type clear(Sequence const& seq);
+typename <a class="link" href="../metafunctions/clear.html" title="clear"><code class="computeroutput">result_of::clear</code></a><Sequence const>::type clear(Sequence const& seq);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567084"></a>Table 1.62. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id819218"></a>Table 1.62. Parameters
-=======
-<a name="id780972"></a>Table 1.66. Parameters
-=======
-<a name="id773348"></a>Table 1.66. Parameters
-=======
-<a name="id796988"></a>Table 1.66. Parameters
-=======
-<a name="id785651"></a>Table 1.66. Parameters
-=======
-<a name="id782374"></a>Table 1.66. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775820"></a>Table 1.66. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody><tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr></tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.transformation.functions.clear.expression_semantics"></a><h6>
-<a name="id782457"></a>
+<a name="id775903"></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(seq);
+<pre class="programlisting"><a class="link" href="clear.html" title="clear"><code class="computeroutput">clear</code></a>(seq);
</pre>

- Return type: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+ Return type: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>.
 

- Expression Semantics: Returns a sequence
+ Expression Semantics: Returns a sequence
 with no elements.
 
<a name="fusion.algorithm.transformation.functions.clear.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567282"></a>
- Complexity
-=======
-<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 name="id775966"></a>
 <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant.
 
<a name="fusion.algorithm.transformation.functions.clear.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567311"></a>
- Header
-=======
-<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 name="id775985"></a>
 <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/transformation/clear.hpp>
#include <boost/fusion/include/clear.hpp>
</pre>
<a name="fusion.algorithm.transformation.functions.clear.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567478"></a>
- Example
-=======
-<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 name="id776100"></a>
 <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
-<pre class="programlisting">assert(clear(make_vector(1,2,3)) == make_vector());
+<pre class="programlisting">assert(<a class="link" href="clear.html" title="clear"><code class="computeroutput">clear</code></a>(<a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(1,2,3)) == <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>());
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="clear.html" title="clear">
<link rel="next" href="erase_key.html" title="erase_key">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,80 +22,27 @@
<div class="spirit-nav">
<a accesskey="p" href="clear.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="erase_key.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.erase"></a>erase
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="erase">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.erase"></a><a class="link" href="erase.html" title="erase">erase</a>
+</h5></div></div></div>
<a name="fusion.algorithm.transformation.functions.erase.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567635"></a>
- Description
-=======
-<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 name="id776202"></a>
 <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

 Returns a new sequence, containing all the elements of the original except
 those at a specified iterator, or between two iterators.
 
<a name="fusion.algorithm.transformation.functions.erase.synposis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567666"></a>
- Synposis
-=======
-<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 name="id776224"></a>
 <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.synposis">Synposis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
 typename First
 >
-typename result_of::erase<Sequence const, First>::type erase(
+typename <a class="link" href="../metafunctions/erase.html" title="erase"><code class="computeroutput">result_of::erase</code></a><Sequence const, First>::type erase(
 Sequence const& seq, First const& it1);

template<
@@ -111,118 +50,102 @@
 typename First,
 typename Last
 >
-typename result_of::erase<Sequence const, First, Last>::type erase(
+typename <a class="link" href="../metafunctions/erase.html" title="erase"><code class="computeroutput">result_of::erase</code></a><Sequence const, First, Last>::type erase(
 Sequence const& seq, First const& it1, Last const& it2);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id568124"></a>Table 1.63. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id819954"></a>Table 1.63. Parameters
-=======
-<a name="id781708"></a>Table 1.67. Parameters
-=======
-<a name="id774083"></a>Table 1.67. Parameters
-=======
-<a name="id797723"></a>Table 1.67. Parameters
-=======
-<a name="id786386"></a>Table 1.67. Parameters
-=======
-<a name="id783110"></a>Table 1.67. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id776556"></a>Table 1.67. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameters
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">it1</tt>
- </td>
-<td>
- A model of <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
- Iterator">Forward
+<td>
+ 
+ <code class="computeroutput">it1</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
 Iterator</a>
- </td>
-<td>
- Iterator into <tt class="computeroutput">seq</tt>
- </td>
+ 
+ </td>
+<td>
+ 
+ Iterator into <code class="computeroutput">seq</code>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">it2</tt>
- </td>
-<td>
- A model of <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
- Iterator">Forward
+<td>
+ 
+ <code class="computeroutput">it2</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
 Iterator</a>
- </td>
-<td>
- Iterator into <tt class="computeroutput">seq</tt>
- after <tt class="computeroutput">it1</tt>
- </td>
+ 
+ </td>
+<td>
+ 
+ Iterator into <code class="computeroutput">seq</code>
+ after <code class="computeroutput">it1</code>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.transformation.functions.erase.expression_semantics"></a><h6>
-<a name="id783284"></a>
+<a name="id776730"></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(seq, pos);
+<pre class="programlisting"><a class="link" href="erase.html" title="erase"><code class="computeroutput">erase</code></a>(seq, pos);
</pre>

-<<<<<<< .working
- Return type: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>.
-=======
 Return type:
->>>>>>> .merge-right.r57242
 
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
@@ -237,20 +160,14 @@
 </li>
</ul></div>

- Semantics: Returns a new sequence, containing
- all the elements of <tt class="computeroutput">seq</tt>
- except the element at <tt class="computeroutput">pos</tt>.
+ Semantics: Returns a new sequence, containing
+ all the elements of <code class="computeroutput">seq</code>
+ except the element at <code class="computeroutput">pos</code>.
 
-<pre class="programlisting">erase(seq, first, last);
+<pre class="programlisting"><a class="link" href="erase.html" title="erase"><code class="computeroutput">erase</code></a>(seq, first, last);
</pre>

-<<<<<<< .working
- Return type: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>.
-=======
 Return type:
->>>>>>> .merge-right.r57242
 
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
@@ -265,106 +182,31 @@
 </li>
</ul></div>

- Semantics: Returns a new sequence, with
- all the elements of <tt class="computeroutput">seq</tt>,
- in their original order, except those in the range [<tt class="computeroutput">first</tt>,<tt class="computeroutput">last</tt>).
+ Semantics: Returns a new sequence, with
+ all the elements of <code class="computeroutput">seq</code>,
+ in their original order, except those in the range [<code class="computeroutput">first</code>,<code class="computeroutput">last</code>).
 
<a name="fusion.algorithm.transformation.functions.erase.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id568605"></a>
- Complexity
-=======
-<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 name="id776954"></a>
 <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant. Returns a view which is lazily evaluated.
 
<a name="fusion.algorithm.transformation.functions.erase.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id568633"></a>
- Header
-=======
-<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 name="id776974"></a>
 <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/transformation/erase.hpp>
#include <boost/fusion/include/erase.hpp>
</pre>
<a name="fusion.algorithm.transformation.functions.erase.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id568800"></a>
- Example
-=======
-<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 name="id777089"></a>
 <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
-<pre class="programlisting">const vector<int, double, char> vec(1, 2.0, 'c');
-assert(erase(vec, next(begin(vec))) == make_vector(1, 'c'));
-assert(erase(vec, next(begin(vec)), end(vec)) == <a href="../../../container/generation/functions/make_vector.html" title="
make_vector"><tt class="computeroutput">make_vector</tt></a>(1));
+<pre class="programlisting">const <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput">vector</code></a><int, double, char> vec(1, 2.0, 'c');
+assert(<a class="link" href="erase.html" title="erase"><code class="computeroutput">erase</code></a>(vec, <a class="link" href="../../../iterator/functions/next.html" title="next"><code class="computeroutput">next</code></a>(<a class="link" href="../../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput">begin</code></a>(vec))) == <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(1, 'c'));
+assert(<a class="link" href="erase.html" title="erase"><code class="computeroutput">erase</code></a>(vec, <a class="link" href="../../../iterator/functions/next.html" title="next"><code class="computeroutput">next</code></a>(<a class="link" href="../../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput">begin</code></a>(vec)), <a class="link" href="../../../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput">end</code></a>(vec)) == <a cla
ss="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(1));
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="erase.html" title="erase">
<link rel="next" href="insert.html" title="insert">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,88 +22,25 @@
<div class="spirit-nav">
<a accesskey="p" href="erase.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="insert.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.erase_key"></a>erase_key
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="erase_key">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.erase_key"></a><a class="link" href="erase_key.html" title="erase_key">erase_key</a>
+</h5></div></div></div>
<a name="fusion.algorithm.transformation.functions.erase_key.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569251"></a>
- Description
-=======
-<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 name="id777461"></a>
 <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

-<<<<<<< .working
- For an <a href="../../../sequence/concepts/associative_sequence.html" title="Associative
- Sequence">Associative
- Sequence</a> <tt class="computeroutput">seq</tt>,
- returns a <a 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.
-=======
 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">seq</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
 
<a name="fusion.algorithm.transformation.functions.erase_key.synposis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569311"></a>
- Synposis
-=======
-<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 name="id777509"></a>
 <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.synposis">Synposis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Key,
@@ -120,59 +49,32 @@
typename <a class="link" href="../metafunctions/erase_key.html" title="erase_key"><code class="computeroutput">result_of::erase_key</code></a><Sequence const, Key>::type erase_key(Sequence const& seq);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569481"></a>Table 1.64. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id820898"></a>Table 1.64. Parameters
-=======
-<a name="id783814"></a>Table 1.68. Parameters
-=======
-<a name="id776190"></a>Table 1.68. Parameters
-=======
-<a name="id798806"></a>Table 1.68. Parameters
-=======
-<a name="id787469"></a>Table 1.68. Parameters
-=======
-<a name="id784192"></a>Table 1.68. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id777639"></a>Table 1.68. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<<<<<<< .working
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/associative_sequence.html" title="Associative
- Sequence">Associative
-=======
<td>
 
 <code class="computeroutput">seq</code>
@@ -182,145 +84,71 @@
 
 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>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">Key</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">Key</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Key to erase
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.transformation.functions.erase_key.expression_semantics"></a><h6>
-<a name="id784310"></a>
+<a name="id777756"></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<Key>(seq);
+<pre class="programlisting"><a class="link" href="erase_key.html" title="erase_key"><code class="computeroutput">erase_key</code></a><Key>(seq);
</pre>

- Return type: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+ Return type: 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
 Sequence</a>.
 

- Semantics: Returns a new sequence, containing
- all the elements of <tt class="computeroutput">seq</tt>,
- except those with key <tt class="computeroutput">Key</tt>.
+ Semantics: Returns a new sequence, containing
+ all the elements of <code class="computeroutput">seq</code>,
+ except those with key <code class="computeroutput">Key</code>.
 
<a name="fusion.algorithm.transformation.functions.erase_key.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569749"></a>
- Complexity
-=======
-<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 name="id777844"></a>
 <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant. Returns a view which is lazily evaluated.
 
<a name="fusion.algorithm.transformation.functions.erase_key.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569777"></a>
- Header
-=======
-<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 name="id777866"></a>
 <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/transformation/erase_key.hpp>
#include <boost/fusion/include/erase_key.hpp>
</pre>
<a name="fusion.algorithm.transformation.functions.erase_key.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569944"></a>
- Example
-=======
-<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 name="id777986"></a>
 <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
-<pre class="programlisting">assert(erase_key<int>(make_map<int, long>('a', 'b')) == make_map<long>('b'));
+<pre class="programlisting">assert(<a class="link" href="erase_key.html" title="erase_key"><code class="computeroutput">erase_key</code></a><int>(<a class="link" href="../../../container/generation/functions/make_map.html" title="make_map"><code class="computeroutput">make_map</code></a><int, long>('a', 'b')) == <a class="link" href="../../../container/generation/functions/make_map.html" title="make_map"><code class="computeroutput">make_map</code></a><
long>('b'));
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="../functions.html" title="Functions">
<link rel="next" href="filter_if.html" title="filter_if">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,174 +22,101 @@
<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="filter_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.filter"></a>filter
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="filter">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.filter"></a><a class="link" href="filter.html" title="filter">filter</a>
+</h5></div></div></div>
<a name="fusion.algorithm.transformation.functions.filter.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id557690"></a>
- Description
-=======
-<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 name="id766788"></a>
 <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

 For a given sequence, filter returns a new sequences containing only
 the elements of a specified type.
 
<a name="fusion.algorithm.transformation.functions.filter.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id557721"></a>
- Synopsis
-=======
-<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 name="id766810"></a>
 <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename T,
 typename Sequence
 >
-typename result_of::filter<Sequence const, T>::type filter(Sequence const& seq);
+typename <a class="link" href="../metafunctions/filter.html" title="filter"><code class="computeroutput">result_of::filter</code></a><Sequence const, T>::type filter(Sequence const& seq);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id557902"></a>Table 1.53. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id811255"></a>Table 1.53. Parameters
-=======
-<a name="id772052"></a>Table 1.57. Parameters
-=======
-<a name="id764427"></a>Table 1.57. Parameters
-=======
-<a name="id788107"></a>Table 1.57. Parameters
-=======
-<a name="id776770"></a>Table 1.57. Parameters
-=======
-<a name="id773493"></a>Table 1.57. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id766940"></a>Table 1.57. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">T</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">T</code>
+ 
+ </td>
+<td>
+ 
 Any type
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The type to retain
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.transformation.functions.filter.expression_semantics"></a><h6>
-<a name="id773606"></a>
+<a name="id767052"></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<T>(seq);
+<pre class="programlisting"><a class="link" href="filter.html" title="filter"><code class="computeroutput">filter</code></a><T>(seq);
</pre>

-<<<<<<< .working
- Return type: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>.
-=======
 Return type:
->>>>>>> .merge-right.r57242
 
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
@@ -212,106 +131,31 @@
 </li>
</ul></div>

- Semantics: Returns a sequence containing
- all the elements of <tt class="computeroutput">seq</tt>
- of type <tt class="computeroutput">T</tt>. Equivalent
- to <tt class="computeroutput">filter_if<boost::same_type<_, T> >(seq)</tt>.
+ Semantics: Returns a sequence containing
+ all the elements of <code class="computeroutput">seq</code>
+ of type <code class="computeroutput">T</code>. Equivalent
+ to <code class="computeroutput"><a class="link" href="filter_if.html" title="filter_if"><code class="computeroutput">filter_if</code></a><boost::same_type<_, T> >(seq)</code>.
 
<a name="fusion.algorithm.transformation.functions.filter.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558250"></a>
- Complexity
-=======
-<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 name="id767220"></a>
 <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant. Returns a view which is lazily evaluated.
 
<a name="fusion.algorithm.transformation.functions.filter.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558280"></a>
- Header
-=======
-<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 name="id767240"></a>
 <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/transformation/filter.hpp>
#include <boost/fusion/include/filter.hpp>
</pre>
<a name="fusion.algorithm.transformation.functions.filter.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558447"></a>
- Example
-=======
-<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 name="id767357"></a>
 <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
-<pre class="programlisting">const vector<int,int,long,long> vec(1,2,3,4);
-assert(filter<int>(vec) == make_vector(1,2));
+<pre class="programlisting">const <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput">vector</code></a><int,int,long,long> vec(1,2,3,4);
+assert(<a class="link" href="filter.html" title="filter"><code class="computeroutput">filter</code></a><int>(vec) == <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(1,2));
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="filter.html" title="filter">
<link rel="next" href="transform.html" title="transform">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,176 +22,103 @@
<div class="spirit-nav">
<a accesskey="p" href="filter.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="transform.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.filter_if"></a>filter_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="filter_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.filter_if"></a><a class="link" href="filter_if.html" title="filter_if">filter_if</a>
+</h5></div></div></div>
<a name="fusion.algorithm.transformation.functions.filter_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558709"></a>
- Description
-=======
-<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 name="id767541"></a>
 <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

- For a given sequence, filter_if returns a new sequences
+ For a given sequence, <a class="link" href="filter_if.html" title="filter_if"><code class="computeroutput">filter_if</code></a> returns a new sequences
 containing only the elements with types for which a given <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
- Lambda Expression</a> evaluates to <tt class="computeroutput">boost::mpl::true_</tt>.
+ Lambda Expression</a> evaluates to <code class="computeroutput">boost::mpl::true_</code>.
 
<a name="fusion.algorithm.transformation.functions.filter_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558796"></a>
- Synopsis
-=======
-<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 name="id767598"></a>
 <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Pred,
 typename Sequence
 >
-typename result_of::filter_if<Sequence const, Pred>::type filter_if(Sequence const& seq);
+typename <a class="link" href="../metafunctions/filter_if.html" title="filter_if"><code class="computeroutput">result_of::filter_if</code></a><Sequence const, Pred>::type filter_if(Sequence const& seq);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558979"></a>Table 1.54. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id812016"></a>Table 1.54. Parameters
-=======
-<a name="id772840"></a>Table 1.58. Parameters
-=======
-<a name="id765216"></a>Table 1.58. Parameters
-=======
-<a name="id788895"></a>Table 1.58. Parameters
-=======
-<a name="id777558"></a>Table 1.58. Parameters
-=======
-<a name="id774282"></a>Table 1.58. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id767728"></a>Table 1.58. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
- </td>
-<td>
- A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
+<td>
+ 
+ <code class="computeroutput">seq</code>
+ 
+ </td>
+<td>
+ 
+ A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
 Sequence</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 Operation's argument
- </td>
+ 
+ </td>
</tr>
<tr>
-<td>
- <tt class="computeroutput">Pred</tt>
- </td>
-<td>
+<td>
+ 
+ <code class="computeroutput">Pred</code>
+ 
+ </td>
+<td>
+ 
 A unary <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
 Lambda Expression</a>
- </td>
-<td>
+ 
+ </td>
+<td>
+ 
 The predicate to filter by
- </td>
+ 
+ </td>
</tr>
</tbody>
-</table>
+</table></div>
</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
-=======
 <a name="fusion.algorithm.transformation.functions.filter_if.expression_semantics"></a><h6>
-<a name="id774400"></a>
+<a name="id767847"></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<Pred>(seq);
+<pre class="programlisting"><a class="link" href="filter_if.html" title="filter_if"><code class="computeroutput">filter_if</code></a><Pred>(seq);
</pre>

-<<<<<<< .working
- Return type: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
- Sequence">Forward
- Sequence</a>.
-=======
 Return type:
->>>>>>> .merge-right.r57242
 
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
@@ -214,107 +133,32 @@
 </li>
</ul></div>

- Semantics: Returns a sequence containing
- all the elements of <tt class="computeroutput">seq</tt>
- with types for which <tt class="computeroutput">Pred</tt>
- evaluates to <tt class="computeroutput">boost::mpl::true_</tt>. The order of the retained elements
+ Semantics: Returns a sequence containing
+ all the elements of <code class="computeroutput">seq</code>
+ with types for which <code class="computeroutput">Pred</code>
+ evaluates to <code class="computeroutput">boost::mpl::true_</code>. The order of the retained elements
 is the same as in the original sequence.
 
<a name="fusion.algorithm.transformation.functions.filter_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id559288"></a>
- Complexity
-=======
-<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 name="id767979"></a>
 <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
 </h6>

 Constant. Returns a view which is lazily evaluated.
 
<a name="fusion.algorithm.transformation.functions.filter_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id559316"></a>
- Header
-=======
-<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 name="id768000"></a>
 <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.header">Header</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">#include <boost/fusion/algorithm/transformation/filter_if.hpp>
#include <boost/fusion/include/filter_if.hpp>
</pre>
<a name="fusion.algorithm.transformation.functions.filter_if.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id559484"></a>
- Example
-=======
-<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 name="id768120"></a>
 <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.example">Example</a>
->>>>>>> .merge-right.r57125
 </h6>
-<pre class="programlisting">const vector<int,int,double,double> vec(1,2,3.0,4.0);
-assert(filter_if<is_integral<mpl::_> >(vec) == make_vector(1,2));
+<pre class="programlisting">const <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput">vector</code></a><int,int,double,double> vec(1,2,3.0,4.0);
+assert(<a class="link" href="filter_if.html" title="filter_if"><code class="computeroutput">filter_if</code></a><is_integral<mpl::_> >(vec) == <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput">make_vector</code></a>(1,2));
</pre>
</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/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-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
<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="prev" href="erase_key.html" title="erase_key">
<link rel="next" href="insert_range.html" title="insert_range">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
<div class="spirit-nav">
<a accesskey="p" href="erase_key.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="insert_range.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.insert"></a>insert
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="insert">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.insert"></a><a class="link" href="insert.html" title="insert">insert</a>
+</h5></div></div></div>
<a name="fusion.algorithm.transformation.functions.insert.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id570144"></a>
- Description
-=======
-<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 name="id778121"></a>
 <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.description">Description</a>
->>>>>>> .merge-right.r57125
 </h6>

 Returns a new sequence with all the elements of the original, an a new
 element inserted the position described by a given iterator.
 
<a name="fusion.algorithm.transformation.functions.insert.synposis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id570175"></a>
- Synposis
-=======
-<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 name="id778143"></a>
 <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.synposis">Synposis</a>
->>>>>>> .merge-right.r57125
 </h6>
<pre class="programlisting">template<
 typename Sequence,
@@ -108,111 +47,96 @@
 Sequence const& seq, Pos const& pos, T const& t);
</pre>
<div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id570363"></a>Table 1.65. Parameters
-<table class="table" summary="Parameters">
-=======
-<a name="id822626"></a>Table 1.65. Parameters
-=======
-<a name="id784514"></a>Table 1.69. Parameters
-=======
-<a name="id776890"></a>Table 1.69. Parameters
-=======
-<a name="id799506"></a>Table 1.69. Parameters
-=======
-<a name="id788169"></a>Table 1.69. Parameters
-=======
-<a name="id784892"></a>Table 1.69. Parameters
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id778338"></a>Table 1.69. Parameters
<div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
<colgroup>
<col>
<col>
<col>
</colgroup>
<thead><tr>
-<th>
+<th>
+ 
 Parameter
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Requirement
- </th>
-<th>
+ 
+ </th>
+<th>
+ 
 Description
- </th>
+ 
+ </th>
</tr></thead>
<tbody>
<tr>
-<td>
- <tt class="computeroutput">seq</tt>
-