Boost-Commit :

Subject: [Boost-commit] svn:boost r49439 - in branches/proto/v4: . boost boost/accumulators/statistics boost/archive boost/archive/detail boost/archive/impl boost/archive/iterators boost/asio boost/asio/detail boost/asio/ip boost/config/compiler boost/date_time/posix_time boost/detail boost/dynamic_bitset boost/filesystem boost/function boost/functional/detail boost/functional/hash boost/gil boost/graph boost/graph/detail boost/interprocess boost/interprocess/allocators boost/interprocess/allocators/detail boost/interprocess/containers boost/interprocess/containers/detail boost/interprocess/detail boost/interprocess/ipc boost/interprocess/mem_algo boost/interprocess/mem_algo/detail boost/interprocess/smart_ptr boost/interprocess/sync boost/interprocess/sync/emulation boost/interprocess/sync/posix boost/intrusive boost/intrusive/detail boost/iterator boost/iterator/detail boost/math/distributions boost/math/special_functions boost/mpl boost/mpl/aux_ boost/mpl/aux_/config boost/mpl/aux_/preprocessed/bcc boost/mpl/aux_/preprocessed/bcc_pre590 boost/mpl/aux_/preprocessor boost/mpl/aux_/range_c boost/mpl/aux_/test boost/mpl/limits boost/mpl/list boost/mpl/list/aux_ boost/mpl/map boost/mpl/map/aux_ boost/mpl/math boost/mpl/multiset boost/mpl/multiset/aux_ boost/mpl/set boost/mpl/set/aux_ boost/mpl/vector boost/mpl/vector/aux_ boost/numeric/conversion boost/numeric/interval boost/numeric/interval/detail boost/numeric/ublas boost/pending boost/random boost/serialization boost/spirit/home/classic/core boost/spirit/home/classic/core/primitives/impl boost/spirit/home/classic/iterator boost/spirit/home/classic/iterator/impl boost/spirit/home/karma/auxiliary boost/spirit/home/karma/numeric boost/spirit/home/karma/numeric/detail boost/spirit/home/phoenix/scope boost/spirit/home/qi/auxiliary boost/spirit/home/qi/numeric/detail boost/spirit/home/qi/operator boost/spirit/home/support/auxiliary boost/spirit/home/support/detail boost/spirit/home/support/detail/lexer/parser/tokeniser boost/spirit/home/support/detail/math boost/system boost/test/impl boost/tr1 boost/type_traits boost/units boost/units/detail boost/units/systems/angle boost/units/systems/detail boost/unordered/detail boost/wave/cpplexer boost/xpressive boost/xpressive/detail/core/matcher boost/xpressive/detail/dynamic libs libs/asio/doc/overview libs/asio/example/local libs/config/test libs/config/tools libs/dynamic_bitset libs/filesystem/doc libs/filesystem/example libs/filesystem/src libs/filesystem/test libs/filesystem/test/msvc/mbcopy libs/functional/hash/doc libs/functional/hash/test libs/fusion/test/compile_time libs/graph/test libs/interprocess/doc libs/interprocess/example libs/interprocess/proj libs/interprocess/proj/vc7ide libs/interprocess/test libs/intrusive/doc libs/intrusive/example libs/intrusive/proj/vc7ide libs/intrusive/proj/vc7ide/_intrusivelib libs/intrusive/proj/vc7ide/unordered_set libs/intrusive/test libs/math/doc/sf_and_dist/html/math_toolkit/toolkit/internals1 libs/math/minimax libs/math/src/tr1 libs/math/test libs/mpl/example libs/mpl/example/fsm libs/mpl/example/fsm/aux_ libs/mpl/preprocessed libs/mpl/preprocessed/include/bcc libs/mpl/preprocessed/include/bcc551 libs/mpl/preprocessed/include/bcc_pre590 libs/mpl/preprocessed/include/dmc libs/mpl/preprocessed/include/gcc libs/mpl/preprocessed/include/msvc60 libs/mpl/preprocessed/include/msvc70 libs/mpl/preprocessed/include/mwcw libs/mpl/preprocessed/include/no_ctps libs/mpl/preprocessed/include/no_ttp libs/mpl/preprocessed/include/plain libs/mpl/preprocessed/include/typeof_based libs/mpl/preprocessed/list libs/mpl/preprocessed/map libs/mpl/preprocessed/set libs/mpl/preprocessed/src libs/mpl/preprocessed/vector libs/mpl/test libs/mpl/test/aux_ libs/mpl/test/aux_/preprocessor libs/multi_index/doc libs/proto/doc libs/proto/example libs/regex/build libs/regex/src libs/serialization/build libs/serialization/doc libs/serialization/src libs/serialization/vc7ide libs/spirit/classic/test libs/system/doc libs/system/src libs/test/test libs/type_traits/doc libs/type_traits/doc/html libs/type_traits/doc/html/boost_typetraits libs/type_traits/doc/html/boost_typetraits/category libs/type_traits/doc/html/boost_typetraits/category/value_traits libs/type_traits/doc/html/boost_typetraits/reference libs/wave libs/wave/build libs/wave/doc libs/wave/samples/cpp_tokens libs/wave/samples/cpp_tokens/slex libs/wave/samples/list_includes libs/wave/samples/list_includes/lexertl libs/wave/samples/preprocess_pragma_output libs/wave/samples/quick_start libs/wave/samples/waveidl/idllexer more/getting_started more/getting_started/detail status tools/bcp tools/build/v2 tools/build/v2/kernel tools/build/v2/tools tools/inspect tools/quickbook/detail tools/release tools/wave/build
From: eric_at_[hidden]
Date: 2008-10-22 16:34:09

• Next message: bdawes_at_[hidden]: "[Boost-commit] svn:boost r49440 - branches/release/more/getting_started"
• Previous message: bdawes_at_[hidden]: "[Boost-commit] svn:boost r49438 - trunk/more/getting_started"

Author: eric_niebler
Date: 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
New Revision: 49439
URL: http://svn.boost.org/trac/boost/changeset/49439

Log:
merged from trunk
Added:
   branches/proto/v4/boost/graph/named_graph.hpp
      - copied unchanged from r49436, /trunk/boost/graph/named_graph.hpp
   branches/proto/v4/boost/interprocess/detail/advanced_insert_int.hpp
      - copied unchanged from r49436, /trunk/boost/interprocess/detail/advanced_insert_int.hpp
   branches/proto/v4/boost/interprocess/detail/preprocessor.hpp
      - copied unchanged from r49436, /trunk/boost/interprocess/detail/preprocessor.hpp
   branches/proto/v4/boost/interprocess/detail/variadic_templates_tools.hpp
      - copied unchanged from r49436, /trunk/boost/interprocess/detail/variadic_templates_tools.hpp
   branches/proto/v4/boost/intrusive/detail/workaround.hpp
      - copied unchanged from r49436, /trunk/boost/intrusive/detail/workaround.hpp
   branches/proto/v4/boost/mpl/aux_/config/bcc.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/config/bcc.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/
      - copied from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/advance_backward.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/advance_backward.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/advance_forward.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/advance_forward.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/and.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/and.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/apply.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/apply.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/apply_fwd.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/apply_fwd.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/apply_wrap.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/apply_wrap.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/arg.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/arg.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/basic_bind.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/basic_bind.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/bind.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/bind.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/bind_fwd.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/bind_fwd.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/bitand.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/bitand.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/bitor.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/bitor.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/bitxor.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/bitxor.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/deque.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/deque.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/divides.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/divides.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/equal_to.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/equal_to.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/fold_impl.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/fold_impl.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/full_lambda.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/full_lambda.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/greater.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/greater.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/greater_equal.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/greater_equal.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/inherit.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/inherit.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_if_impl.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_if_impl.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_impl.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_impl.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/lambda_no_ctps.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/lambda_no_ctps.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/less.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/less.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/less_equal.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/less_equal.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/list.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/list.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/list_c.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/list_c.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/map.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/map.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/minus.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/minus.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/modulus.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/modulus.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/not_equal_to.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/not_equal_to.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/or.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/or.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/placeholders.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/placeholders.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/plus.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/plus.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/quote.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/quote.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_fold_impl.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_fold_impl.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_iter_fold_impl.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_iter_fold_impl.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/set.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/set.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/set_c.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/set_c.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/shift_left.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/shift_left.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/shift_right.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/shift_right.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/template_arity.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/template_arity.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/times.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/times.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/unpack_args.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/unpack_args.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/vector.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/vector.hpp
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc_pre590/vector_c.hpp
      - copied unchanged from r49436, /trunk/boost/mpl/aux_/preprocessed/bcc_pre590/vector_c.hpp
   branches/proto/v4/libs/asio/example/local/iostream_client.cpp
      - copied unchanged from r49436, /trunk/libs/asio/example/local/iostream_client.cpp
   branches/proto/v4/libs/fusion/test/compile_time/ (props changed)
      - copied from r49436, /trunk/libs/fusion/test/compile_time/
   branches/proto/v4/libs/fusion/test/compile_time/Makefile
      - copied unchanged from r49436, /trunk/libs/fusion/test/compile_time/Makefile
   branches/proto/v4/libs/fusion/test/compile_time/driver.hpp
      - copied unchanged from r49436, /trunk/libs/fusion/test/compile_time/driver.hpp
   branches/proto/v4/libs/fusion/test/compile_time/vector_construction.cpp
      - copied unchanged from r49436, /trunk/libs/fusion/test/compile_time/vector_construction.cpp
   branches/proto/v4/libs/fusion/test/compile_time/vector_intrinsic.cpp
      - copied unchanged from r49436, /trunk/libs/fusion/test/compile_time/vector_intrinsic.cpp
   branches/proto/v4/libs/fusion/test/compile_time/vector_iteration.cpp
      - copied unchanged from r49436, /trunk/libs/fusion/test/compile_time/vector_iteration.cpp
   branches/proto/v4/libs/graph/test/named_vertices_test.cpp
      - copied unchanged from r49436, /trunk/libs/graph/test/named_vertices_test.cpp
   branches/proto/v4/libs/interprocess/proj/to-do.txt
      - copied unchanged from r49436, /trunk/libs/interprocess/proj/to-do.txt
   branches/proto/v4/libs/interprocess/proj/vc7ide/named_construct_test.vcproj
      - copied unchanged from r49436, /trunk/libs/interprocess/proj/vc7ide/named_construct_test.vcproj
   branches/proto/v4/libs/interprocess/test/emplace_test.hpp
      - copied unchanged from r49436, /trunk/libs/interprocess/test/emplace_test.hpp
   branches/proto/v4/libs/interprocess/test/named_construct_test.cpp
      - copied unchanged from r49436, /trunk/libs/interprocess/test/named_construct_test.cpp
   branches/proto/v4/libs/intrusive/proj/vc7ide/to-do.txt
      - copied unchanged from r49436, /trunk/libs/intrusive/proj/vc7ide/to-do.txt
   branches/proto/v4/libs/math/doc/sf_and_dist/html/math_toolkit/toolkit/internals1/constants.html
      - copied unchanged from r49436, /trunk/libs/math/doc/sf_and_dist/html/math_toolkit/toolkit/internals1/constants.html
   branches/proto/v4/libs/mpl/preprocessed/include/bcc_pre590/
      - copied from r49436, /trunk/libs/mpl/preprocessed/include/bcc_pre590/
   branches/proto/v4/libs/mpl/preprocessed/include/bcc_pre590/user.hpp
      - copied unchanged from r49436, /trunk/libs/mpl/preprocessed/include/bcc_pre590/user.hpp
   branches/proto/v4/libs/proto/doc/back_end.qbk
      - copied unchanged from r49436, /trunk/libs/proto/doc/back_end.qbk
   branches/proto/v4/libs/proto/doc/front_end.qbk
      - copied unchanged from r49436, /trunk/libs/proto/doc/front_end.qbk
   branches/proto/v4/libs/proto/doc/intermediate_form.qbk
      - copied unchanged from r49436, /trunk/libs/proto/doc/intermediate_form.qbk
   branches/proto/v4/libs/regex/build/vc9.mak
      - copied unchanged from r49436, /trunk/libs/regex/build/vc9.mak
   branches/proto/v4/tools/release/snapshot.sh
      - copied unchanged from r49436, /trunk/tools/release/snapshot.sh
Removed:
   branches/proto/v4/libs/proto/doc/construction.qbk
   branches/proto/v4/libs/proto/doc/evaluation.qbk
   branches/proto/v4/libs/proto/doc/extensibility.qbk
   branches/proto/v4/libs/proto/doc/grammars.qbk
   branches/proto/v4/libs/proto/doc/transforms.qbk
Properties modified:
   branches/proto/v4/ (props changed)
   branches/proto/v4/boost/detail/dynamic_bitset.hpp (contents, props changed)
   branches/proto/v4/libs/dynamic_bitset/Jamfile.v2 (props changed)
   branches/proto/v4/libs/dynamic_bitset/index.html (props changed)
Text files modified:
   branches/proto/v4/Jamroot | 11
   branches/proto/v4/boost/accumulators/statistics/moment.hpp | 2
   branches/proto/v4/boost/accumulators/statistics/peaks_over_threshold.hpp | 2
   branches/proto/v4/boost/accumulators/statistics/tail_quantile.hpp | 2
   branches/proto/v4/boost/accumulators/statistics/weighted_moment.hpp | 2
   branches/proto/v4/boost/archive/basic_binary_iprimitive.hpp | 12
   branches/proto/v4/boost/archive/basic_binary_oprimitive.hpp | 12
   branches/proto/v4/boost/archive/basic_text_oprimitive.hpp | 2
   branches/proto/v4/boost/archive/detail/abi_suffix.hpp | 8
   branches/proto/v4/boost/archive/impl/basic_xml_grammar.hpp | 6
   branches/proto/v4/boost/archive/iterators/base64_from_binary.hpp | 9
   branches/proto/v4/boost/asio/basic_socket_streambuf.hpp | 3
   branches/proto/v4/boost/asio/basic_streambuf.hpp | 13
   branches/proto/v4/boost/asio/detail/deadline_timer_service.hpp | 1
   branches/proto/v4/boost/asio/detail/dev_poll_reactor.hpp | 11
   branches/proto/v4/boost/asio/detail/epoll_reactor.hpp | 10
   branches/proto/v4/boost/asio/detail/kqueue_reactor.hpp | 10
   branches/proto/v4/boost/asio/detail/null_thread.hpp | 5
   branches/proto/v4/boost/asio/detail/posix_thread.hpp | 5
   branches/proto/v4/boost/asio/detail/reactive_descriptor_service.hpp | 1
   branches/proto/v4/boost/asio/detail/reactive_socket_service.hpp | 1
   branches/proto/v4/boost/asio/detail/select_reactor.hpp | 10
   branches/proto/v4/boost/asio/detail/service_registry.hpp | 20
   branches/proto/v4/boost/asio/detail/task_io_service.hpp | 31
   branches/proto/v4/boost/asio/detail/task_io_service_2lock.hpp | 31
   branches/proto/v4/boost/asio/detail/win_iocp_io_service.hpp | 5
   branches/proto/v4/boost/asio/detail/win_thread.hpp | 117
   branches/proto/v4/boost/asio/detail/wince_thread.hpp | 5
   branches/proto/v4/boost/asio/ip/address_v4.hpp | 19
   branches/proto/v4/boost/asio/ip/address_v6.hpp | 17
   branches/proto/v4/boost/asio/read_until.hpp | 16
   branches/proto/v4/boost/config/compiler/sunpro_cc.hpp | 4
   branches/proto/v4/boost/date_time/posix_time/posix_time_config.hpp | 2
   branches/proto/v4/boost/detail/allocator_utilities.hpp | 6
   branches/proto/v4/boost/detail/dynamic_bitset.hpp | 8
   branches/proto/v4/boost/detail/sp_convertible.hpp | 2
   branches/proto/v4/boost/detail/utf8_codecvt_facet.hpp | 5
   branches/proto/v4/boost/dynamic_bitset/dynamic_bitset.hpp | 38
   branches/proto/v4/boost/filesystem/path.hpp | 8
   branches/proto/v4/boost/function/function_base.hpp | 13
   branches/proto/v4/boost/function/function_template.hpp | 403 +++-
   branches/proto/v4/boost/functional/detail/float_functions.hpp | 2
   branches/proto/v4/boost/functional/hash/deque.hpp | 22
   branches/proto/v4/boost/functional/hash/list.hpp | 22
   branches/proto/v4/boost/functional/hash/map.hpp | 22
   branches/proto/v4/boost/functional/hash/pair.hpp | 22
   branches/proto/v4/boost/functional/hash/set.hpp | 22
   branches/proto/v4/boost/functional/hash/vector.hpp | 22
   branches/proto/v4/boost/gil/utilities.hpp | 2
   branches/proto/v4/boost/graph/adjacency_list.hpp | 16
   branches/proto/v4/boost/graph/chrobak_payne_drawing.hpp | 4
   branches/proto/v4/boost/graph/circle_layout.hpp | 2
   branches/proto/v4/boost/graph/detail/adjacency_list.hpp | 15
   branches/proto/v4/boost/graph/erdos_renyi_generator.hpp | 2
   branches/proto/v4/boost/graph/fruchterman_reingold.hpp | 2
   branches/proto/v4/boost/graph/graphml.hpp | 2
   branches/proto/v4/boost/graph/gursoy_atun_layout.hpp | 2
   branches/proto/v4/boost/graph/kamada_kawai_spring_layout.hpp | 2
   branches/proto/v4/boost/graph/plod_generator.hpp | 2
   branches/proto/v4/boost/graph/reverse_graph.hpp | 35
   branches/proto/v4/boost/graph/wavefront.hpp | 2
   branches/proto/v4/boost/interprocess/allocators/allocator.hpp | 2
   branches/proto/v4/boost/interprocess/allocators/detail/adaptive_node_pool.hpp | 23
   branches/proto/v4/boost/interprocess/allocators/detail/node_pool.hpp | 15
   branches/proto/v4/boost/interprocess/anonymous_shared_memory.hpp | 12
   branches/proto/v4/boost/interprocess/containers/deque.hpp | 958 +++++-----
   branches/proto/v4/boost/interprocess/containers/detail/flat_tree.hpp | 204 +
   branches/proto/v4/boost/interprocess/containers/detail/node_alloc_holder.hpp | 98
   branches/proto/v4/boost/interprocess/containers/detail/tree.hpp | 300 ++
   branches/proto/v4/boost/interprocess/containers/flat_map.hpp | 281 ++
   branches/proto/v4/boost/interprocess/containers/flat_set.hpp | 187 ++
   branches/proto/v4/boost/interprocess/containers/list.hpp | 252 ++
   branches/proto/v4/boost/interprocess/containers/map.hpp | 102 +
   branches/proto/v4/boost/interprocess/containers/set.hpp | 167 +
   branches/proto/v4/boost/interprocess/containers/slist.hpp | 263 ++
   branches/proto/v4/boost/interprocess/containers/string.hpp | 2
   branches/proto/v4/boost/interprocess/containers/vector.hpp | 782 +++++---
   branches/proto/v4/boost/interprocess/detail/algorithms.hpp | 11
   branches/proto/v4/boost/interprocess/detail/atomic.hpp | 8
   branches/proto/v4/boost/interprocess/detail/config_begin.hpp | 4
   branches/proto/v4/boost/interprocess/detail/intersegment_ptr.hpp | 69
   branches/proto/v4/boost/interprocess/detail/managed_memory_impl.hpp | 10
   branches/proto/v4/boost/interprocess/detail/managed_multi_shared_memory.hpp | 4
   branches/proto/v4/boost/interprocess/detail/managed_open_or_create_impl.hpp | 8
   branches/proto/v4/boost/interprocess/detail/move.hpp | 12
   branches/proto/v4/boost/interprocess/detail/named_proxy.hpp | 193 +
   branches/proto/v4/boost/interprocess/detail/os_file_functions.hpp | 13
   branches/proto/v4/boost/interprocess/detail/segment_manager_helper.hpp | 30
   branches/proto/v4/boost/interprocess/detail/type_traits.hpp | 41
   branches/proto/v4/boost/interprocess/detail/utilities.hpp | 151 +
   branches/proto/v4/boost/interprocess/detail/win32_api.hpp | 17
   branches/proto/v4/boost/interprocess/errors.hpp | 2
   branches/proto/v4/boost/interprocess/file_mapping.hpp | 2
   branches/proto/v4/boost/interprocess/interprocess_fwd.hpp | 5
   branches/proto/v4/boost/interprocess/ipc/message_queue.hpp | 36
   branches/proto/v4/boost/interprocess/mapped_region.hpp | 11
   branches/proto/v4/boost/interprocess/mem_algo/detail/mem_algo_common.hpp | 37
   branches/proto/v4/boost/interprocess/mem_algo/detail/multi_simple_seq_fit_impl.hpp | 72
   branches/proto/v4/boost/interprocess/mem_algo/detail/simple_seq_fit_impl.hpp | 75
   branches/proto/v4/boost/interprocess/mem_algo/rbtree_best_fit.hpp | 85
   branches/proto/v4/boost/interprocess/offset_ptr.hpp | 16
   branches/proto/v4/boost/interprocess/segment_manager.hpp | 88
   branches/proto/v4/boost/interprocess/shared_memory_object.hpp | 1
   branches/proto/v4/boost/interprocess/smart_ptr/unique_ptr.hpp | 2
   branches/proto/v4/boost/interprocess/smart_ptr/weak_ptr.hpp | 2
   branches/proto/v4/boost/interprocess/sync/emulation/interprocess_condition.hpp | 16
   branches/proto/v4/boost/interprocess/sync/emulation/interprocess_mutex.hpp | 10
   branches/proto/v4/boost/interprocess/sync/emulation/interprocess_recursive_mutex.hpp | 4
   branches/proto/v4/boost/interprocess/sync/emulation/interprocess_semaphore.hpp | 4
   branches/proto/v4/boost/interprocess/sync/file_lock.hpp | 8
   branches/proto/v4/boost/interprocess/sync/interprocess_condition.hpp | 12
   branches/proto/v4/boost/interprocess/sync/interprocess_mutex.hpp | 2
   branches/proto/v4/boost/interprocess/sync/interprocess_recursive_mutex.hpp | 3
   branches/proto/v4/boost/interprocess/sync/interprocess_semaphore.hpp | 4
   branches/proto/v4/boost/interprocess/sync/interprocess_upgradable_mutex.hpp | 12
   branches/proto/v4/boost/interprocess/sync/lock_options.hpp | 2
   branches/proto/v4/boost/interprocess/sync/named_condition.hpp | 16
   branches/proto/v4/boost/interprocess/sync/named_mutex.hpp | 16
   branches/proto/v4/boost/interprocess/sync/named_recursive_mutex.hpp | 8
   branches/proto/v4/boost/interprocess/sync/named_semaphore.hpp | 16
   branches/proto/v4/boost/interprocess/sync/named_upgradable_mutex.hpp | 26
   branches/proto/v4/boost/interprocess/sync/posix/interprocess_mutex.hpp | 4
   branches/proto/v4/boost/interprocess/sync/posix/interprocess_recursive_mutex.hpp | 4
   branches/proto/v4/boost/interprocess/sync/posix/interprocess_semaphore.hpp | 8
   branches/proto/v4/boost/interprocess/sync/posix/semaphore_wrapper.hpp | 2
   branches/proto/v4/boost/interprocess/sync/sharable_lock.hpp | 2
   branches/proto/v4/boost/interprocess/sync/upgradable_lock.hpp | 4
   branches/proto/v4/boost/intrusive/avl_set.hpp | 114
   branches/proto/v4/boost/intrusive/avl_set_hook.hpp | 42
   branches/proto/v4/boost/intrusive/avltree.hpp | 98
   branches/proto/v4/boost/intrusive/avltree_algorithms.hpp | 16
   branches/proto/v4/boost/intrusive/bs_set_hook.hpp | 62
   branches/proto/v4/boost/intrusive/circular_slist_algorithms.hpp | 4
   branches/proto/v4/boost/intrusive/detail/assert.hpp | 18
   branches/proto/v4/boost/intrusive/detail/list_node.hpp | 3
   branches/proto/v4/boost/intrusive/detail/mpl.hpp | 172 +
   branches/proto/v4/boost/intrusive/detail/slist_node.hpp | 3
   branches/proto/v4/boost/intrusive/detail/tree_algorithms.hpp | 4
   branches/proto/v4/boost/intrusive/hashtable.hpp | 892 ++++++---
   branches/proto/v4/boost/intrusive/intrusive_fwd.hpp | 152 +
   branches/proto/v4/boost/intrusive/linear_slist_algorithms.hpp | 4
   branches/proto/v4/boost/intrusive/list.hpp | 146
   branches/proto/v4/boost/intrusive/list_hook.hpp | 44
   branches/proto/v4/boost/intrusive/options.hpp | 214 ++
   branches/proto/v4/boost/intrusive/pointer_plus_bits.hpp | 7
   branches/proto/v4/boost/intrusive/rbtree.hpp | 106
   branches/proto/v4/boost/intrusive/set.hpp | 116
   branches/proto/v4/boost/intrusive/set_hook.hpp | 44
   branches/proto/v4/boost/intrusive/sg_set.hpp | 116
   branches/proto/v4/boost/intrusive/sgtree.hpp | 98
   branches/proto/v4/boost/intrusive/sgtree_algorithms.hpp | 2
   branches/proto/v4/boost/intrusive/slist.hpp | 212 +-
   branches/proto/v4/boost/intrusive/slist_hook.hpp | 44
   branches/proto/v4/boost/intrusive/splay_set.hpp | 115
   branches/proto/v4/boost/intrusive/splay_set_hook.hpp | 44
   branches/proto/v4/boost/intrusive/splaytree.hpp | 109
   branches/proto/v4/boost/intrusive/splaytree_algorithms.hpp | 2
   branches/proto/v4/boost/intrusive/unordered_set.hpp | 154 +
   branches/proto/v4/boost/intrusive/unordered_set_hook.hpp | 44
   branches/proto/v4/boost/iterator/detail/config_def.hpp | 2
   branches/proto/v4/boost/iterator/indirect_iterator.hpp | 2
   branches/proto/v4/boost/iterator/iterator_adaptor.hpp | 9
   branches/proto/v4/boost/iterator/iterator_facade.hpp | 3
   branches/proto/v4/boost/lexical_cast.hpp | 85
   branches/proto/v4/boost/math/distributions/non_central_f.hpp | 5
   branches/proto/v4/boost/math/special_functions/expint.hpp | 3
   branches/proto/v4/boost/mpl/O1_size.hpp | 2
   branches/proto/v4/boost/mpl/O1_size_fwd.hpp | 2
   branches/proto/v4/boost/mpl/accumulate.hpp | 2
   branches/proto/v4/boost/mpl/advance.hpp | 2
   branches/proto/v4/boost/mpl/advance_fwd.hpp | 2
   branches/proto/v4/boost/mpl/alias.hpp | 2
   branches/proto/v4/boost/mpl/always.hpp | 2
   branches/proto/v4/boost/mpl/and.hpp | 2
   branches/proto/v4/boost/mpl/apply.hpp | 2
   branches/proto/v4/boost/mpl/apply_fwd.hpp | 2
   branches/proto/v4/boost/mpl/apply_wrap.hpp | 36
   branches/proto/v4/boost/mpl/arg.hpp | 2
   branches/proto/v4/boost/mpl/arg_fwd.hpp | 2
   branches/proto/v4/boost/mpl/arithmetic.hpp | 2
   branches/proto/v4/boost/mpl/as_sequence.hpp | 2
   branches/proto/v4/boost/mpl/assert.hpp | 8
   branches/proto/v4/boost/mpl/at.hpp | 2
   branches/proto/v4/boost/mpl/at_fwd.hpp | 2
   branches/proto/v4/boost/mpl/aux_/O1_size_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/adl_barrier.hpp | 2
   branches/proto/v4/boost/mpl/aux_/advance_backward.hpp | 2
   branches/proto/v4/boost/mpl/aux_/advance_forward.hpp | 2
   branches/proto/v4/boost/mpl/aux_/apply_1st.hpp | 2
   branches/proto/v4/boost/mpl/aux_/arg_typedef.hpp | 2
   branches/proto/v4/boost/mpl/aux_/arithmetic_op.hpp | 2
   branches/proto/v4/boost/mpl/aux_/arity.hpp | 2
   branches/proto/v4/boost/mpl/aux_/arity_spec.hpp | 2
   branches/proto/v4/boost/mpl/aux_/at_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/back_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/basic_bind.hpp | 2
   branches/proto/v4/boost/mpl/aux_/begin_end_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/clear_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/common_name_wknd.hpp | 2
   branches/proto/v4/boost/mpl/aux_/comparison_op.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/adl.hpp | 4
   branches/proto/v4/boost/mpl/aux_/config/arrays.hpp | 4
   branches/proto/v4/boost/mpl/aux_/config/bind.hpp | 4
   branches/proto/v4/boost/mpl/aux_/config/compiler.hpp | 10
   branches/proto/v4/boost/mpl/aux_/config/ctps.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/dependent_nttp.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/dmc_ambiguous_ctps.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/dtp.hpp | 6
   branches/proto/v4/boost/mpl/aux_/config/eti.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/forwarding.hpp | 4
   branches/proto/v4/boost/mpl/aux_/config/gcc.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/has_apply.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/has_xxx.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/integral.hpp | 4
   branches/proto/v4/boost/mpl/aux_/config/intel.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/lambda.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/msvc.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/msvc_typename.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/nttp.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/operators.hpp | 4
   branches/proto/v4/boost/mpl/aux_/config/overload_resolution.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/pp_counter.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/preprocessor.hpp | 4
   branches/proto/v4/boost/mpl/aux_/config/static_constant.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/ttp.hpp | 4
   branches/proto/v4/boost/mpl/aux_/config/typeof.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/use_preprocessed.hpp | 2
   branches/proto/v4/boost/mpl/aux_/config/workaround.hpp | 2
   branches/proto/v4/boost/mpl/aux_/contains_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/count_args.hpp | 2
   branches/proto/v4/boost/mpl/aux_/count_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/empty_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/erase_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/erase_key_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/filter_iter.hpp | 2
   branches/proto/v4/boost/mpl/aux_/fold_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/fold_impl_body.hpp | 2
   branches/proto/v4/boost/mpl/aux_/fold_op.hpp | 2
   branches/proto/v4/boost/mpl/aux_/fold_pred.hpp | 2
   branches/proto/v4/boost/mpl/aux_/front_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/full_lambda.hpp | 2
   branches/proto/v4/boost/mpl/aux_/has_apply.hpp | 2
   branches/proto/v4/boost/mpl/aux_/has_begin.hpp | 2
   branches/proto/v4/boost/mpl/aux_/has_key_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/has_rebind.hpp | 6
   branches/proto/v4/boost/mpl/aux_/has_size.hpp | 2
   branches/proto/v4/boost/mpl/aux_/has_tag.hpp | 2
   branches/proto/v4/boost/mpl/aux_/has_type.hpp | 2
   branches/proto/v4/boost/mpl/aux_/include_preprocessed.hpp | 2
   branches/proto/v4/boost/mpl/aux_/insert_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/insert_range_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/inserter_algorithm.hpp | 2
   branches/proto/v4/boost/mpl/aux_/integral_wrapper.hpp | 2
   branches/proto/v4/boost/mpl/aux_/is_msvc_eti_arg.hpp | 2
   branches/proto/v4/boost/mpl/aux_/iter_apply.hpp | 2
   branches/proto/v4/boost/mpl/aux_/iter_fold_if_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/iter_fold_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/iter_push_front.hpp | 2
   branches/proto/v4/boost/mpl/aux_/joint_iter.hpp | 2
   branches/proto/v4/boost/mpl/aux_/lambda_arity_param.hpp | 2
   branches/proto/v4/boost/mpl/aux_/lambda_no_ctps.hpp | 2
   branches/proto/v4/boost/mpl/aux_/lambda_spec.hpp | 2
   branches/proto/v4/boost/mpl/aux_/lambda_support.hpp | 4
   branches/proto/v4/boost/mpl/aux_/largest_int.hpp | 2
   branches/proto/v4/boost/mpl/aux_/logical_op.hpp | 2
   branches/proto/v4/boost/mpl/aux_/msvc_dtw.hpp | 2
   branches/proto/v4/boost/mpl/aux_/msvc_eti_base.hpp | 2
   branches/proto/v4/boost/mpl/aux_/msvc_is_class.hpp | 2
   branches/proto/v4/boost/mpl/aux_/msvc_never_true.hpp | 2
   branches/proto/v4/boost/mpl/aux_/msvc_type.hpp | 2
   branches/proto/v4/boost/mpl/aux_/na.hpp | 2
   branches/proto/v4/boost/mpl/aux_/na_assert.hpp | 2
   branches/proto/v4/boost/mpl/aux_/na_fwd.hpp | 2
   branches/proto/v4/boost/mpl/aux_/na_spec.hpp | 2
   branches/proto/v4/boost/mpl/aux_/nested_type_wknd.hpp | 2
   branches/proto/v4/boost/mpl/aux_/nttp_decl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/numeric_cast_utils.hpp | 2
   branches/proto/v4/boost/mpl/aux_/numeric_op.hpp | 2
   branches/proto/v4/boost/mpl/aux_/order_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/overload_names.hpp | 2
   branches/proto/v4/boost/mpl/aux_/partition_op.hpp | 2
   branches/proto/v4/boost/mpl/aux_/pop_back_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/pop_front_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/advance_backward.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/advance_forward.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/and.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/apply.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/apply_fwd.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/apply_wrap.hpp | 21
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/arg.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/basic_bind.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/bind.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/bind_fwd.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/bitand.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/bitor.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/deque.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/divides.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/full_lambda.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/greater.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/inherit.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/iter_fold_if_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/less.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/list.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/list_c.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/map.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/minus.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/modulus.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/or.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/placeholders.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/plus.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/quote.hpp | 112 +
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/set.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/set_c.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/times.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/unpack_args.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/vector.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessed/bcc/vector_c.hpp | 4
   branches/proto/v4/boost/mpl/aux_/preprocessor/add.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/def_params_tail.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/default_params.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/enum.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/ext_params.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/filter_params.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/is_seq.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/params.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/partial_spec_params.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/range.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/repeat.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/sub.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/token_equal.hpp | 2
   branches/proto/v4/boost/mpl/aux_/preprocessor/tuple.hpp | 2
   branches/proto/v4/boost/mpl/aux_/ptr_to_ref.hpp | 2
   branches/proto/v4/boost/mpl/aux_/push_back_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/push_front_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/range_c/O1_size.hpp | 2
   branches/proto/v4/boost/mpl/aux_/range_c/back.hpp | 2
   branches/proto/v4/boost/mpl/aux_/range_c/empty.hpp | 2
   branches/proto/v4/boost/mpl/aux_/range_c/front.hpp | 2
   branches/proto/v4/boost/mpl/aux_/range_c/iterator.hpp | 2
   branches/proto/v4/boost/mpl/aux_/range_c/size.hpp | 2
   branches/proto/v4/boost/mpl/aux_/range_c/tag.hpp | 2
   branches/proto/v4/boost/mpl/aux_/reverse_fold_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/reverse_fold_impl_body.hpp | 2
   branches/proto/v4/boost/mpl/aux_/reverse_iter_fold_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/sequence_wrapper.hpp | 16
   branches/proto/v4/boost/mpl/aux_/shift_op.hpp | 2
   branches/proto/v4/boost/mpl/aux_/single_element_iter.hpp | 2
   branches/proto/v4/boost/mpl/aux_/size_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/sort_impl.hpp | 2
   branches/proto/v4/boost/mpl/aux_/static_cast.hpp | 2
   branches/proto/v4/boost/mpl/aux_/template_arity.hpp | 2
   branches/proto/v4/boost/mpl/aux_/template_arity_fwd.hpp | 2
   branches/proto/v4/boost/mpl/aux_/test.hpp | 2
   branches/proto/v4/boost/mpl/aux_/test/assert.hpp | 2
   branches/proto/v4/boost/mpl/aux_/test/data.hpp | 2
   branches/proto/v4/boost/mpl/aux_/test/test_case.hpp | 2
   branches/proto/v4/boost/mpl/aux_/traits_lambda_spec.hpp | 2
   branches/proto/v4/boost/mpl/aux_/transform_iter.hpp | 2
   branches/proto/v4/boost/mpl/aux_/type_wrapper.hpp | 2
   branches/proto/v4/boost/mpl/aux_/unwrap.hpp | 2
   branches/proto/v4/boost/mpl/aux_/value_wknd.hpp | 2
   branches/proto/v4/boost/mpl/aux_/yes_no.hpp | 2
   branches/proto/v4/boost/mpl/back.hpp | 2
   branches/proto/v4/boost/mpl/back_fwd.hpp | 2
   branches/proto/v4/boost/mpl/back_inserter.hpp | 2
   branches/proto/v4/boost/mpl/base.hpp | 2
   branches/proto/v4/boost/mpl/begin.hpp | 2
   branches/proto/v4/boost/mpl/begin_end.hpp | 2
   branches/proto/v4/boost/mpl/begin_end_fwd.hpp | 2
   branches/proto/v4/boost/mpl/bind.hpp | 2
   branches/proto/v4/boost/mpl/bind_fwd.hpp | 2
   branches/proto/v4/boost/mpl/bitand.hpp | 2
   branches/proto/v4/boost/mpl/bitor.hpp | 2
   branches/proto/v4/boost/mpl/bitwise.hpp | 2
   branches/proto/v4/boost/mpl/bitxor.hpp | 2
   branches/proto/v4/boost/mpl/bool.hpp | 2
   branches/proto/v4/boost/mpl/bool_fwd.hpp | 2
   branches/proto/v4/boost/mpl/clear.hpp | 2
   branches/proto/v4/boost/mpl/clear_fwd.hpp | 2
   branches/proto/v4/boost/mpl/comparison.hpp | 2
   branches/proto/v4/boost/mpl/contains.hpp | 2
   branches/proto/v4/boost/mpl/contains_fwd.hpp | 2
   branches/proto/v4/boost/mpl/copy.hpp | 2
   branches/proto/v4/boost/mpl/copy_if.hpp | 2
   branches/proto/v4/boost/mpl/count.hpp | 2
   branches/proto/v4/boost/mpl/count_fwd.hpp | 2
   branches/proto/v4/boost/mpl/count_if.hpp | 2
   branches/proto/v4/boost/mpl/deque.hpp | 2
   branches/proto/v4/boost/mpl/deref.hpp | 2
   branches/proto/v4/boost/mpl/distance.hpp | 2
   branches/proto/v4/boost/mpl/distance_fwd.hpp | 2
   branches/proto/v4/boost/mpl/divides.hpp | 2
   branches/proto/v4/boost/mpl/empty.hpp | 2
   branches/proto/v4/boost/mpl/empty_base.hpp | 2
   branches/proto/v4/boost/mpl/empty_fwd.hpp | 2
   branches/proto/v4/boost/mpl/empty_sequence.hpp | 2
   branches/proto/v4/boost/mpl/end.hpp | 2
   branches/proto/v4/boost/mpl/equal.hpp | 2
   branches/proto/v4/boost/mpl/equal_to.hpp | 2
   branches/proto/v4/boost/mpl/erase.hpp | 2
   branches/proto/v4/boost/mpl/erase_fwd.hpp | 2
   branches/proto/v4/boost/mpl/erase_key.hpp | 2
   branches/proto/v4/boost/mpl/erase_key_fwd.hpp | 2
   branches/proto/v4/boost/mpl/eval_if.hpp | 2
   branches/proto/v4/boost/mpl/filter_view.hpp | 2
   branches/proto/v4/boost/mpl/find.hpp | 2
   branches/proto/v4/boost/mpl/find_if.hpp | 2
   branches/proto/v4/boost/mpl/fold.hpp | 2
   branches/proto/v4/boost/mpl/for_each.hpp | 2
   branches/proto/v4/boost/mpl/front.hpp | 2
   branches/proto/v4/boost/mpl/front_fwd.hpp | 2
   branches/proto/v4/boost/mpl/front_inserter.hpp | 2
   branches/proto/v4/boost/mpl/greater.hpp | 2
   branches/proto/v4/boost/mpl/greater_equal.hpp | 2
   branches/proto/v4/boost/mpl/has_key.hpp | 2
   branches/proto/v4/boost/mpl/has_key_fwd.hpp | 2
   branches/proto/v4/boost/mpl/has_xxx.hpp | 14
   branches/proto/v4/boost/mpl/identity.hpp | 2
   branches/proto/v4/boost/mpl/if.hpp | 2
   branches/proto/v4/boost/mpl/index_if.hpp | 2
   branches/proto/v4/boost/mpl/index_of.hpp | 2
   branches/proto/v4/boost/mpl/inherit.hpp | 2
   branches/proto/v4/boost/mpl/inherit_linearly.hpp | 2
   branches/proto/v4/boost/mpl/insert.hpp | 2
   branches/proto/v4/boost/mpl/insert_fwd.hpp | 2
   branches/proto/v4/boost/mpl/insert_range.hpp | 2
   branches/proto/v4/boost/mpl/insert_range_fwd.hpp | 2
   branches/proto/v4/boost/mpl/inserter.hpp | 2
   branches/proto/v4/boost/mpl/int.hpp | 2
   branches/proto/v4/boost/mpl/int_fwd.hpp | 2
   branches/proto/v4/boost/mpl/integral_c.hpp | 2
   branches/proto/v4/boost/mpl/integral_c_fwd.hpp | 2
   branches/proto/v4/boost/mpl/integral_c_tag.hpp | 2
   branches/proto/v4/boost/mpl/is_placeholder.hpp | 2
   branches/proto/v4/boost/mpl/is_sequence.hpp | 2
   branches/proto/v4/boost/mpl/iter_fold.hpp | 2
   branches/proto/v4/boost/mpl/iter_fold_if.hpp | 2
   branches/proto/v4/boost/mpl/iterator_category.hpp | 2
   branches/proto/v4/boost/mpl/iterator_range.hpp | 2
   branches/proto/v4/boost/mpl/iterator_tags.hpp | 2
   branches/proto/v4/boost/mpl/joint_view.hpp | 2
   branches/proto/v4/boost/mpl/key_type.hpp | 2
   branches/proto/v4/boost/mpl/key_type_fwd.hpp | 2
   branches/proto/v4/boost/mpl/lambda.hpp | 2
   branches/proto/v4/boost/mpl/lambda_fwd.hpp | 2
   branches/proto/v4/boost/mpl/less.hpp | 2
   branches/proto/v4/boost/mpl/less_equal.hpp | 2
   branches/proto/v4/boost/mpl/limits/arity.hpp | 2
   branches/proto/v4/boost/mpl/limits/list.hpp | 2
   branches/proto/v4/boost/mpl/limits/map.hpp | 2
   branches/proto/v4/boost/mpl/limits/set.hpp | 2
   branches/proto/v4/boost/mpl/limits/unrolling.hpp | 2
   branches/proto/v4/boost/mpl/limits/vector.hpp | 2
   branches/proto/v4/boost/mpl/list.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/O1_size.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/begin_end.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/clear.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/empty.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/front.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/include_preprocessed.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/item.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/iterator.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/numbered.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/numbered_c.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/pop_front.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/push_back.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/push_front.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/size.hpp | 2
   branches/proto/v4/boost/mpl/list/aux_/tag.hpp | 2
   branches/proto/v4/boost/mpl/list/list0.hpp | 2
   branches/proto/v4/boost/mpl/list/list0_c.hpp | 2
   branches/proto/v4/boost/mpl/list/list10.hpp | 2
   branches/proto/v4/boost/mpl/list/list10_c.hpp | 2
   branches/proto/v4/boost/mpl/list/list20.hpp | 2
   branches/proto/v4/boost/mpl/list/list20_c.hpp | 2
   branches/proto/v4/boost/mpl/list/list30.hpp | 2
   branches/proto/v4/boost/mpl/list/list30_c.hpp | 2
   branches/proto/v4/boost/mpl/list/list40.hpp | 2
   branches/proto/v4/boost/mpl/list/list40_c.hpp | 2
   branches/proto/v4/boost/mpl/list/list50.hpp | 2
   branches/proto/v4/boost/mpl/list/list50_c.hpp | 2
   branches/proto/v4/boost/mpl/list_c.hpp | 2
   branches/proto/v4/boost/mpl/logical.hpp | 2
   branches/proto/v4/boost/mpl/long.hpp | 2
   branches/proto/v4/boost/mpl/long_fwd.hpp | 2
   branches/proto/v4/boost/mpl/lower_bound.hpp | 4
   branches/proto/v4/boost/mpl/map.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/at_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/begin_end_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/clear_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/contains_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/empty_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/erase_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/erase_key_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/has_key_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/include_preprocessed.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/insert_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/item.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/iterator.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/key_type_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/map0.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/numbered.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/size_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/tag.hpp | 2
   branches/proto/v4/boost/mpl/map/aux_/value_type_impl.hpp | 2
   branches/proto/v4/boost/mpl/map/map0.hpp | 2
   branches/proto/v4/boost/mpl/map/map10.hpp | 2
   branches/proto/v4/boost/mpl/map/map20.hpp | 2
   branches/proto/v4/boost/mpl/map/map30.hpp | 2
   branches/proto/v4/boost/mpl/map/map40.hpp | 2
   branches/proto/v4/boost/mpl/map/map50.hpp | 2
   branches/proto/v4/boost/mpl/math/fixed_c.hpp | 2
   branches/proto/v4/boost/mpl/math/is_even.hpp | 2
   branches/proto/v4/boost/mpl/math/rational_c.hpp | 2
   branches/proto/v4/boost/mpl/max.hpp | 2
   branches/proto/v4/boost/mpl/max_element.hpp | 2
   branches/proto/v4/boost/mpl/min.hpp | 2
   branches/proto/v4/boost/mpl/min_element.hpp | 2
   branches/proto/v4/boost/mpl/min_max.hpp | 2
   branches/proto/v4/boost/mpl/minus.hpp | 2
   branches/proto/v4/boost/mpl/modulus.hpp | 2
   branches/proto/v4/boost/mpl/multiplies.hpp | 2
   branches/proto/v4/boost/mpl/multiset/aux_/count_impl.hpp | 2
   branches/proto/v4/boost/mpl/multiset/aux_/insert_impl.hpp | 2
   branches/proto/v4/boost/mpl/multiset/aux_/item.hpp | 2
   branches/proto/v4/boost/mpl/multiset/aux_/multiset0.hpp | 2
   branches/proto/v4/boost/mpl/multiset/aux_/tag.hpp | 2
   branches/proto/v4/boost/mpl/multiset/multiset0.hpp | 2
   branches/proto/v4/boost/mpl/negate.hpp | 2
   branches/proto/v4/boost/mpl/next.hpp | 2
   branches/proto/v4/boost/mpl/next_prior.hpp | 2
   branches/proto/v4/boost/mpl/not.hpp | 2
   branches/proto/v4/boost/mpl/not_equal_to.hpp | 2
   branches/proto/v4/boost/mpl/numeric_cast.hpp | 2
   branches/proto/v4/boost/mpl/or.hpp | 2
   branches/proto/v4/boost/mpl/order.hpp | 2
   branches/proto/v4/boost/mpl/order_fwd.hpp | 2
   branches/proto/v4/boost/mpl/pair.hpp | 2
   branches/proto/v4/boost/mpl/pair_view.hpp | 2
   branches/proto/v4/boost/mpl/partition.hpp | 2
   branches/proto/v4/boost/mpl/placeholders.hpp | 2
   branches/proto/v4/boost/mpl/plus.hpp | 2
   branches/proto/v4/boost/mpl/pop_back.hpp | 2
   branches/proto/v4/boost/mpl/pop_back_fwd.hpp | 2
   branches/proto/v4/boost/mpl/pop_front.hpp | 2
   branches/proto/v4/boost/mpl/pop_front_fwd.hpp | 2
   branches/proto/v4/boost/mpl/print.hpp | 2
   branches/proto/v4/boost/mpl/prior.hpp | 2
   branches/proto/v4/boost/mpl/protect.hpp | 2
   branches/proto/v4/boost/mpl/push_back.hpp | 2
   branches/proto/v4/boost/mpl/push_back_fwd.hpp | 2
   branches/proto/v4/boost/mpl/push_front.hpp | 2
   branches/proto/v4/boost/mpl/push_front_fwd.hpp | 2
   branches/proto/v4/boost/mpl/quote.hpp | 21
   branches/proto/v4/boost/mpl/range_c.hpp | 2
   branches/proto/v4/boost/mpl/remove.hpp | 2
   branches/proto/v4/boost/mpl/remove_if.hpp | 2
   branches/proto/v4/boost/mpl/replace.hpp | 2
   branches/proto/v4/boost/mpl/replace_if.hpp | 2
   branches/proto/v4/boost/mpl/reverse.hpp | 2
   branches/proto/v4/boost/mpl/reverse_fold.hpp | 2
   branches/proto/v4/boost/mpl/reverse_iter_fold.hpp | 2
   branches/proto/v4/boost/mpl/same_as.hpp | 2
   branches/proto/v4/boost/mpl/sequence_tag.hpp | 2
   branches/proto/v4/boost/mpl/sequence_tag_fwd.hpp | 2
   branches/proto/v4/boost/mpl/set.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/at_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/begin_end_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/clear_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/empty_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/erase_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/erase_key_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/has_key_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/include_preprocessed.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/insert_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/item.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/iterator.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/key_type_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/numbered.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/numbered_c.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/set0.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/size_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/tag.hpp | 2
   branches/proto/v4/boost/mpl/set/aux_/value_type_impl.hpp | 2
   branches/proto/v4/boost/mpl/set/set0.hpp | 2
   branches/proto/v4/boost/mpl/set/set0_c.hpp | 2
   branches/proto/v4/boost/mpl/set/set10.hpp | 2
   branches/proto/v4/boost/mpl/set/set10_c.hpp | 2
   branches/proto/v4/boost/mpl/set/set20.hpp | 2
   branches/proto/v4/boost/mpl/set/set20_c.hpp | 2
   branches/proto/v4/boost/mpl/set/set30.hpp | 2
   branches/proto/v4/boost/mpl/set/set30_c.hpp | 2
   branches/proto/v4/boost/mpl/set/set40.hpp | 2
   branches/proto/v4/boost/mpl/set/set40_c.hpp | 2
   branches/proto/v4/boost/mpl/set/set50.hpp | 2
   branches/proto/v4/boost/mpl/set/set50_c.hpp | 2
   branches/proto/v4/boost/mpl/set_c.hpp | 2
   branches/proto/v4/boost/mpl/shift_left.hpp | 2
   branches/proto/v4/boost/mpl/shift_right.hpp | 2
   branches/proto/v4/boost/mpl/single_view.hpp | 2
   branches/proto/v4/boost/mpl/size.hpp | 2
   branches/proto/v4/boost/mpl/size_fwd.hpp | 2
   branches/proto/v4/boost/mpl/size_t.hpp | 2
   branches/proto/v4/boost/mpl/size_t_fwd.hpp | 2
   branches/proto/v4/boost/mpl/sizeof.hpp | 2
   branches/proto/v4/boost/mpl/sort.hpp | 2
   branches/proto/v4/boost/mpl/stable_partition.hpp | 2
   branches/proto/v4/boost/mpl/switch.hpp | 2
   branches/proto/v4/boost/mpl/tag.hpp | 2
   branches/proto/v4/boost/mpl/times.hpp | 2
   branches/proto/v4/boost/mpl/transform.hpp | 2
   branches/proto/v4/boost/mpl/transform_view.hpp | 2
   branches/proto/v4/boost/mpl/unique.hpp | 2
   branches/proto/v4/boost/mpl/unpack_args.hpp | 2
   branches/proto/v4/boost/mpl/upper_bound.hpp | 4
   branches/proto/v4/boost/mpl/value_type.hpp | 2
   branches/proto/v4/boost/mpl/value_type_fwd.hpp | 2
   branches/proto/v4/boost/mpl/vector.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/O1_size.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/at.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/back.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/begin_end.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/clear.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/empty.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/front.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/include_preprocessed.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/item.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/iterator.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/numbered.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/numbered_c.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/pop_back.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/pop_front.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/push_back.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/push_front.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/size.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/tag.hpp | 2
   branches/proto/v4/boost/mpl/vector/aux_/vector0.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector0.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector0_c.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector10.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector10_c.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector20.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector20_c.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector30.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector30_c.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector40.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector40_c.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector50.hpp | 2
   branches/proto/v4/boost/mpl/vector/vector50_c.hpp | 2
   branches/proto/v4/boost/mpl/vector_c.hpp | 5
   branches/proto/v4/boost/mpl/void.hpp | 2
   branches/proto/v4/boost/mpl/void_fwd.hpp | 2
   branches/proto/v4/boost/mpl/zip_view.hpp | 2
   branches/proto/v4/boost/nondet_random.hpp | 2
   branches/proto/v4/boost/numeric/conversion/converter_policies.hpp | 2
   branches/proto/v4/boost/numeric/interval/arith2.hpp | 2
   branches/proto/v4/boost/numeric/interval/detail/bugs.hpp | 2
   branches/proto/v4/boost/numeric/interval/rounded_arith.hpp | 2
   branches/proto/v4/boost/numeric/interval/rounded_transc.hpp | 2
   branches/proto/v4/boost/numeric/ublas/traits.hpp | 2
   branches/proto/v4/boost/pending/fibonacci_heap.hpp | 2
   branches/proto/v4/boost/pending/property.hpp | 6
   branches/proto/v4/boost/random/binomial_distribution.hpp | 2
   branches/proto/v4/boost/random/cauchy_distribution.hpp | 2
   branches/proto/v4/boost/random/exponential_distribution.hpp | 2
   branches/proto/v4/boost/random/gamma_distribution.hpp | 2
   branches/proto/v4/boost/random/geometric_distribution.hpp | 2
   branches/proto/v4/boost/random/lagged_fibonacci.hpp | 4
   branches/proto/v4/boost/random/lognormal_distribution.hpp | 2
   branches/proto/v4/boost/random/normal_distribution.hpp | 2
   branches/proto/v4/boost/random/poisson_distribution.hpp | 2
   branches/proto/v4/boost/random/subtract_with_carry.hpp | 4
   branches/proto/v4/boost/random/triangle_distribution.hpp | 2
   branches/proto/v4/boost/serialization/array.hpp | 4
   branches/proto/v4/boost/serialization/extended_type_info_typeid.hpp | 2
   branches/proto/v4/boost/serialization/optional.hpp | 4
   branches/proto/v4/boost/serialization/singleton.hpp | 32
   branches/proto/v4/boost/serialization/slist.hpp | 2
   branches/proto/v4/boost/serialization/static_warning.hpp | 2
   branches/proto/v4/boost/serialization/vector.hpp | 12
   branches/proto/v4/boost/spirit/home/classic/core/parser.hpp | 2
   branches/proto/v4/boost/spirit/home/classic/core/primitives/impl/numerics.ipp | 2
   branches/proto/v4/boost/spirit/home/classic/iterator/impl/position_iterator.ipp | 3
   branches/proto/v4/boost/spirit/home/classic/iterator/position_iterator.hpp | 18
   branches/proto/v4/boost/spirit/home/karma/auxiliary/meta_grammar.hpp | 2
   branches/proto/v4/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp | 4
   branches/proto/v4/boost/spirit/home/karma/numeric/real.hpp | 2
   branches/proto/v4/boost/spirit/home/karma/numeric/real_policies.hpp | 2
   branches/proto/v4/boost/spirit/home/phoenix/scope/lambda.hpp | 1
   branches/proto/v4/boost/spirit/home/phoenix/scope/let.hpp | 1
   branches/proto/v4/boost/spirit/home/qi/auxiliary/meta_grammar.hpp | 2
   branches/proto/v4/boost/spirit/home/qi/numeric/detail/real_impl.hpp | 2
   branches/proto/v4/boost/spirit/home/qi/operator/difference.hpp | 10
   branches/proto/v4/boost/spirit/home/qi/operator/list.hpp | 4
   branches/proto/v4/boost/spirit/home/support/auxiliary/confix.hpp | 10
   branches/proto/v4/boost/spirit/home/support/detail/lexer/parser/tokeniser/num_token.hpp | 7
   branches/proto/v4/boost/spirit/home/support/detail/math/fpclassify.hpp | 2
   branches/proto/v4/boost/spirit/home/support/detail/what_function.hpp | 2
   branches/proto/v4/boost/system/error_code.hpp | 24
   branches/proto/v4/boost/test/impl/plain_report_formatter.ipp | 2
   branches/proto/v4/boost/token_functions.hpp | 2
   branches/proto/v4/boost/tr1/complex.hpp | 2
   branches/proto/v4/boost/type_traits/add_pointer.hpp | 2
   branches/proto/v4/boost/type_traits/config.hpp | 2
   branches/proto/v4/boost/type_traits/extent.hpp | 13
   branches/proto/v4/boost/type_traits/intrinsics.hpp | 29
   branches/proto/v4/boost/type_traits/is_arithmetic.hpp | 8
   branches/proto/v4/boost/type_traits/is_array.hpp | 5
   branches/proto/v4/boost/type_traits/is_base_and_derived.hpp | 4
   branches/proto/v4/boost/type_traits/is_compound.hpp | 6
   branches/proto/v4/boost/type_traits/is_const.hpp | 8
   branches/proto/v4/boost/type_traits/is_function.hpp | 10
   branches/proto/v4/boost/type_traits/is_fundamental.hpp | 4
   branches/proto/v4/boost/type_traits/is_integral.hpp | 5
   branches/proto/v4/boost/type_traits/is_member_function_pointer.hpp | 4
   branches/proto/v4/boost/type_traits/is_member_pointer.hpp | 4
   branches/proto/v4/boost/type_traits/is_pointer.hpp | 4
   branches/proto/v4/boost/type_traits/is_reference.hpp | 6
   branches/proto/v4/boost/type_traits/is_signed.hpp | 8
   branches/proto/v4/boost/type_traits/is_unsigned.hpp | 9
   branches/proto/v4/boost/type_traits/is_void.hpp | 5
   branches/proto/v4/boost/type_traits/is_volatile.hpp | 6
   branches/proto/v4/boost/type_traits/rank.hpp | 8
   branches/proto/v4/boost/type_traits/remove_all_extents.hpp | 2
   branches/proto/v4/boost/type_traits/remove_bounds.hpp | 2
   branches/proto/v4/boost/type_traits/remove_extent.hpp | 2
   branches/proto/v4/boost/type_traits/remove_reference.hpp | 2
   branches/proto/v4/boost/type_traits/type_with_alignment.hpp | 2
   branches/proto/v4/boost/units/cmath.hpp | 2
   branches/proto/v4/boost/units/detail/cmath_boost_1_35.hpp | 2
   branches/proto/v4/boost/units/detail/cmath_gnu_impl.hpp | 2
   branches/proto/v4/boost/units/detail/cmath_gnu_impl_boost_1_35.hpp | 2
   branches/proto/v4/boost/units/detail/cmath_msvc_impl.hpp | 2
   branches/proto/v4/boost/units/detail/cmath_msvc_impl_boost_1_35.hpp | 2
   branches/proto/v4/boost/units/detail/cmath_mwcw_impl.hpp | 2
   branches/proto/v4/boost/units/detail/cmath_mwcw_impl_boost_1_35.hpp | 2
   branches/proto/v4/boost/units/detail/static_rational_power.hpp | 2
   branches/proto/v4/boost/units/systems/angle/degrees.hpp | 2
   branches/proto/v4/boost/units/systems/angle/gradians.hpp | 2
   branches/proto/v4/boost/units/systems/angle/revolutions.hpp | 2
   branches/proto/v4/boost/units/systems/detail/constants.hpp | 2
   branches/proto/v4/boost/unordered/detail/hash_table.hpp | 2
   branches/proto/v4/boost/wave/cpplexer/cpp_lex_iterator.hpp | 20
   branches/proto/v4/boost/xpressive/basic_regex.hpp | 10
   branches/proto/v4/boost/xpressive/detail/core/matcher/action_matcher.hpp | 4
   branches/proto/v4/boost/xpressive/detail/core/matcher/lookbehind_matcher.hpp | 2
   branches/proto/v4/boost/xpressive/detail/core/matcher/regex_byref_matcher.hpp | 2
   branches/proto/v4/boost/xpressive/detail/core/matcher/regex_matcher.hpp | 2
   branches/proto/v4/boost/xpressive/detail/dynamic/dynamic.hpp | 2
   branches/proto/v4/boost/xpressive/detail/dynamic/matchable.hpp | 2
   branches/proto/v4/boost/xpressive/detail/dynamic/parse_charset.hpp | 32
   branches/proto/v4/boost/xpressive/detail/dynamic/parser_traits.hpp | 36
   branches/proto/v4/boost/xpressive/match_results.hpp | 32
   branches/proto/v4/boost/xpressive/regex_actions.hpp | 8
   branches/proto/v4/boost/xpressive/regex_compiler.hpp | 32
   branches/proto/v4/boost/xpressive/regex_error.hpp | 29
   branches/proto/v4/index.html | 7
   branches/proto/v4/libs/asio/doc/overview/basics.qbk | 2
   branches/proto/v4/libs/asio/example/local/Jamfile | 12
   branches/proto/v4/libs/asio/example/local/Jamfile.v2 | 15
   branches/proto/v4/libs/config/test/boost_no_nested_friendship.ipp | 7
   branches/proto/v4/libs/config/test/boost_no_typename_with_ctor.ipp | 7
   branches/proto/v4/libs/config/tools/generate.cpp | 6
   branches/proto/v4/libs/dynamic_bitset/dynamic_bitset.html | 90
   branches/proto/v4/libs/filesystem/doc/index.htm | 211 ++
   branches/proto/v4/libs/filesystem/doc/reference.html | 6
   branches/proto/v4/libs/filesystem/example/mbpath.cpp | 2
   branches/proto/v4/libs/filesystem/example/mbpath.hpp | 1
   branches/proto/v4/libs/filesystem/src/operations.cpp | 2
   branches/proto/v4/libs/filesystem/test/lpath.hpp | 1
   branches/proto/v4/libs/filesystem/test/msvc/mbcopy/mbcopy.vcproj | 8
   branches/proto/v4/libs/filesystem/test/operations_test.cpp | 71
   branches/proto/v4/libs/functional/hash/doc/changes.qbk | 11
   branches/proto/v4/libs/functional/hash/test/Jamfile.v2 | 2
   branches/proto/v4/libs/graph/test/Jamfile.v2 | 2
   branches/proto/v4/libs/interprocess/doc/interprocess.qbk | 214 +-
   branches/proto/v4/libs/interprocess/example/doc_contB.cpp | 2
   branches/proto/v4/libs/interprocess/example/doc_ipc_messageA.cpp | 2
   branches/proto/v4/libs/interprocess/example/doc_ipc_messageB.cpp | 2
   branches/proto/v4/libs/interprocess/example/doc_managed_aligned_allocation.cpp | 6
   branches/proto/v4/libs/interprocess/example/doc_managed_copy_on_write.cpp | 2
   branches/proto/v4/libs/interprocess/example/doc_managed_external_buffer.cpp | 2
   branches/proto/v4/libs/interprocess/example/doc_named_allocA.cpp | 2
   branches/proto/v4/libs/interprocess/example/doc_named_allocB.cpp | 2
   branches/proto/v4/libs/interprocess/example/doc_offset_ptr.cpp | 2
   branches/proto/v4/libs/interprocess/example/doc_shared_memory2.cpp | 1
   branches/proto/v4/libs/interprocess/proj/vc7ide/Interprocess.sln | 10
   branches/proto/v4/libs/interprocess/proj/vc7ide/interprocesslib.vcproj | 21
   branches/proto/v4/libs/interprocess/test/allocator_v1.hpp | 2
   branches/proto/v4/libs/interprocess/test/cached_node_allocator_test.cpp | 2
   branches/proto/v4/libs/interprocess/test/deque_test.cpp | 122 +
   branches/proto/v4/libs/interprocess/test/expand_bwd_test_template.hpp | 10
   branches/proto/v4/libs/interprocess/test/flat_tree_test.cpp | 38
   branches/proto/v4/libs/interprocess/test/intersegment_ptr_test.cpp | 15
   branches/proto/v4/libs/interprocess/test/list_test.cpp | 19
   branches/proto/v4/libs/interprocess/test/list_test.hpp | 1
   branches/proto/v4/libs/interprocess/test/managed_mapped_file_test.cpp | 3
   branches/proto/v4/libs/interprocess/test/memory_algorithm_test_template.hpp | 18
   branches/proto/v4/libs/interprocess/test/movable_int.hpp | 6
   branches/proto/v4/libs/interprocess/test/mutex_test_template.hpp | 6
   branches/proto/v4/libs/interprocess/test/node_allocator_test.cpp | 2
   branches/proto/v4/libs/interprocess/test/private_node_allocator_test.cpp | 2
   branches/proto/v4/libs/interprocess/test/semaphore_test_template.hpp | 6
   branches/proto/v4/libs/interprocess/test/sharable_mutex_test_template.hpp | 40
   branches/proto/v4/libs/interprocess/test/shared_memory_mapping_test.cpp | 4
   branches/proto/v4/libs/interprocess/test/shared_ptr_test.cpp | 2
   branches/proto/v4/libs/interprocess/test/slist_test.cpp | 31
   branches/proto/v4/libs/interprocess/test/tree_test.cpp | 62
   branches/proto/v4/libs/interprocess/test/user_buffer_test.cpp | 2
   branches/proto/v4/libs/interprocess/test/vector_test.cpp | 18
   branches/proto/v4/libs/interprocess/test/vector_test.hpp | 37
   branches/proto/v4/libs/interprocess/test/windows_shared_memory_mapping_test.cpp | 4
   branches/proto/v4/libs/intrusive/doc/intrusive.qbk | 52
   branches/proto/v4/libs/intrusive/example/doc_window.cpp | 2
   branches/proto/v4/libs/intrusive/proj/vc7ide/_intrusivelib/_intrusivelib.vcproj | 3
   branches/proto/v4/libs/intrusive/proj/vc7ide/unordered_set/unordered_set.vcproj | 5
   branches/proto/v4/libs/intrusive/test/default_hook_test.cpp | 37
   branches/proto/v4/libs/intrusive/test/list_test.cpp | 310 +++
   branches/proto/v4/libs/intrusive/test/set_test.cpp | 1
   branches/proto/v4/libs/intrusive/test/sg_multiset_test.cpp | 12
   branches/proto/v4/libs/intrusive/test/sg_set_test.cpp | 12
   branches/proto/v4/libs/intrusive/test/splay_multiset_test.cpp | 37
   branches/proto/v4/libs/intrusive/test/splay_set_test.cpp | 36
   branches/proto/v4/libs/intrusive/test/test_macros.hpp | 5
   branches/proto/v4/libs/intrusive/test/unordered_multiset_test.cpp | 390 +++
   branches/proto/v4/libs/intrusive/test/unordered_set_test.cpp | 297 ++
   branches/proto/v4/libs/libraries.htm | 1
   branches/proto/v4/libs/math/minimax/f.cpp | 2
   branches/proto/v4/libs/math/src/tr1/llround.cpp | 5
   branches/proto/v4/libs/math/src/tr1/llroundf.cpp | 6
   branches/proto/v4/libs/math/src/tr1/llroundl.cpp | 5
   branches/proto/v4/libs/math/test/Jamfile.v2 | 1
   branches/proto/v4/libs/math/test/acosh_data.ipp | 7
   branches/proto/v4/libs/math/test/asinh_data.ipp | 7
   branches/proto/v4/libs/math/test/atanh_data.ipp | 7
   branches/proto/v4/libs/mpl/example/fsm/aux_/STT_impl_gen.hpp | 2
   branches/proto/v4/libs/mpl/example/fsm/aux_/base_event.hpp | 2
   branches/proto/v4/libs/mpl/example/fsm/aux_/event.hpp | 2
   branches/proto/v4/libs/mpl/example/fsm/aux_/state.hpp | 2
   branches/proto/v4/libs/mpl/example/fsm/aux_/transition.hpp | 2
   branches/proto/v4/libs/mpl/example/fsm/player.cpp | 2
   branches/proto/v4/libs/mpl/example/fsm/state_machine.hpp | 2
   branches/proto/v4/libs/mpl/example/inherit_linearly.cpp | 2
   branches/proto/v4/libs/mpl/example/inherit_multiply.cpp | 2
   branches/proto/v4/libs/mpl/example/integer.cpp | 2
   branches/proto/v4/libs/mpl/example/tuple_from_list.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/include/bcc/user.hpp | 5
   branches/proto/v4/libs/mpl/preprocessed/include/bcc551/user.hpp | 2
   branches/proto/v4/libs/mpl/preprocessed/include/dmc/user.hpp | 2
   branches/proto/v4/libs/mpl/preprocessed/include/gcc/user.hpp | 2
   branches/proto/v4/libs/mpl/preprocessed/include/msvc60/user.hpp | 2
   branches/proto/v4/libs/mpl/preprocessed/include/msvc70/user.hpp | 2
   branches/proto/v4/libs/mpl/preprocessed/include/mwcw/user.hpp | 2
   branches/proto/v4/libs/mpl/preprocessed/include/no_ctps/user.hpp | 2
   branches/proto/v4/libs/mpl/preprocessed/include/no_ttp/user.hpp | 2
   branches/proto/v4/libs/mpl/preprocessed/include/plain/user.hpp | 2
   branches/proto/v4/libs/mpl/preprocessed/include/typeof_based/user.hpp | 2
   branches/proto/v4/libs/mpl/preprocessed/list/list10.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/list/list10_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/list/list20.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/list/list20_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/list/list30.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/list/list30_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/list/list40.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/list/list40_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/list/list50.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/list/list50_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/map/map10.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/map/map20.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/map/map30.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/map/map40.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/map/map50.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/pp.py | 6
   branches/proto/v4/libs/mpl/preprocessed/preprocess.py | 2
   branches/proto/v4/libs/mpl/preprocessed/preprocess_list.py | 2
   branches/proto/v4/libs/mpl/preprocessed/preprocess_map.py | 2
   branches/proto/v4/libs/mpl/preprocessed/preprocess_set.py | 2
   branches/proto/v4/libs/mpl/preprocessed/preprocess_vector.py | 2
   branches/proto/v4/libs/mpl/preprocessed/set/set10.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/set/set10_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/set/set20.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/set/set20_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/set/set30.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/set/set30_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/set/set40.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/set/set40_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/set/set50.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/set/set50_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/advance_backward.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/advance_forward.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/and.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/apply.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/apply_fwd.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/apply_wrap.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/arg.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/basic_bind.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/bind.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/bind_fwd.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/bitand.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/bitor.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/bitxor.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/deque.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/divides.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/equal_to.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/fold_impl.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/full_lambda.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/greater.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/greater_equal.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/inherit.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/iter_fold_if_impl.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/iter_fold_impl.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/lambda_no_ctps.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/less.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/less_equal.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/list.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/list_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/map.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/minus.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/modulus.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/not_equal_to.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/or.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/placeholders.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/plus.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/quote.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/reverse_fold_impl.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/reverse_iter_fold_impl.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/set.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/set_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/shift_left.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/shift_right.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/template_arity.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/times.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/unpack_args.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/vector.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/src/vector_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/vector/vector10.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/vector/vector10_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/vector/vector20.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/vector/vector20_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/vector/vector30.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/vector/vector30_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/vector/vector40.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/vector/vector40_c.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/vector/vector50.cpp | 2
   branches/proto/v4/libs/mpl/preprocessed/vector/vector50_c.cpp | 2
   branches/proto/v4/libs/mpl/test/advance.cpp | 2
   branches/proto/v4/libs/mpl/test/always.cpp | 2
   branches/proto/v4/libs/mpl/test/apply.cpp | 2
   branches/proto/v4/libs/mpl/test/apply_wrap.cpp | 2
   branches/proto/v4/libs/mpl/test/arithmetic.cpp | 2
   branches/proto/v4/libs/mpl/test/as_sequence.cpp | 2
   branches/proto/v4/libs/mpl/test/assert.cpp | 2
   branches/proto/v4/libs/mpl/test/at.cpp | 2
   branches/proto/v4/libs/mpl/test/aux_/largest_int.cpp | 2
   branches/proto/v4/libs/mpl/test/aux_/msvc_is_class.cpp | 2
   branches/proto/v4/libs/mpl/test/aux_/preprocessor/is_seq.cpp | 2
   branches/proto/v4/libs/mpl/test/aux_/preprocessor/token_equal.cpp | 2
   branches/proto/v4/libs/mpl/test/aux_/template_arity.cpp | 2
   branches/proto/v4/libs/mpl/test/back.cpp | 2
   branches/proto/v4/libs/mpl/test/bind.cpp | 2
   branches/proto/v4/libs/mpl/test/bitwise.cpp | 2
   branches/proto/v4/libs/mpl/test/bool.cpp | 2
   branches/proto/v4/libs/mpl/test/comparison.cpp | 2
   branches/proto/v4/libs/mpl/test/contains.cpp | 2
   branches/proto/v4/libs/mpl/test/copy.cpp | 2
   branches/proto/v4/libs/mpl/test/copy_if.cpp | 2
   branches/proto/v4/libs/mpl/test/count.cpp | 2
   branches/proto/v4/libs/mpl/test/count_if.cpp | 2
   branches/proto/v4/libs/mpl/test/deque.cpp | 2
   branches/proto/v4/libs/mpl/test/distance.cpp | 2
   branches/proto/v4/libs/mpl/test/empty.cpp | 2
   branches/proto/v4/libs/mpl/test/empty_sequence.cpp | 2
   branches/proto/v4/libs/mpl/test/equal.cpp | 2
   branches/proto/v4/libs/mpl/test/erase.cpp | 2
   branches/proto/v4/libs/mpl/test/erase_range.cpp | 2
   branches/proto/v4/libs/mpl/test/eval_if.cpp | 2
   branches/proto/v4/libs/mpl/test/filter_view.cpp | 2
   branches/proto/v4/libs/mpl/test/find.cpp | 2
   branches/proto/v4/libs/mpl/test/find_if.cpp | 2
   branches/proto/v4/libs/mpl/test/fold.cpp | 2
   branches/proto/v4/libs/mpl/test/for_each.cpp | 2
   branches/proto/v4/libs/mpl/test/front.cpp | 2
   branches/proto/v4/libs/mpl/test/has_xxx.cpp | 2
   branches/proto/v4/libs/mpl/test/identity.cpp | 2
   branches/proto/v4/libs/mpl/test/if.cpp | 2
   branches/proto/v4/libs/mpl/test/index_of.cpp | 2
   branches/proto/v4/libs/mpl/test/inherit.cpp | 2
   branches/proto/v4/libs/mpl/test/insert.cpp | 2
   branches/proto/v4/libs/mpl/test/insert_range.cpp | 2
   branches/proto/v4/libs/mpl/test/int.cpp | 2
   branches/proto/v4/libs/mpl/test/integral_c.cpp | 2
   branches/proto/v4/libs/mpl/test/integral_wrapper_test.hpp | 2
   branches/proto/v4/libs/mpl/test/is_placeholder.cpp | 2
   branches/proto/v4/libs/mpl/test/is_sequence.cpp | 2
   branches/proto/v4/libs/mpl/test/iterator_tags.cpp | 2
   branches/proto/v4/libs/mpl/test/joint_view.cpp | 2
   branches/proto/v4/libs/mpl/test/lambda.cpp | 2
   branches/proto/v4/libs/mpl/test/lambda_args.cpp | 2
   branches/proto/v4/libs/mpl/test/list.cpp | 2
   branches/proto/v4/libs/mpl/test/list_c.cpp | 2
   branches/proto/v4/libs/mpl/test/logical.cpp | 2
   branches/proto/v4/libs/mpl/test/lower_bound.cpp | 2
   branches/proto/v4/libs/mpl/test/map.cpp | 2
   branches/proto/v4/libs/mpl/test/max_element.cpp | 2
   branches/proto/v4/libs/mpl/test/min_max.cpp | 2
   branches/proto/v4/libs/mpl/test/multiset.cpp | 2
   branches/proto/v4/libs/mpl/test/next.cpp | 2
   branches/proto/v4/libs/mpl/test/no_has_xxx.cpp | 2
   branches/proto/v4/libs/mpl/test/numeric_ops.cpp | 2
   branches/proto/v4/libs/mpl/test/pair_view.cpp | 2
   branches/proto/v4/libs/mpl/test/partition.cpp | 2
   branches/proto/v4/libs/mpl/test/pop_front.cpp | 2
   branches/proto/v4/libs/mpl/test/print.cpp | 2
   branches/proto/v4/libs/mpl/test/push_front.cpp | 2
   branches/proto/v4/libs/mpl/test/quote.cpp | 2
   branches/proto/v4/libs/mpl/test/range_c.cpp | 2
   branches/proto/v4/libs/mpl/test/remove.cpp | 2
   branches/proto/v4/libs/mpl/test/remove_if.cpp | 2
   branches/proto/v4/libs/mpl/test/replace.cpp | 2
   branches/proto/v4/libs/mpl/test/replace_if.cpp | 2
   branches/proto/v4/libs/mpl/test/reverse.cpp | 2
   branches/proto/v4/libs/mpl/test/same_as.cpp | 2
   branches/proto/v4/libs/mpl/test/set.cpp | 2
   branches/proto/v4/libs/mpl/test/set_c.cpp | 2
   branches/proto/v4/libs/mpl/test/single_view.cpp | 2
   branches/proto/v4/libs/mpl/test/size.cpp | 2
   branches/proto/v4/libs/mpl/test/size_t.cpp | 2
   branches/proto/v4/libs/mpl/test/sizeof.cpp | 2
   branches/proto/v4/libs/mpl/test/stable_partition.cpp | 2
   branches/proto/v4/libs/mpl/test/transform.cpp | 2
   branches/proto/v4/libs/mpl/test/transform_view.cpp | 2
   branches/proto/v4/libs/mpl/test/unique.cpp | 2
   branches/proto/v4/libs/mpl/test/unpack_args.cpp | 2
   branches/proto/v4/libs/mpl/test/upper_bound.cpp | 2
   branches/proto/v4/libs/mpl/test/vector.cpp | 2
   branches/proto/v4/libs/mpl/test/vector_c.cpp | 2
   branches/proto/v4/libs/mpl/test/zip_view.cpp | 2
   branches/proto/v4/libs/multi_index/doc/compiler_specifics.html | 38
   branches/proto/v4/libs/proto/doc/calculator.qbk | 54
   branches/proto/v4/libs/proto/doc/examples.qbk | 79
   branches/proto/v4/libs/proto/doc/glossary.qbk | 6
   branches/proto/v4/libs/proto/doc/installation.qbk | 15
   branches/proto/v4/libs/proto/doc/preface.qbk | 6
   branches/proto/v4/libs/proto/doc/propdocs.sh | 7
   branches/proto/v4/libs/proto/doc/proto.qbk | 87
   branches/proto/v4/libs/proto/doc/resources.qbk | 2
   branches/proto/v4/libs/proto/example/calc2.cpp | 4
   branches/proto/v4/libs/proto/example/map_assign.cpp | 2
   branches/proto/v4/libs/proto/example/mixed.cpp | 2
   branches/proto/v4/libs/proto/example/rgb.cpp | 2
   branches/proto/v4/libs/proto/example/vector.cpp | 2
   branches/proto/v4/libs/regex/build/bcb6.mak | 1125 ++++++------
   branches/proto/v4/libs/regex/build/gcc-shared.mak | 168
   branches/proto/v4/libs/regex/build/gcc.mak | 172
   branches/proto/v4/libs/regex/build/vc6-stlport.mak | 555 +++---
   branches/proto/v4/libs/regex/build/vc6.mak | 737 ++++----
   branches/proto/v4/libs/regex/build/vc7-stlport.mak | 555 +++---
   branches/proto/v4/libs/regex/build/vc7.mak | 737 ++++----
   branches/proto/v4/libs/regex/build/vc71-stlport.mak | 555 +++---
   branches/proto/v4/libs/regex/build/vc71.mak | 737 ++++----
   branches/proto/v4/libs/regex/build/vc8.mak | 551 +++---
   branches/proto/v4/libs/regex/build/vc_gen.sh | 21
   branches/proto/v4/libs/regex/src/usinstances.cpp | 3
   branches/proto/v4/libs/regex/src/wc_regex_traits.cpp | 3
   branches/proto/v4/libs/serialization/build/Jamfile.v2 | 6
   branches/proto/v4/libs/serialization/doc/contents.html | 4
   branches/proto/v4/libs/serialization/doc/release.html | 8
   branches/proto/v4/libs/serialization/doc/todo.html | 2
   branches/proto/v4/libs/serialization/doc/traits.html | 30
   branches/proto/v4/libs/serialization/src/basic_xml_grammar.ipp | 7
   branches/proto/v4/libs/serialization/src/extended_type_info.cpp | 2
   branches/proto/v4/libs/serialization/vc7ide/BoostSerializationLibrary.sln | 42
   branches/proto/v4/libs/serialization/vc7ide/Library.vcproj | 3
   branches/proto/v4/libs/serialization/vc7ide/test_delete_pointer.vcproj | 1707 -------------------
   branches/proto/v4/libs/serialization/vc7ide/test_diamond.vcproj | 1709 -------------------
   branches/proto/v4/libs/serialization/vc7ide/test_exported.vcproj | 1724 -------------------
   branches/proto/v4/libs/serialization/vc7ide/test_private_ctor.vcproj | 413 ----
   branches/proto/v4/libs/serialization/vc7ide/test_reset_object_addr.vcproj | 417 ----
   branches/proto/v4/libs/serialization/vc7ide/test_simple_class.vcproj | 1721 -------------------
   branches/proto/v4/libs/spirit/classic/test/position_iterator_tests.cpp | 60
   branches/proto/v4/libs/system/doc/reference.html | 143 +
   branches/proto/v4/libs/system/src/error_code.cpp | 7
   branches/proto/v4/libs/test/test/sync_access_test.cpp | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/background.html | 22
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/category/transform.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/category/value_traits/primary.html | 26
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/credits.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/intrinsics.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/add_const.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/add_cv.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/add_pointer.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/add_reference.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/add_volatile.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/decay.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/floating_point_promotion.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/function_traits.html | 4
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/integral_promotion.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/make_signed.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/make_unsigned.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/promote.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/remove_all_extents.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/remove_const.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/remove_cv.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/remove_extent.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/remove_pointer.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/remove_reference.html | 2
   branches/proto/v4/libs/type_traits/doc/html/boost_typetraits/reference/remove_volatile.html | 2
   branches/proto/v4/libs/type_traits/doc/html/index.html | 2
   branches/proto/v4/libs/type_traits/doc/value_traits.qbk | 26
   branches/proto/v4/libs/wave/ChangeLog | 3515 ++++++++++++++++++++-------------------
   branches/proto/v4/libs/wave/build/Jamfile.v2 | 4
   branches/proto/v4/libs/wave/doc/class_ref_ctxpolicy_depr.html | 2
   branches/proto/v4/libs/wave/doc/class_reference_context.html | 845 ++++----
   branches/proto/v4/libs/wave/doc/class_reference_ctxpolicy.html | 409 +--
   branches/proto/v4/libs/wave/doc/class_reference_filepos.html | 4
   branches/proto/v4/libs/wave/doc/class_reference_inptpolcy.html | 4
   branches/proto/v4/libs/wave/doc/class_reference_lexer.html | 6
   branches/proto/v4/libs/wave/doc/class_reference_tokentype.html | 4
   branches/proto/v4/libs/wave/doc/compiletime_config.html | 8
   branches/proto/v4/libs/wave/doc/preface.html | 130 +
   branches/proto/v4/libs/wave/doc/quickstart.html | 10
   branches/proto/v4/libs/wave/doc/wave_driver.html | 6
   branches/proto/v4/libs/wave/index.html | 186 +-
   branches/proto/v4/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp | 6
   branches/proto/v4/libs/wave/samples/cpp_tokens/slex_iterator.hpp | 30
   branches/proto/v4/libs/wave/samples/list_includes/lexertl/lexertl_lexer.hpp | 14
   branches/proto/v4/libs/wave/samples/list_includes/lexertl_iterator.hpp | 115
   branches/proto/v4/libs/wave/samples/preprocess_pragma_output/example.cpp | 2
   branches/proto/v4/libs/wave/samples/quick_start/quick_start.cpp | 12
   branches/proto/v4/libs/wave/samples/waveidl/idllexer/idl_re.cpp | 2718 +++++++++++++++---------------
   branches/proto/v4/more/getting_started/detail/release-variables.rst | 6
   branches/proto/v4/more/getting_started/index.html | 27
   branches/proto/v4/more/getting_started/unix-variants.html | 252 +-
   branches/proto/v4/more/getting_started/windows.html | 327 +-
   branches/proto/v4/status/explicit-failures-markup.xml | 23
   branches/proto/v4/tools/bcp/bcp_imp.cpp | 10
   branches/proto/v4/tools/bcp/main.cpp | 19
   branches/proto/v4/tools/build/v2/build-system.jam | 4
   branches/proto/v4/tools/build/v2/kernel/errors.jam | 4
   branches/proto/v4/tools/build/v2/tools/boostbook-config.jam | 8
   branches/proto/v4/tools/build/v2/tools/boostbook.jam | 2
   branches/proto/v4/tools/build/v2/tools/intel-linux.jam | 10
   branches/proto/v4/tools/build/v2/tools/python.jam | 2
   branches/proto/v4/tools/inspect/inspect.cpp | 24
   branches/proto/v4/tools/quickbook/detail/template_stack.hpp | 3
   branches/proto/v4/tools/quickbook/detail/utils.cpp | 21
   branches/proto/v4/tools/release/build_release_packages.sh | 3
   branches/proto/v4/tools/release/inspect.sh | 10
   branches/proto/v4/tools/release/snapshot_posix.sh | 41
   branches/proto/v4/tools/release/snapshot_windows.sh | 44
   branches/proto/v4/tools/wave/build/Jamfile.v2 | 5
   1164 files changed, 17312 insertions(+), 19877 deletions(-)

Modified: branches/proto/v4/Jamroot
==============================================================================
--- branches/proto/v4/Jamroot (original)
+++ branches/proto/v4/Jamroot 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -367,9 +367,12 @@
 }
 
 local headers =
- [ path.glob-tree $(BOOST_ROOT)/boost : *.hpp *.ipp *.h *.inc : CVS .svn ]
- [ path.glob-tree $(BOOST_ROOT)/boost/compatibility/cpp_c_headers : c* : CVS
- .svn ] ;
+ # The .SUNWCCh files are present in tr1 include directory and have to be installed,
+ # see http://lists.boost.org/Archives/boost/2007/05/121430.php
+ [ path.glob-tree $(BOOST_ROOT)/boost : *.hpp *.ipp *.h *.inc *.SUNWCCh : CVS .svn ]
+ [ path.glob-tree $(BOOST_ROOT)/boost/compatibility/cpp_c_headers : c* : CVS .svn ]
+ [ path.glob boost/tr1/tr1 : * : bcc32 sun CVS .svn ]
+ ;
 
 # Complete install.
 package.install install-proper
@@ -487,7 +490,7 @@
 rule boost-install ( libraries * )
 {
     package.install install
- : <dependency>/boost//install-headers $(install-requirements)
+ : <dependency>/boost//install-proper-headers $(install-requirements)
         : # No binaries
         : $(libraries)
         : # No headers, it is handled by the dependency.

Modified: branches/proto/v4/boost/accumulators/statistics/moment.hpp
==============================================================================
--- branches/proto/v4/boost/accumulators/statistics/moment.hpp (original)
+++ branches/proto/v4/boost/accumulators/statistics/moment.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -8,7 +8,7 @@
 #ifndef BOOST_ACCUMULATORS_STATISTICS_MOMENT_HPP_EAN_15_11_2005
 #define BOOST_ACCUMULATORS_STATISTICS_MOMENT_HPP_EAN_15_11_2005
 
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/placeholders.hpp>

Modified: branches/proto/v4/boost/accumulators/statistics/peaks_over_threshold.hpp
==============================================================================
--- branches/proto/v4/boost/accumulators/statistics/peaks_over_threshold.hpp (original)
+++ branches/proto/v4/boost/accumulators/statistics/peaks_over_threshold.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -12,7 +12,7 @@
 #include <limits>
 #include <numeric>
 #include <functional>
-#include <cmath> // pow
+#include <boost/config/no_tr1/cmath.hpp> // pow
 #include <sstream> // stringstream
 #include <stdexcept> // runtime_error
 #include <boost/throw_exception.hpp>

Modified: branches/proto/v4/boost/accumulators/statistics/tail_quantile.hpp
==============================================================================
--- branches/proto/v4/boost/accumulators/statistics/tail_quantile.hpp (original)
+++ branches/proto/v4/boost/accumulators/statistics/tail_quantile.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -13,7 +13,7 @@
 #include <functional>
 #include <sstream>
 #include <stdexcept>
-#include <cmath> // For ceil
+#include <boost/config/no_tr1/cmath.hpp> // For ceil
 #include <boost/throw_exception.hpp>
 #include <boost/parameter/keyword.hpp>
 #include <boost/mpl/placeholders.hpp>

Modified: branches/proto/v4/boost/accumulators/statistics/weighted_moment.hpp
==============================================================================
--- branches/proto/v4/boost/accumulators/statistics/weighted_moment.hpp (original)
+++ branches/proto/v4/boost/accumulators/statistics/weighted_moment.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -8,7 +8,7 @@
 #ifndef BOOST_ACCUMULATORS_STATISTICS_WEIGHTED_MOMENT_HPP_EAN_15_11_2005
 #define BOOST_ACCUMULATORS_STATISTICS_WEIGHTED_MOMENT_HPP_EAN_15_11_2005
 
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/placeholders.hpp>

Modified: branches/proto/v4/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- branches/proto/v4/boost/archive/basic_binary_iprimitive.hpp (original)
+++ branches/proto/v4/boost/archive/basic_binary_iprimitive.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -122,9 +122,15 @@
     // we provide an optimized load for all fundamental types
     // typedef serialization::is_bitwise_serializable<mpl::_1>
     // use_array_optimization;
- struct use_array_optimization {
- template <class T>
- struct apply : public serialization::is_bitwise_serializable<T> {};
+ struct use_array_optimization {
+ template <class T>
+ #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
+ struct apply {
+ typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable<T>::type type;
+ };
+ #else
+ struct apply : public boost::serialization::is_bitwise_serializable<T> {};
+ #endif
     };
 
     // the optimized load_array dispatches to load_binary

Modified: branches/proto/v4/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- branches/proto/v4/boost/archive/basic_binary_oprimitive.hpp (original)
+++ branches/proto/v4/boost/archive/basic_binary_oprimitive.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -116,11 +116,17 @@
 
     // we provide an optimized save for all fundamental types
     // typedef serialization::is_bitwise_serializable<mpl::_1>
- // use_array_optimization;
+ // use_array_optimization;
     // workaround without using mpl lambdas
     struct use_array_optimization {
- template <class T>
- struct apply : public boost::serialization::is_bitwise_serializable<T> {};
+ template <class T>
+ #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
+ struct apply {
+ typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable<T>::type type;
+ };
+ #else
+ struct apply : public boost::serialization::is_bitwise_serializable<T> {};
+ #endif
     };
     
 

Modified: branches/proto/v4/boost/archive/basic_text_oprimitive.hpp
==============================================================================
--- branches/proto/v4/boost/archive/basic_text_oprimitive.hpp (original)
+++ branches/proto/v4/boost/archive/basic_text_oprimitive.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -26,7 +26,7 @@
 
 #include <iomanip>
 #include <locale>
-#include <cmath> // isnan
+#include <boost/config/no_tr1/cmath.hpp> // isnan
 #include <cassert>
 #include <cstddef> // size_t
 

Modified: branches/proto/v4/boost/archive/detail/abi_suffix.hpp
==============================================================================
--- branches/proto/v4/boost/archive/detail/abi_suffix.hpp (original)
+++ branches/proto/v4/boost/archive/detail/abi_suffix.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -8,12 +8,12 @@
 
 // See http://www.boost.org for updates, documentation, and revision history.
 
-#if defined( __BORLANDC__ )
-#pragma nopushoptwarn
-#endif
-
 #ifdef BOOST_MSVC
 #pragma warning(pop)
 #endif
 #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
+#if defined( __BORLANDC__ )
+#pragma nopushoptwarn
+#endif
+

Modified: branches/proto/v4/boost/archive/impl/basic_xml_grammar.hpp
==============================================================================
--- branches/proto/v4/boost/archive/impl/basic_xml_grammar.hpp (original)
+++ branches/proto/v4/boost/archive/impl/basic_xml_grammar.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -64,7 +64,13 @@
 #define arg xarg
 #endif
 
+// spirit stuff
+#if (defined __BORLANDC__) && (__BORLANDC__ < 0x593) \
+ || (defined _MSC_VER) && (_MSC_VER <= 1300)
 #include <boost/spirit/utility/chset.hpp>
+#else
+#include <boost/spirit/include/classic_chset.hpp>
+#endif
 
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
 #undef arg

Modified: branches/proto/v4/boost/archive/iterators/base64_from_binary.hpp
==============================================================================
--- branches/proto/v4/boost/archive/iterators/base64_from_binary.hpp (original)
+++ branches/proto/v4/boost/archive/iterators/base64_from_binary.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -18,7 +18,14 @@
 
 #include <cassert>
 
+#include <cstddef> // size_t
 #include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+ using ::size_t;
+} // namespace std
+#endif
+
 #include <boost/serialization/pfto.hpp>
 
 #include <boost/iterator/transform_iterator.hpp>
@@ -43,7 +50,7 @@
             "0123456789"
             "+/";
         assert(t < 64);
- return lookup_table[t];
+ return lookup_table[static_cast<size_t>(t)];
     }
 };
 

Modified: branches/proto/v4/boost/asio/basic_socket_streambuf.hpp
==============================================================================
--- branches/proto/v4/boost/asio/basic_socket_streambuf.hpp (original)
+++ branches/proto/v4/boost/asio/basic_socket_streambuf.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -248,7 +248,8 @@
       setp(put_buffer_.begin(), put_buffer_.end());
   }
 
- void resolve_and_connect(const typename Protocol::resolver_query& query,
+ template <typename ResolverQuery>
+ void resolve_and_connect(const ResolverQuery& query,
       boost::system::error_code& ec)
   {
     typedef typename Protocol::resolver resolver_type;

Modified: branches/proto/v4/boost/asio/basic_streambuf.hpp
==============================================================================
--- branches/proto/v4/boost/asio/basic_streambuf.hpp (original)
+++ branches/proto/v4/boost/asio/basic_streambuf.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -19,6 +19,7 @@
 
 #include <boost/asio/detail/push_options.hpp>
 #include <algorithm>
+#include <cstring>
 #include <limits>
 #include <memory>
 #include <stdexcept>
@@ -96,6 +97,7 @@
     if (pptr() + n > epptr())
       n = epptr() - pptr();
     pbump(static_cast<int>(n));
+ setg(eback(), gptr(), pptr());
   }
 
   /// Move the start of the get area by the specified number of characters.
@@ -151,7 +153,6 @@
   {
     // Get current stream positions as offsets.
     std::size_t gnext = gptr() - &buffer_[0];
- std::size_t gend = egptr() - &buffer_[0];
     std::size_t pnext = pptr() - &buffer_[0];
     std::size_t pend = epptr() - &buffer_[0];
 
@@ -164,9 +165,8 @@
     // Shift existing contents of get area to start of buffer.
     if (gnext > 0)
     {
- std::rotate(&buffer_[0], &buffer_[0] + gnext, &buffer_[0] + pend);
- gend -= gnext;
       pnext -= gnext;
+ std::memmove(&buffer_[0], &buffer_[0] + gnext, pnext);
     }
 
     // Ensure buffer is large enough to hold at least the specified size.
@@ -174,7 +174,8 @@
     {
       if (n <= max_size_ && pnext <= max_size_ - n)
       {
- buffer_.resize((std::max<std::size_t>)(pnext + n, 1));
+ pend = pnext + n;
+ buffer_.resize((std::max<std::size_t>)(pend, 1));
       }
       else
       {
@@ -183,8 +184,8 @@
     }
 
     // Update stream positions.
- setg(&buffer_[0], &buffer_[0], &buffer_[0] + gend);
- setp(&buffer_[0] + pnext, &buffer_[0] + pnext + n);
+ setg(&buffer_[0], &buffer_[0], &buffer_[0] + pnext);
+ setp(&buffer_[0] + pnext, &buffer_[0] + pend);
   }
 
 private:

Modified: branches/proto/v4/boost/asio/detail/deadline_timer_service.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/deadline_timer_service.hpp (original)
+++ branches/proto/v4/boost/asio/detail/deadline_timer_service.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -64,6 +64,7 @@
         deadline_timer_service<Time_Traits, Timer_Scheduler> >(io_service),
       scheduler_(boost::asio::use_service<Timer_Scheduler>(io_service))
   {
+ scheduler_.init_task();
     scheduler_.add_timer_queue(timer_queue_);
   }
 

Modified: branches/proto/v4/boost/asio/detail/dev_poll_reactor.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/dev_poll_reactor.hpp (original)
+++ branches/proto/v4/boost/asio/detail/dev_poll_reactor.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -123,6 +123,17 @@
     timer_queues_.clear();
   }
 
+ // Initialise the task, but only if the reactor is not in its own thread.
+ void init_task()
+ {
+ if (!Own_Thread)
+ {
+ typedef task_io_service<dev_poll_reactor<Own_Thread> >
+ task_io_service_type;
+ use_service<task_io_service_type>(this->get_io_service()).init_task();
+ }
+ }
+
   // Register a socket with the reactor. Returns 0 on success, system error
   // code on failure.
   int register_descriptor(socket_type, per_descriptor_data&)

Modified: branches/proto/v4/boost/asio/detail/epoll_reactor.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/epoll_reactor.hpp (original)
+++ branches/proto/v4/boost/asio/detail/epoll_reactor.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -124,6 +124,16 @@
     timer_queues_.clear();
   }
 
+ // Initialise the task, but only if the reactor is not in its own thread.
+ void init_task()
+ {
+ if (!Own_Thread)
+ {
+ typedef task_io_service<epoll_reactor<Own_Thread> > task_io_service_type;
+ use_service<task_io_service_type>(this->get_io_service()).init_task();
+ }
+ }
+
   // Register a socket with the reactor. Returns 0 on success, system error
   // code on failure.
   int register_descriptor(socket_type descriptor,

Modified: branches/proto/v4/boost/asio/detail/kqueue_reactor.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/kqueue_reactor.hpp (original)
+++ branches/proto/v4/boost/asio/detail/kqueue_reactor.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -132,6 +132,16 @@
     timer_queues_.clear();
   }
 
+ // Initialise the task, but only if the reactor is not in its own thread.
+ void init_task()
+ {
+ if (!Own_Thread)
+ {
+ typedef task_io_service<kqueue_reactor<Own_Thread> > task_io_service_type;
+ use_service<task_io_service_type>(this->get_io_service()).init_task();
+ }
+ }
+
   // Register a socket with the reactor. Returns 0 on success, system error
   // code on failure.
   int register_descriptor(socket_type, per_descriptor_data& descriptor_data)

Modified: branches/proto/v4/boost/asio/detail/null_thread.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/null_thread.hpp (original)
+++ branches/proto/v4/boost/asio/detail/null_thread.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -39,12 +39,9 @@
   : private noncopyable
 {
 public:
- // The purpose of the thread.
- enum purpose { internal, external };
-
   // Constructor.
   template <typename Function>
- null_thread(Function f, purpose = internal)
+ null_thread(Function f)
   {
     boost::system::system_error e(
         boost::asio::error::operation_not_supported, "thread");

Modified: branches/proto/v4/boost/asio/detail/posix_thread.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/posix_thread.hpp (original)
+++ branches/proto/v4/boost/asio/detail/posix_thread.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -43,12 +43,9 @@
   : private noncopyable
 {
 public:
- // The purpose of the thread.
- enum purpose { internal, external };
-
   // Constructor.
   template <typename Function>
- posix_thread(Function f, purpose = internal)
+ posix_thread(Function f)
     : joined_(false)
   {
     std::auto_ptr<func_base> arg(new func<Function>(f));

Modified: branches/proto/v4/boost/asio/detail/reactive_descriptor_service.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/reactive_descriptor_service.hpp (original)
+++ branches/proto/v4/boost/asio/detail/reactive_descriptor_service.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -82,6 +82,7 @@
         reactive_descriptor_service<Reactor> >(io_service),
       reactor_(boost::asio::use_service<Reactor>(io_service))
   {
+ reactor_.init_task();
   }
 
   // Destroy all user-defined handler objects owned by the service.

Modified: branches/proto/v4/boost/asio/detail/reactive_socket_service.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/reactive_socket_service.hpp (original)
+++ branches/proto/v4/boost/asio/detail/reactive_socket_service.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -110,6 +110,7 @@
         reactive_socket_service<Protocol, Reactor> >(io_service),
       reactor_(boost::asio::use_service<Reactor>(io_service))
   {
+ reactor_.init_task();
   }
 
   // Destroy all user-defined handler objects owned by the service.

Modified: branches/proto/v4/boost/asio/detail/select_reactor.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/select_reactor.hpp (original)
+++ branches/proto/v4/boost/asio/detail/select_reactor.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -111,6 +111,16 @@
     timer_queues_.clear();
   }
 
+ // Initialise the task, but only if the reactor is not in its own thread.
+ void init_task()
+ {
+ if (!Own_Thread)
+ {
+ typedef task_io_service<select_reactor<Own_Thread> > task_io_service_type;
+ use_service<task_io_service_type>(this->get_io_service()).init_task();
+ }
+ }
+
   // Register a socket with the reactor. Returns 0 on success, system error
   // code on failure.
   int register_descriptor(socket_type, per_descriptor_data&)

Modified: branches/proto/v4/boost/asio/detail/service_registry.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/service_registry.hpp (original)
+++ branches/proto/v4/boost/asio/detail/service_registry.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -37,6 +37,21 @@
 namespace asio {
 namespace detail {
 
+#if defined(__GNUC__)
+# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
+# pragma GCC visibility push (default)
+# endif // (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
+#endif // defined(__GNUC__)
+
+template <typename T>
+class typeid_wrapper {};
+
+#if defined(__GNUC__)
+# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
+# pragma GCC visibility pop
+# endif // (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
+#endif // defined(__GNUC__)
+
 class service_registry
   : private noncopyable
 {
@@ -169,7 +184,7 @@
   void init_service_id(boost::asio::io_service::service& service,
       const boost::asio::detail::service_id<Service>& /*id*/)
   {
- service.type_info_ = &typeid(Service);
+ service.type_info_ = &typeid(typeid_wrapper<Service>);
     service.id_ = 0;
   }
 #endif // !defined(BOOST_ASIO_NO_TYPEID)
@@ -189,7 +204,8 @@
       const boost::asio::io_service::service& service,
       const boost::asio::detail::service_id<Service>& /*id*/)
   {
- return service.type_info_ != 0 && *service.type_info_ == typeid(Service);
+ return service.type_info_ != 0
+ && *service.type_info_ == typeid(typeid_wrapper<Service>);
   }
 #endif // !defined(BOOST_ASIO_NO_TYPEID)
 

Modified: branches/proto/v4/boost/asio/detail/task_io_service.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/task_io_service.hpp (original)
+++ branches/proto/v4/boost/asio/detail/task_io_service.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -44,14 +44,13 @@
   task_io_service(boost::asio::io_service& io_service)
     : boost::asio::detail::service_base<task_io_service<Task> >(io_service),
       mutex_(),
- task_(use_service<Task>(io_service)),
+ task_(0),
       task_interrupted_(true),
       outstanding_work_(0),
       stopped_(false),
       shutdown_(false),
       first_idle_thread_(0)
   {
- handler_queue_.push(&task_handler_);
   }
 
   void init(size_t /*concurrency_hint*/)
@@ -74,8 +73,20 @@
         h->destroy();
     }
 
- // Reset handler queue to initial state.
- handler_queue_.push(&task_handler_);
+ // Reset to initial state.
+ task_ = 0;
+ }
+
+ // Initialise the task, if required.
+ void init_task()
+ {
+ boost::asio::detail::mutex::scoped_lock lock(mutex_);
+ if (!shutdown_ && !task_)
+ {
+ task_ = &use_service<Task>(this->get_io_service());
+ handler_queue_.push(&task_handler_);
+ interrupt_one_idle_thread(lock);
+ }
   }
 
   // Run the event loop until interrupted or no more work.
@@ -194,10 +205,10 @@
     // Wake up a thread to execute the handler.
     if (!interrupt_one_idle_thread(lock))
     {
- if (!task_interrupted_)
+ if (!task_interrupted_ && task_)
       {
         task_interrupted_ = true;
- task_.interrupt();
+ task_->interrupt();
       }
     }
   }
@@ -246,7 +257,7 @@
           // Run the task. May throw an exception. Only block if the handler
           // queue is empty and we have an idle_thread_info object, otherwise
           // we want to return as soon as possible.
- task_.run(!more_handlers && !polling);
+ task_->run(!more_handlers && !polling);
         }
         else
         {
@@ -285,10 +296,10 @@
   {
     stopped_ = true;
     interrupt_all_idle_threads(lock);
- if (!task_interrupted_)
+ if (!task_interrupted_ && task_)
     {
       task_interrupted_ = true;
- task_.interrupt();
+ task_->interrupt();
     }
   }
 
@@ -376,7 +387,7 @@
   boost::asio::detail::mutex mutex_;
 
   // The task to be run by this service.
- Task& task_;
+ Task* task_;
 
   // Handler object to represent the position of the task in the queue.
   class task_handler

Modified: branches/proto/v4/boost/asio/detail/task_io_service_2lock.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/task_io_service_2lock.hpp (original)
+++ branches/proto/v4/boost/asio/detail/task_io_service_2lock.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -50,7 +50,7 @@
     : boost::asio::detail::service_base<task_io_service<Task> >(io_service),
       front_mutex_(),
       back_mutex_(),
- task_(use_service<Task>(io_service)),
+ task_(&use_service<Task>(io_service)),
       outstanding_work_(0),
       front_stopped_(false),
       back_stopped_(false),
@@ -58,7 +58,6 @@
       back_first_idle_thread_(0),
       back_task_thread_(0)
   {
- handler_queue_.push(&task_handler_);
   }
 
   void init(size_t /*concurrency_hint*/)
@@ -77,8 +76,20 @@
       if (h != &task_handler_)
         h->destroy();
 
- // Reset handler queue to initial state.
- handler_queue_.push(&task_handler_);
+ // Reset to initial state.
+ task_ = 0;
+ }
+
+ // Initialise the task, if required.
+ void init_task()
+ {
+ boost::asio::detail::mutex::scoped_lock back_lock(back_mutex_);
+ if (!back_shutdown_ && !task_)
+ {
+ task_ = &use_service<Task>(this->get_io_service());
+ handler_queue_.push(&task_handler_);
+ interrupt_one_idle_thread(back_lock);
+ }
   }
 
   // Run the event loop until interrupted or no more work.
@@ -287,7 +298,7 @@
           // queue is empty and we're not polling, otherwise we want to return
           // as soon as possible.
           task_has_run = true;
- task_.run(!more_handlers && !polling);
+ task_->run(!more_handlers && !polling);
         }
         else
         {
@@ -342,10 +353,10 @@
       idle_thread->next = 0;
       idle_thread->wakeup_event.signal(back_lock);
     }
- else if (back_task_thread_)
+ else if (back_task_thread_ && task_)
     {
       back_task_thread_ = 0;
- task_.interrupt();
+ task_->interrupt();
     }
   }
 
@@ -361,10 +372,10 @@
       idle_thread->wakeup_event.signal(back_lock);
     }
 
- if (back_task_thread_)
+ if (back_task_thread_ && task_)
     {
       back_task_thread_ = 0;
- task_.interrupt();
+ task_->interrupt();
     }
   }
 
@@ -415,7 +426,7 @@
   boost::asio::detail::mutex back_mutex_;
 
   // The task to be run by this service.
- Task& task_;
+ Task* task_;
 
   // Handler object to represent the position of the task in the queue.
   class task_handler

Modified: branches/proto/v4/boost/asio/detail/win_iocp_io_service.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/win_iocp_io_service.hpp (original)
+++ branches/proto/v4/boost/asio/detail/win_iocp_io_service.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -149,6 +149,11 @@
     timer_queues_.clear();
   }
 
+ // Initialise the task. Nothing to do here.
+ void init_task()
+ {
+ }
+
   // Register a handle with the IO completion port.
   boost::system::error_code register_handle(
       HANDLE handle, boost::system::error_code& ec)

Modified: branches/proto/v4/boost/asio/detail/win_thread.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/win_thread.hpp (original)
+++ branches/proto/v4/boost/asio/detail/win_thread.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -40,50 +40,67 @@
 
 unsigned int __stdcall win_thread_function(void* arg);
 
-class win_thread
- : private noncopyable
+#if (WINVER < 0x0500)
+void __stdcall apc_function(ULONG data);
+#else
+void __stdcall apc_function(ULONG_PTR data);
+#endif
+
+template <typename T>
+class win_thread_base
 {
 public:
- // The purpose of the thread.
- enum purpose { internal, external };
+ static bool terminate_threads()
+ {
+ return ::InterlockedExchangeAdd(&terminate_threads_, 0) != 0;
+ }
+
+ static void set_terminate_threads(bool b)
+ {
+ ::InterlockedExchange(&terminate_threads_, b ? 1 : 0);
+ }
+
+private:
+ static long terminate_threads_;
+};
 
+template <typename T>
+long win_thread_base<T>::terminate_threads_ = 0;
+
+class win_thread
+ : private noncopyable,
+ public win_thread_base<win_thread>
+{
+public:
   // Constructor.
   template <typename Function>
- win_thread(Function f, purpose p = internal)
+ win_thread(Function f)
     : exit_event_(0)
   {
     std::auto_ptr<func_base> arg(new func<Function>(f));
 
     ::HANDLE entry_event = 0;
- if (p == internal)
+ arg->entry_event_ = entry_event = ::CreateEvent(0, true, false, 0);
+ if (!entry_event)
     {
- arg->entry_event_ = entry_event = ::CreateEvent(0, true, false, 0);
- if (!entry_event)
- {
- DWORD last_error = ::GetLastError();
- boost::system::system_error e(
- boost::system::error_code(last_error,
- boost::asio::error::get_system_category()),
- "thread.entry_event");
- boost::throw_exception(e);
- }
-
- arg->exit_event_ = exit_event_ = ::CreateEvent(0, true, false, 0);
- if (!exit_event_)
- {
- DWORD last_error = ::GetLastError();
- ::CloseHandle(entry_event);
- boost::system::system_error e(
- boost::system::error_code(last_error,
- boost::asio::error::get_system_category()),
- "thread.exit_event");
- boost::throw_exception(e);
- }
+ DWORD last_error = ::GetLastError();
+ boost::system::system_error e(
+ boost::system::error_code(last_error,
+ boost::asio::error::get_system_category()),
+ "thread.entry_event");
+ boost::throw_exception(e);
     }
- else
+
+ arg->exit_event_ = exit_event_ = ::CreateEvent(0, true, false, 0);
+ if (!exit_event_)
     {
- arg->entry_event_ = 0;
- arg->exit_event_ = 0;
+ DWORD last_error = ::GetLastError();
+ ::CloseHandle(entry_event);
+ boost::system::system_error e(
+ boost::system::error_code(last_error,
+ boost::asio::error::get_system_category()),
+ "thread.exit_event");
+ boost::throw_exception(e);
     }
 
     unsigned int thread_id = 0;
@@ -123,14 +140,15 @@
   // Wait for the thread to exit.
   void join()
   {
- if (exit_event_)
+ ::WaitForSingleObject(exit_event_, INFINITE);
+ ::CloseHandle(exit_event_);
+ if (terminate_threads())
     {
- ::WaitForSingleObject(exit_event_, INFINITE);
- ::CloseHandle(exit_event_);
       ::TerminateThread(thread_, 0);
     }
     else
     {
+ ::QueueUserAPC(apc_function, thread_, 0);
       ::WaitForSingleObject(thread_, INFINITE);
     }
   }
@@ -138,6 +156,12 @@
 private:
   friend unsigned int __stdcall win_thread_function(void* arg);
 
+#if (WINVER < 0x0500)
+ friend void __stdcall apc_function(ULONG);
+#else
+ friend void __stdcall apc_function(ULONG_PTR);
+#endif
+
   class func_base
   {
   public:
@@ -175,21 +199,30 @@
   std::auto_ptr<win_thread::func_base> func(
       static_cast<win_thread::func_base*>(arg));
 
- if (func->entry_event_)
- ::SetEvent(func->entry_event_);
+ ::SetEvent(func->entry_event_);
 
   func->run();
 
- if (HANDLE exit_event = func->exit_event_)
- {
- func.reset();
- ::SetEvent(exit_event);
- ::Sleep(INFINITE);
- }
+ // Signal that the thread has finished its work, but rather than returning go
+ // to sleep to put the thread into a well known state. If the thread is being
+ // joined during global object destruction then it may be killed using
+ // TerminateThread (to avoid a deadlock in DllMain). Otherwise, the SleepEx
+ // call will be interrupted using QueueUserAPC and the thread will shut down
+ // cleanly.
+ HANDLE exit_event = func->exit_event_;
+ func.reset();
+ ::SetEvent(exit_event);
+ ::SleepEx(INFINITE, TRUE);
 
   return 0;
 }
 
+#if (WINVER < 0x0500)
+inline void __stdcall apc_function(ULONG) {}
+#else
+inline void __stdcall apc_function(ULONG_PTR) {}
+#endif
+
 } // namespace detail
 } // namespace asio
 } // namespace boost

Modified: branches/proto/v4/boost/asio/detail/wince_thread.hpp
==============================================================================
--- branches/proto/v4/boost/asio/detail/wince_thread.hpp (original)
+++ branches/proto/v4/boost/asio/detail/wince_thread.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -43,12 +43,9 @@
   : private noncopyable
 {
 public:
- // The purpose of the thread.
- enum purpose { internal, external };
-
   // Constructor.
   template <typename Function>
- wince_thread(Function f, purpose = internal)
+ wince_thread(Function f)
   {
     std::auto_ptr<func_base> arg(new func<Function>(f));
     DWORD thread_id = 0;

Modified: branches/proto/v4/boost/asio/ip/address_v4.hpp
==============================================================================
--- branches/proto/v4/boost/asio/ip/address_v4.hpp (original)
+++ branches/proto/v4/boost/asio/ip/address_v4.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -18,7 +18,9 @@
 #include <boost/asio/detail/push_options.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
+#include <climits>
 #include <string>
+#include <stdexcept>
 #include <boost/array.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/asio/detail/pop_options.hpp>
@@ -56,6 +58,15 @@
   /// Construct an address from raw bytes.
   explicit address_v4(const bytes_type& bytes)
   {
+#if UCHAR_MAX > 0xFF
+ if (bytes[0] > 0xFF || bytes[1] > 0xFF
+ || bytes[2] > 0xFF || bytes[3] > 0xFF)
+ {
+ std::out_of_range ex("address_v4 from bytes_type");
+ boost::throw_exception(ex);
+ }
+#endif // UCHAR_MAX > 0xFF
+
     using namespace std; // For memcpy.
     memcpy(&addr_.s_addr, bytes.elems, 4);
   }
@@ -63,6 +74,14 @@
   /// Construct an address from a unsigned long in host byte order.
   explicit address_v4(unsigned long addr)
   {
+#if ULONG_MAX > 0xFFFFFFFF
+ if (addr > 0xFFFFFFFF)
+ {
+ std::out_of_range ex("address_v4 from unsigned long");
+ boost::throw_exception(ex);
+ }
+#endif // ULONG_MAX > 0xFFFFFFFF
+
     addr_.s_addr = boost::asio::detail::socket_ops::host_to_network_long(addr);
   }
 

Modified: branches/proto/v4/boost/asio/ip/address_v6.hpp
==============================================================================
--- branches/proto/v4/boost/asio/ip/address_v6.hpp (original)
+++ branches/proto/v4/boost/asio/ip/address_v6.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -63,6 +63,17 @@
   explicit address_v6(const bytes_type& bytes, unsigned long scope_id = 0)
     : scope_id_(scope_id)
   {
+#if UCHAR_MAX > 0xFF
+ for (std::size_t i = 0; i < bytes.size(); ++i)
+ {
+ if (bytes[i] > 0xFF)
+ {
+ std::out_of_range ex("address_v6 from bytes_type");
+ boost::throw_exception(ex);
+ }
+ }
+#endif // UCHAR_MAX > 0xFF
+
     using namespace std; // For memcpy.
     memcpy(addr_.s6_addr, bytes.elems, 16);
   }
@@ -166,7 +177,11 @@
   address_v4 to_v4() const
   {
     if (!is_v4_mapped() && !is_v4_compatible())
- throw std::bad_cast();
+ {
+ std::bad_cast ex;
+ boost::throw_exception(ex);
+ }
+
     address_v4::bytes_type v4_bytes = { { addr_.s6_addr[12],
       addr_.s6_addr[13], addr_.s6_addr[14], addr_.s6_addr[15] } };
     return address_v4(v4_bytes);

Modified: branches/proto/v4/boost/asio/read_until.hpp
==============================================================================
--- branches/proto/v4/boost/asio/read_until.hpp (original)
+++ branches/proto/v4/boost/asio/read_until.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -24,6 +24,7 @@
 #include <boost/type_traits/is_function.hpp>
 #include <boost/type_traits/remove_pointer.hpp>
 #include <boost/utility/enable_if.hpp>
+#include <boost/detail/workaround.hpp>
 #include <string>
 #include <boost/asio/detail/pop_options.hpp>
 
@@ -35,6 +36,20 @@
 
 namespace detail
 {
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+ template <typename T>
+ struct has_result_type
+ {
+ template <typename U> struct inner
+ {
+ struct big { char a[100]; };
+ static big helper(U, ...);
+ static char helper(U, typename U::result_type* = 0);
+ };
+ static const T& ref();
+ enum { value = (sizeof((inner<const T&>::helper)((ref)())) == 1) };
+ };
+#else // BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
   template <typename T>
   struct has_result_type
   {
@@ -44,6 +59,7 @@
     static const T& ref();
     enum { value = (sizeof((helper)((ref)())) == 1) };
   };
+#endif // BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
 } // namespace detail
 
 /// Type trait used to determine whether a type can be used as a match condition

Modified: branches/proto/v4/boost/config/compiler/sunpro_cc.hpp
==============================================================================
--- branches/proto/v4/boost/config/compiler/sunpro_cc.hpp (original)
+++ branches/proto/v4/boost/config/compiler/sunpro_cc.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -75,6 +75,10 @@
 #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
 #define BOOST_NO_ADL_BARRIER
 
+#if(__SUNPRO_CC >= 0x590)
+# define BOOST_HAS_LONG_LONG
+#endif
+
 
 #define BOOST_COMPILER "Sun compiler version " BOOST_STRINGIZE(__SUNPRO_CC)
 

Modified: branches/proto/v4/boost/date_time/posix_time/posix_time_config.hpp
==============================================================================
--- branches/proto/v4/boost/date_time/posix_time/posix_time_config.hpp (original)
+++ branches/proto/v4/boost/date_time/posix_time/posix_time_config.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -16,7 +16,7 @@
 #include "boost/limits.hpp"
 #include "boost/date_time/compiler_config.hpp"
 #include "boost/cstdint.hpp"
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 #include <cstdlib> //for MCW 7.2 std::abs(long long)
 
 namespace boost {

Modified: branches/proto/v4/boost/detail/allocator_utilities.hpp
==============================================================================
--- branches/proto/v4/boost/detail/allocator_utilities.hpp (original)
+++ branches/proto/v4/boost/detail/allocator_utilities.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -181,7 +181,13 @@
 template<typename Type>
 void destroy(const Type* p)
 {
+
+#if BOOST_WORKAROUND(__SUNPRO_CC,BOOST_TESTED_AT(0x590))
+ const_cast<Type*>(p)->~Type();
+#else
   p->~Type();
+#endif
+
 }
 
 } /* namespace boost::detail::allocator */

Modified: branches/proto/v4/boost/detail/dynamic_bitset.hpp
==============================================================================
--- branches/proto/v4/boost/detail/dynamic_bitset.hpp (original)
+++ branches/proto/v4/boost/detail/dynamic_bitset.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -45,19 +45,19 @@
 
     typedef unsigned char byte_type;
 
- // This two entities
+ // These two entities
     //
     // enum mode { access_by_bytes, access_by_blocks };
     // template <mode> struct mode_to_type {};
     //
- // were removed, since the regression logs (as of 24 Aug 2008) show
- // that several compilers have troubles with recognizing
+ // were removed, since the regression logs (as of 24 Aug 2008)
+ // showed that several compilers had troubles with recognizing
     //
     // const mode m = access_by_bytes
     //
     // as a constant expression
     //
- // *We'll use a bool, instead *.
+ // * So, we'll use bool, instead of enum *.
     //
     template <bool value>
     struct value_to_type

Modified: branches/proto/v4/boost/detail/sp_convertible.hpp
==============================================================================
--- branches/proto/v4/boost/detail/sp_convertible.hpp (original)
+++ branches/proto/v4/boost/detail/sp_convertible.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -25,7 +25,7 @@
 # define BOOST_SP_NO_SP_CONVERTIBLE
 #endif
 
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( __BORLANDC__ ) && ( __BORLANDC__ < 0x600 )
+#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( __BORLANDC__ ) && ( __BORLANDC__ <= 0x610 )
 # define BOOST_SP_NO_SP_CONVERTIBLE
 #endif
 

Modified: branches/proto/v4/boost/detail/utf8_codecvt_facet.hpp
==============================================================================
--- branches/proto/v4/boost/detail/utf8_codecvt_facet.hpp (original)
+++ branches/proto/v4/boost/detail/utf8_codecvt_facet.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -79,8 +79,8 @@
 // specialized on those types for this to work.
 
 #include <locale>
-#include <cwchar> // for mbstate_t
-#include <cstddef> // for std::size_t
+#include <cwchar> // for mbstate_t
+#include <cstddef> // for std::size_t
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
@@ -88,6 +88,7 @@
 #if defined(BOOST_NO_STDC_NAMESPACE)
     using ::codecvt;
     using ::mbstate_t;
+ using ::size_t
 #endif
 
 #if !defined(__MSL_CPP__) && !defined(__LIBCOMO__)

Modified: branches/proto/v4/boost/dynamic_bitset/dynamic_bitset.hpp
==============================================================================
--- branches/proto/v4/boost/dynamic_bitset/dynamic_bitset.hpp (original)
+++ branches/proto/v4/boost/dynamic_bitset/dynamic_bitset.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -43,20 +43,16 @@
 
 namespace boost {
 
-template
-
-#if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // 1300 == VC++ 7.0
- // VC++ (up to 7.0) wants the default arguments again
- <typename Block = unsigned long, typename Allocator = std::allocator<Block> >
-# else
- <typename Block, typename Allocator>
-# endif
-
+template <typename Block, typename Allocator>
 class dynamic_bitset
 {
   // Portability note: member function templates are defined inside
   // this class definition to avoid problems with VC++. Similarly,
   // with the member functions of nested classes.
+ //
+ // [October 2008: the note above is mostly historical; new versions
+ // of VC++ are likely able to digest a more drinking form of the
+ // code; but changing it now is probably not worth the risks...]
 
   BOOST_STATIC_ASSERT(detail::dynamic_bitset_impl::allowed_block_type<Block>::value);
 
@@ -480,24 +476,18 @@
 
 };
 
-#if defined(__IBMCPP__) && BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600))
-
-// Workaround for IBM's AIX platform.
-// See http://comments.gmane.org/gmane.comp.lib.boost.user/15331
-//
-// NOTE:
-// The compiler is actually right, until core issue 454 will be settled:
-// <http://www.open-std.org/JTC1/SC22/WG21/docs/cwg_active.html#454>
-//
-// It's arguable whether we want to mark this with BOOST_WORKAROUND or not.
+#if !defined BOOST_NO_INCLASS_MEMBER_INITIALIZATION
 
-
-template<typename Block, typename Allocator>
-dynamic_bitset<Block, Allocator>::block_width_type const
+template <typename Block, typename Allocator>
+const typename dynamic_bitset<Block, Allocator>::block_width_type
 dynamic_bitset<Block, Allocator>::bits_per_block;
 
-template<typename Block, typename Allocator>
-dynamic_bitset<Block, Allocator>::block_width_type const
+template <typename Block, typename Allocator>
+const typename dynamic_bitset<Block, Allocator>::size_type
+dynamic_bitset<Block, Allocator>::npos;
+
+template <typename Block, typename Allocator>
+const typename dynamic_bitset<Block, Allocator>::block_width_type
 dynamic_bitset<Block, Allocator>::ulong_width;
 
 #endif

Modified: branches/proto/v4/boost/filesystem/path.hpp
==============================================================================
--- branches/proto/v4/boost/filesystem/path.hpp (original)
+++ branches/proto/v4/boost/filesystem/path.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -227,10 +227,10 @@
       string_type extension() const;
 
 # ifndef BOOST_FILESYSTEM_NO_DEPRECATED
- string_type leaf() const { return filename(); }
- basic_path branch_path() const { return parent_path(); }
- bool has_leaf() const { return !m_path.empty(); }
- bool has_branch_path() const { return !parent_path().empty(); }
+ string_type leaf() const { return filename(); }
+ basic_path branch_path() const { return parent_path(); }
+ bool has_leaf() const { return !m_path.empty(); }
+ bool has_branch_path() const { return !parent_path().empty(); }
 # endif
 
       bool empty() const { return m_path.empty(); } // name consistent with std containers

Modified: branches/proto/v4/boost/function/function_base.hpp
==============================================================================
--- branches/proto/v4/boost/function/function_base.hpp (original)
+++ branches/proto/v4/boost/function/function_base.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -193,8 +193,8 @@
       struct reference_manager
       {
         static inline void
- get(const function_buffer& in_buffer, function_buffer& out_buffer,
- functor_manager_operation_type op)
+ manage(const function_buffer& in_buffer, function_buffer& out_buffer,
+ functor_manager_operation_type op)
         {
           switch (op) {
           case clone_functor_tag:
@@ -396,6 +396,14 @@
                   mpl::bool_<(function_allows_small_object_optimization<functor_type>::value)>());
         }
 
+ // For member pointers, we use the small-object optimization buffer.
+ static inline void
+ manager(const function_buffer& in_buffer, function_buffer& out_buffer,
+ functor_manager_operation_type op, member_ptr_tag)
+ {
+ manager(in_buffer, out_buffer, op, mpl::true_());
+ }
+
       public:
         /* Dispatch to an appropriate manager based on whether we have a
            function pointer or a function object pointer. */
@@ -589,7 +597,6 @@
        */
       struct vtable_base
       {
- vtable_base() : manager(0) { }
         void (*manager)(const function_buffer& in_buffer,
                         function_buffer& out_buffer,
                         functor_manager_operation_type op);

Modified: branches/proto/v4/boost/function/function_template.hpp
==============================================================================
--- branches/proto/v4/boost/function/function_template.hpp (original)
+++ branches/proto/v4/boost/function/function_template.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -53,12 +53,20 @@
   BOOST_JOIN(function_ref_invoker,BOOST_FUNCTION_NUM_ARGS)
 #define BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER \
   BOOST_JOIN(void_function_ref_invoker,BOOST_FUNCTION_NUM_ARGS)
+#define BOOST_FUNCTION_MEMBER_INVOKER \
+ BOOST_JOIN(function_mem_invoker,BOOST_FUNCTION_NUM_ARGS)
+#define BOOST_FUNCTION_VOID_MEMBER_INVOKER \
+ BOOST_JOIN(function_void_mem_invoker,BOOST_FUNCTION_NUM_ARGS)
 #define BOOST_FUNCTION_GET_FUNCTION_INVOKER \
   BOOST_JOIN(get_function_invoker,BOOST_FUNCTION_NUM_ARGS)
 #define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER \
   BOOST_JOIN(get_function_obj_invoker,BOOST_FUNCTION_NUM_ARGS)
 #define BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER \
   BOOST_JOIN(get_function_ref_invoker,BOOST_FUNCTION_NUM_ARGS)
+#define BOOST_FUNCTION_GET_MEMBER_INVOKER \
+ BOOST_JOIN(get_member_invoker,BOOST_FUNCTION_NUM_ARGS)
+#define BOOST_FUNCTION_GET_INVOKER \
+ BOOST_JOIN(get_invoker,BOOST_FUNCTION_NUM_ARGS)
 #define BOOST_FUNCTION_VTABLE BOOST_JOIN(basic_vtable,BOOST_FUNCTION_NUM_ARGS)
 
 #ifndef BOOST_NO_VOID_RETURNS
@@ -180,6 +188,44 @@
         }
       };
 
+#if BOOST_FUNCTION_NUM_ARGS > 0
+ /* Handle invocation of member pointers. */
+ template<
+ typename MemberPtr,
+ typename R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_PARMS
+ >
+ struct BOOST_FUNCTION_MEMBER_INVOKER
+ {
+ static R invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_PARMS)
+
+ {
+ MemberPtr* f =
+ reinterpret_cast<MemberPtr*>(&function_obj_ptr.data);
+ return boost::mem_fn(*f)(BOOST_FUNCTION_ARGS);
+ }
+ };
+
+ template<
+ typename MemberPtr,
+ typename R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_PARMS
+ >
+ struct BOOST_FUNCTION_VOID_MEMBER_INVOKER
+ {
+ static BOOST_FUNCTION_VOID_RETURN_TYPE
+ invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_PARMS)
+
+ {
+ MemberPtr* f =
+ reinterpret_cast<MemberPtr*>(&function_obj_ptr.data);
+ BOOST_FUNCTION_RETURN(boost::mem_fn(*f)(BOOST_FUNCTION_ARGS));
+ }
+ };
+#endif
+
       template<
         typename FunctionPtr,
         typename R BOOST_FUNCTION_COMMA
@@ -243,11 +289,190 @@
>::type type;
       };
 
+#if BOOST_FUNCTION_NUM_ARGS > 0
+ /* Retrieve the appropriate invoker for a member pointer. */
+ template<
+ typename MemberPtr,
+ typename R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_PARMS
+ >
+ struct BOOST_FUNCTION_GET_MEMBER_INVOKER
+ {
+ typedef typename mpl::if_c<(is_void<R>::value),
+ BOOST_FUNCTION_VOID_MEMBER_INVOKER<
+ MemberPtr,
+ R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS
+ >,
+ BOOST_FUNCTION_MEMBER_INVOKER<
+ MemberPtr,
+ R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS
+ >
+ >::type type;
+ };
+#endif
+
+ /* Given the tag returned by get_function_tag, retrieve the
+ actual invoker that will be used for the given function
+ object.
+
+ Each specialization contains an "apply" nested class template
+ that accepts the function object, return type, function
+ argument types, and allocator. The resulting "apply" class
+ contains two typedefs, "invoker_type" and "manager_type",
+ which correspond to the invoker and manager types. */
+ template<typename Tag>
+ struct BOOST_FUNCTION_GET_INVOKER { };
+
+ /* Retrieve the invoker for a function pointer. */
+ template<>
+ struct BOOST_FUNCTION_GET_INVOKER<function_ptr_tag>
+ {
+ template<typename FunctionPtr,
+ typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
+ struct apply
+ {
+ typedef typename BOOST_FUNCTION_GET_FUNCTION_INVOKER<
+ FunctionPtr,
+ R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS
+ >::type
+ invoker_type;
+
+ typedef functor_manager<FunctionPtr> manager_type;
+ };
+
+ template<typename FunctionPtr,
+ typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS,
+ typename Allocator>
+ struct apply_a
+ {
+ typedef typename BOOST_FUNCTION_GET_FUNCTION_INVOKER<
+ FunctionPtr,
+ R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS
+ >::type
+ invoker_type;
+
+ typedef functor_manager<FunctionPtr> manager_type;
+ };
+ };
+
+#if BOOST_FUNCTION_NUM_ARGS > 0
+ /* Retrieve the invoker for a member pointer. */
+ template<>
+ struct BOOST_FUNCTION_GET_INVOKER<member_ptr_tag>
+ {
+ template<typename MemberPtr,
+ typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
+ struct apply
+ {
+ typedef typename BOOST_FUNCTION_GET_MEMBER_INVOKER<
+ MemberPtr,
+ R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS
+ >::type
+ invoker_type;
+
+ typedef functor_manager<MemberPtr> manager_type;
+ };
+
+ template<typename MemberPtr,
+ typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS,
+ typename Allocator>
+ struct apply_a
+ {
+ typedef typename BOOST_FUNCTION_GET_MEMBER_INVOKER<
+ MemberPtr,
+ R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS
+ >::type
+ invoker_type;
+
+ typedef functor_manager<MemberPtr> manager_type;
+ };
+ };
+#endif
+
+ /* Retrieve the invoker for a function object. */
+ template<>
+ struct BOOST_FUNCTION_GET_INVOKER<function_obj_tag>
+ {
+ template<typename FunctionObj,
+ typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
+ struct apply
+ {
+ typedef typename BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
+ FunctionObj,
+ R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS
+ >::type
+ invoker_type;
+
+ typedef functor_manager<FunctionObj> manager_type;
+ };
+
+ template<typename FunctionObj,
+ typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS,
+ typename Allocator>
+ struct apply_a
+ {
+ typedef typename BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
+ FunctionObj,
+ R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS
+ >::type
+ invoker_type;
+
+ typedef functor_manager_a<FunctionObj, Allocator> manager_type;
+ };
+ };
+
+ /* Retrieve the invoker for a reference to a function object. */
+ template<>
+ struct BOOST_FUNCTION_GET_INVOKER<function_obj_ref_tag>
+ {
+ template<typename RefWrapper,
+ typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
+ struct apply
+ {
+ typedef typename BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER<
+ typename RefWrapper::type,
+ R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS
+ >::type
+ invoker_type;
+
+ typedef reference_manager<typename RefWrapper::type> manager_type;
+ };
+
+ template<typename RefWrapper,
+ typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS,
+ typename Allocator>
+ struct apply_a
+ {
+ typedef typename BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER<
+ typename RefWrapper::type,
+ R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS
+ >::type
+ invoker_type;
+
+ typedef reference_manager<typename RefWrapper::type> manager_type;
+ };
+ };
+
+
       /**
- * vtable for a specific boost::function instance.
+ * vtable for a specific boost::function instance. This
+ * structure must be an aggregate so that we can use static
+ * initialization in boost::function's assign_to and assign_to_a
+ * members. It therefore cannot have any constructors,
+ * destructors, base classes, etc.
        */
       template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
- struct BOOST_FUNCTION_VTABLE : vtable_base
+ struct BOOST_FUNCTION_VTABLE
       {
 #ifndef BOOST_NO_VOID_RETURNS
         typedef R result_type;
@@ -260,17 +485,6 @@
                                             BOOST_FUNCTION_TEMPLATE_ARGS);
 
         template<typename F>
- BOOST_FUNCTION_VTABLE(F f) : vtable_base(), invoker(0)
- {
- init(f);
- }
- template<typename F,typename Allocator>
- BOOST_FUNCTION_VTABLE(F f, Allocator) : vtable_base(), invoker(0)
- {
- init_a<Allocator>(f);
- }
-
- template<typename F>
         bool assign_to(F f, function_buffer& functor)
         {
           typedef typename get_function_tag<F>::type tag;
@@ -285,53 +499,13 @@
 
         void clear(function_buffer& functor)
         {
- if (manager)
- manager(functor, functor, destroy_functor_tag);
+ if (base.manager)
+ base.manager(functor, functor, destroy_functor_tag);
         }
 
       private:
- template<typename F>
- void init(F f)
- {
- typedef typename get_function_tag<F>::type tag;
- init(f, tag());
- }
- template<typename Allocator,typename F>
- void init_a(F f)
- {
- typedef typename get_function_tag<F>::type tag;
- init_a<Allocator>(f, tag());
- }
-
         // Function pointers
         template<typename FunctionPtr>
- void init(FunctionPtr /*f*/, function_ptr_tag)
- {
- typedef typename BOOST_FUNCTION_GET_FUNCTION_INVOKER<
- FunctionPtr,
- R BOOST_FUNCTION_COMMA
- BOOST_FUNCTION_TEMPLATE_ARGS
- >::type
- actual_invoker_type;
-
- invoker = &actual_invoker_type::invoke;
- manager = &functor_manager<FunctionPtr>::manage;
- }
- template<typename Allocator,typename FunctionPtr>
- void init_a(FunctionPtr f, function_ptr_tag)
- {
- typedef typename BOOST_FUNCTION_GET_FUNCTION_INVOKER<
- FunctionPtr,
- R BOOST_FUNCTION_COMMA
- BOOST_FUNCTION_TEMPLATE_ARGS
- >::type
- actual_invoker_type;
-
- invoker = &actual_invoker_type::invoke;
- manager = &functor_manager_a<FunctionPtr, Allocator>::manage;
- }
-
- template<typename FunctionPtr>
         bool
         assign_to(FunctionPtr f, function_buffer& functor, function_ptr_tag)
         {
@@ -355,23 +529,6 @@
         // Member pointers
 #if BOOST_FUNCTION_NUM_ARGS > 0
         template<typename MemberPtr>
- void init(MemberPtr f, member_ptr_tag)
- {
- // DPG TBD: Add explicit support for member function
- // objects, so we invoke through mem_fn() but we retain the
- // right target_type() values.
- this->init(mem_fn(f));
- }
- template<typename Allocator,typename MemberPtr>
- void init_a(MemberPtr f, member_ptr_tag)
- {
- // DPG TBD: Add explicit support for member function
- // objects, so we invoke through mem_fn() but we retain the
- // right target_type() values.
- this->init_a<Allocator>(mem_fn(f));
- }
-
- template<typename MemberPtr>
         bool assign_to(MemberPtr f, function_buffer& functor, member_ptr_tag)
         {
           // DPG TBD: Add explicit support for member function
@@ -400,33 +557,6 @@
 #endif // BOOST_FUNCTION_NUM_ARGS > 0
 
         // Function objects
- template<typename FunctionObj>
- void init(FunctionObj /*f*/, function_obj_tag)
- {
- typedef typename BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
- FunctionObj,
- R BOOST_FUNCTION_COMMA
- BOOST_FUNCTION_TEMPLATE_ARGS
- >::type
- actual_invoker_type;
-
- invoker = &actual_invoker_type::invoke;
- manager = &functor_manager<FunctionObj>::manage;
- }
- template<typename Allocator,typename FunctionObj>
- void init_a(FunctionObj /*f*/, function_obj_tag)
- {
- typedef typename BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
- FunctionObj,
- R BOOST_FUNCTION_COMMA
- BOOST_FUNCTION_TEMPLATE_ARGS
- >::type
- actual_invoker_type;
-
- invoker = &actual_invoker_type::invoke;
- manager = &functor_manager_a<FunctionObj, Allocator>::manage;
- }
-
         // Assign to a function object using the small object optimization
         template<typename FunctionObj>
         void
@@ -490,27 +620,6 @@
 
         // Reference to a function object
         template<typename FunctionObj>
- void
- init(const reference_wrapper<FunctionObj>& /*f*/, function_obj_ref_tag)
- {
- typedef typename BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER<
- FunctionObj,
- R BOOST_FUNCTION_COMMA
- BOOST_FUNCTION_TEMPLATE_ARGS
- >::type
- actual_invoker_type;
-
- invoker = &actual_invoker_type::invoke;
- manager = &reference_manager<FunctionObj>::get;
- }
- template<typename Allocator,typename FunctionObj>
- void
- init_a(const reference_wrapper<FunctionObj>& f, function_obj_ref_tag)
- {
- init(f,function_obj_ref_tag());
- }
-
- template<typename FunctionObj>
         bool
         assign_to(const reference_wrapper<FunctionObj>& f,
                   function_buffer& functor, function_obj_ref_tag)
@@ -533,6 +642,7 @@
         }
 
       public:
+ vtable_base base;
         invoker_type invoker;
       };
     } // end namespace function
@@ -737,7 +847,7 @@
     void clear()
     {
       if (vtable) {
- static_cast<vtable_type*>(vtable)->clear(this->functor);
+ reinterpret_cast<vtable_type*>(vtable)->clear(this->functor);
         vtable = 0;
       }
     }
@@ -774,15 +884,53 @@
     template<typename Functor>
     void assign_to(Functor f)
     {
- static vtable_type stored_vtable(f);
- if (stored_vtable.assign_to(f, functor)) vtable = &stored_vtable;
+ using detail::function::vtable_base;
+
+ typedef typename detail::function::get_function_tag<Functor>::type tag;
+ typedef detail::function::BOOST_FUNCTION_GET_INVOKER<tag> get_invoker;
+ typedef typename get_invoker::
+ template apply<Functor, R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS>
+ handler_type;
+
+ typedef typename handler_type::invoker_type invoker_type;
+ typedef typename handler_type::manager_type manager_type;
+
+ // Note: it is extremely important that this initialization use
+ // static initialization. Otherwise, we will have a race
+ // condition here in multi-threaded code. See
+ // http://thread.gmane.org/gmane.comp.lib.boost.devel/164902/.
+ static vtable_type stored_vtable =
+ { { &manager_type::manage }, &invoker_type::invoke };
+
+ if (stored_vtable.assign_to(f, functor)) vtable = &stored_vtable.base;
       else vtable = 0;
     }
+
     template<typename Functor,typename Allocator>
     void assign_to_a(Functor f,Allocator a)
     {
- static vtable_type stored_vtable(f,a);
- if (stored_vtable.assign_to_a(f, functor, a)) vtable = &stored_vtable;
+ using detail::function::vtable_base;
+
+ typedef typename detail::function::get_function_tag<Functor>::type tag;
+ typedef detail::function::BOOST_FUNCTION_GET_INVOKER<tag> get_invoker;
+ typedef typename get_invoker::
+ template apply_a<Functor, R BOOST_FUNCTION_COMMA
+ BOOST_FUNCTION_TEMPLATE_ARGS,
+ Allocator>
+ handler_type;
+
+ typedef typename handler_type::invoker_type invoker_type;
+ typedef typename handler_type::manager_type manager_type;
+
+ // Note: it is extremely important that this initialization use
+ // static initialization. Otherwise, we will have a race
+ // condition here in multi-threaded code. See
+ // http://thread.gmane.org/gmane.comp.lib.boost.devel/164902/.
+ static vtable_type stored_vtable =
+ { { &manager_type::manage }, &invoker_type::invoke };
+
+ if (stored_vtable.assign_to_a(f, functor, a)) vtable = &stored_vtable.base;
       else vtable = 0;
     }
 
@@ -837,7 +985,7 @@
     if (this->empty())
       boost::throw_exception(bad_function_call());
 
- return static_cast<vtable_type*>(vtable)->invoker
+ return reinterpret_cast<const vtable_type*>(vtable)->invoker
              (this->functor BOOST_FUNCTION_COMMA BOOST_FUNCTION_ARGS);
   }
 #endif
@@ -964,10 +1112,13 @@
 #undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
 #undef BOOST_FUNCTION_FUNCTION_REF_INVOKER
 #undef BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER
+#undef BOOST_FUNCTION_MEMBER_INVOKER
+#undef BOOST_FUNCTION_VOID_MEMBER_INVOKER
 #undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
 #undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
 #undef BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER
 #undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER
+#undef BOOST_FUNCTION_GET_INVOKER
 #undef BOOST_FUNCTION_TEMPLATE_PARMS
 #undef BOOST_FUNCTION_TEMPLATE_ARGS
 #undef BOOST_FUNCTION_PARMS

Modified: branches/proto/v4/boost/functional/detail/float_functions.hpp
==============================================================================
--- branches/proto/v4/boost/functional/detail/float_functions.hpp (original)
+++ branches/proto/v4/boost/functional/detail/float_functions.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -6,7 +6,7 @@
 #if !defined(BOOST_FUNCTIONAL_DETAIL_FLOAT_FUNCTIONS_HPP)
 #define BOOST_FUNCTIONAL_DETAIL_FLOAT_FUNCTIONS_HPP
 
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once

Modified: branches/proto/v4/boost/functional/hash/deque.hpp
==============================================================================
--- branches/proto/v4/boost/functional/hash/deque.hpp (original)
+++ branches/proto/v4/boost/functional/hash/deque.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// Based on Peter Dimov's proposal
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-// issue 6.18.
-
-#if !defined(BOOST_FUNCTIONAL_HASH_DEQUE_HPP)
-#define BOOST_FUNCTIONAL_HASH_DEQUE_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
- defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: branches/proto/v4/boost/functional/hash/list.hpp
==============================================================================
--- branches/proto/v4/boost/functional/hash/list.hpp (original)
+++ branches/proto/v4/boost/functional/hash/list.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// Based on Peter Dimov's proposal
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-// issue 6.18.
-
-#if !defined(BOOST_FUNCTIONAL_HASH_LIST_HPP)
-#define BOOST_FUNCTIONAL_HASH_LIST_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
- defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: branches/proto/v4/boost/functional/hash/map.hpp
==============================================================================
--- branches/proto/v4/boost/functional/hash/map.hpp (original)
+++ branches/proto/v4/boost/functional/hash/map.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// Based on Peter Dimov's proposal
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-// issue 6.18.
-
-#if !defined(BOOST_FUNCTIONAL_HASH_MAP_HPP)
-#define BOOST_FUNCTIONAL_HASH_MAP_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
- defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: branches/proto/v4/boost/functional/hash/pair.hpp
==============================================================================
--- branches/proto/v4/boost/functional/hash/pair.hpp (original)
+++ branches/proto/v4/boost/functional/hash/pair.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// Based on Peter Dimov's proposal
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-// issue 6.18.
-
-#if !defined(BOOST_FUNCTIONAL_HASH_PAIR_HPP)
-#define BOOST_FUNCTIONAL_HASH_PAIR_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
- defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: branches/proto/v4/boost/functional/hash/set.hpp
==============================================================================
--- branches/proto/v4/boost/functional/hash/set.hpp (original)
+++ branches/proto/v4/boost/functional/hash/set.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// Based on Peter Dimov's proposal
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-// issue 6.18.
-
-#if !defined(BOOST_FUNCTIONAL_HASH_SET_HPP)
-#define BOOST_FUNCTIONAL_HASH_SET_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
- defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: branches/proto/v4/boost/functional/hash/vector.hpp
==============================================================================
--- branches/proto/v4/boost/functional/hash/vector.hpp (original)
+++ branches/proto/v4/boost/functional/hash/vector.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// Based on Peter Dimov's proposal
-// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-// issue 6.18.
-
-#if !defined(BOOST_FUNCTIONAL_HASH_VECTOR_HPP)
-#define BOOST_FUNCTIONAL_HASH_VECTOR_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
- defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: branches/proto/v4/boost/gil/utilities.hpp
==============================================================================
--- branches/proto/v4/boost/gil/utilities.hpp (original)
+++ branches/proto/v4/boost/gil/utilities.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -15,7 +15,7 @@
 
 #include "gil_config.hpp"
 #include <functional>
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 #include <cstddef>
 #include <algorithm>
 #include <utility>

Modified: branches/proto/v4/boost/graph/adjacency_list.hpp
==============================================================================
--- branches/proto/v4/boost/graph/adjacency_list.hpp (original)
+++ branches/proto/v4/boost/graph/adjacency_list.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -44,6 +44,7 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/graph/properties.hpp>
+#include <boost/graph/named_graph.hpp>
 
 namespace boost {
 
@@ -333,7 +334,14 @@
 #else
       VertexProperty, EdgeProperty,
 #endif
- GraphProperty, EdgeListS>::type
+ GraphProperty, EdgeListS>::type,
+ // Support for named vertices
+ public graph::maybe_named_graph<
+ adjacency_list<OutEdgeListS,VertexListS,DirectedS,
+ VertexProperty,EdgeProperty,GraphProperty,EdgeListS>,
+ typename adjacency_list_traits<OutEdgeListS, VertexListS, DirectedS,
+ EdgeListS>::vertex_descriptor,
+ VertexProperty>
   {
 #if !defined(BOOST_GRAPH_NO_BUNDLED_PROPERTIES)
     typedef typename detail::retag_property_list<vertex_bundle_t,
@@ -434,6 +442,12 @@
       *this = tmp;
     }
 
+ void clear()
+ {
+ this->clearing_graph();
+ Base::clear();
+ }
+
 #ifndef BOOST_GRAPH_NO_BUNDLED_PROPERTIES
     // Directly access a vertex or edge bundle
     vertex_bundled& operator[](vertex_descriptor v)

Modified: branches/proto/v4/boost/graph/chrobak_payne_drawing.hpp
==============================================================================
--- branches/proto/v4/boost/graph/chrobak_payne_drawing.hpp (original)
+++ branches/proto/v4/boost/graph/chrobak_payne_drawing.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -193,8 +193,8 @@
             delta_p_q += delta_x[temp];
           }
 
- delta_x[v] = (y[rightmost] - y[leftmost] + delta_p_q)/2;
- y[v] = (y[rightmost] + y[leftmost] + delta_p_q)/2;
+ delta_x[v] = ((y[rightmost] + delta_p_q) - y[leftmost])/2;
+ y[v] = y[leftmost] + delta_x[v];
         delta_x[rightmost] = delta_p_q - delta_x[v];
         
         bool leftmost_and_rightmost_adjacent = right[leftmost] == rightmost;

Modified: branches/proto/v4/boost/graph/circle_layout.hpp
==============================================================================
--- branches/proto/v4/boost/graph/circle_layout.hpp (original)
+++ branches/proto/v4/boost/graph/circle_layout.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -8,7 +8,7 @@
 // Andrew Lumsdaine
 #ifndef BOOST_GRAPH_CIRCLE_LAYOUT_HPP
 #define BOOST_GRAPH_CIRCLE_LAYOUT_HPP
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 #include <utility>
 #include <boost/graph/graph_traits.hpp>
 

Modified: branches/proto/v4/boost/graph/detail/adjacency_list.hpp
==============================================================================
--- branches/proto/v4/boost/graph/detail/adjacency_list.hpp (original)
+++ branches/proto/v4/boost/graph/detail/adjacency_list.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -1902,6 +1902,7 @@
       bool inserted;
       boost::tie(pos,inserted) = boost::graph_detail::push(g.m_vertices, v);
       v->m_position = pos;
+ g.added_vertex(v);
       return v;
     }
     // O(1)
@@ -1910,13 +1911,19 @@
     add_vertex(const typename Config::vertex_property_type& p,
                adj_list_impl<Derived, Config, Base>& g_)
     {
+ typedef typename Config::vertex_descriptor vertex_descriptor;
       Derived& g = static_cast<Derived&>(g_);
+ if (optional<vertex_descriptor> v
+ = g.vertex_by_property(get_property_value(p, vertex_bundle)))
+ return *v;
+
       typedef typename Config::stored_vertex stored_vertex;
       stored_vertex* v = new stored_vertex(p);
       typename Config::StoredVertexList::iterator pos;
       bool inserted;
       boost::tie(pos,inserted) = boost::graph_detail::push(g.m_vertices, v);
       v->m_position = pos;
+ g.added_vertex(v);
       return v;
     }
     // O(1)
@@ -1926,6 +1933,7 @@
     {
       typedef typename Config::stored_vertex stored_vertex;
       Derived& g = static_cast<Derived&>(g_);
+ g.removing_vertex(u);
       stored_vertex* su = (stored_vertex*)u;
       g.m_vertices.erase(su->m_position);
       delete su;
@@ -2171,6 +2179,7 @@
     add_vertex(vec_adj_list_impl<Graph, Config, Base>& g_) {
       Graph& g = static_cast<Graph&>(g_);
       g.m_vertices.resize(g.m_vertices.size() + 1);
+ g.added_vertex(g.m_vertices.size() - 1);
       return g.m_vertices.size() - 1;
     }
 
@@ -2178,9 +2187,14 @@
     inline typename Config::vertex_descriptor
     add_vertex(const typename Config::vertex_property_type& p,
                vec_adj_list_impl<Graph, Config, Base>& g_) {
+ typedef typename Config::vertex_descriptor vertex_descriptor;
       Graph& g = static_cast<Graph&>(g_);
+ if (optional<vertex_descriptor> v
+ = g.vertex_by_property(get_property_value(p, vertex_bundle)))
+ return *v;
       typedef typename Config::stored_vertex stored_vertex;
       g.m_vertices.push_back(stored_vertex(p));
+ g.added_vertex(g.m_vertices.size() - 1);
       return g.m_vertices.size() - 1;
     }
 
@@ -2219,6 +2233,7 @@
     {
       typedef typename Config::directed_category Cat;
       Graph& g = static_cast<Graph&>(g_);
+ g.removing_vertex(v);
       detail::remove_vertex_dispatch(g, v, Cat());
     }
     // O(1)

Modified: branches/proto/v4/boost/graph/erdos_renyi_generator.hpp
==============================================================================
--- branches/proto/v4/boost/graph/erdos_renyi_generator.hpp (original)
+++ branches/proto/v4/boost/graph/erdos_renyi_generator.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -19,7 +19,7 @@
 #include <boost/random/geometric_distribution.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 
 namespace boost {
 

Modified: branches/proto/v4/boost/graph/fruchterman_reingold.hpp
==============================================================================
--- branches/proto/v4/boost/graph/fruchterman_reingold.hpp (original)
+++ branches/proto/v4/boost/graph/fruchterman_reingold.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -9,7 +9,7 @@
 #ifndef BOOST_GRAPH_FRUCHTERMAN_REINGOLD_FORCE_DIRECTED_LAYOUT_HPP
 #define BOOST_GRAPH_FRUCHTERMAN_REINGOLD_FORCE_DIRECTED_LAYOUT_HPP
 
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/named_function_params.hpp>
 #include <boost/graph/simple_point.hpp>

Modified: branches/proto/v4/boost/graph/graphml.hpp
==============================================================================
--- branches/proto/v4/boost/graph/graphml.hpp (original)
+++ branches/proto/v4/boost/graph/graphml.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -187,7 +187,7 @@
 template<typename MutableGraph>
 char* mutate_graph_impl<MutableGraph>::m_type_names[] = {"boolean", "int", "long", "float", "double", "string"};
 
-void
+void BOOST_GRAPH_DECL
 read_graphml(std::istream& in, mutate_graph& g);
 
 template<typename MutableGraph>

Modified: branches/proto/v4/boost/graph/gursoy_atun_layout.hpp
==============================================================================
--- branches/proto/v4/boost/graph/gursoy_atun_layout.hpp (original)
+++ branches/proto/v4/boost/graph/gursoy_atun_layout.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -15,7 +15,7 @@
 // in EuroPar 2000, p. 234 of LNCS 1900
 // http://springerlink.metapress.com/link.asp?id=pcu07ew5rhexp9yt
 
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 #include <vector>
 #include <exception>
 #include <algorithm>

Modified: branches/proto/v4/boost/graph/kamada_kawai_spring_layout.hpp
==============================================================================
--- branches/proto/v4/boost/graph/kamada_kawai_spring_layout.hpp (original)
+++ branches/proto/v4/boost/graph/kamada_kawai_spring_layout.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -16,7 +16,7 @@
 #include <iterator>
 #include <vector>
 #include <boost/limits.hpp>
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 
 namespace boost {
   namespace detail { namespace graph {

Modified: branches/proto/v4/boost/graph/plod_generator.hpp
==============================================================================
--- branches/proto/v4/boost/graph/plod_generator.hpp (original)
+++ branches/proto/v4/boost/graph/plod_generator.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -16,7 +16,7 @@
 #include <boost/graph/graph_traits.hpp>
 #include <vector>
 #include <map>
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 
 namespace boost {
 

Modified: branches/proto/v4/boost/graph/reverse_graph.hpp
==============================================================================
--- branches/proto/v4/boost/graph/reverse_graph.hpp (original)
+++ branches/proto/v4/boost/graph/reverse_graph.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -146,16 +146,16 @@
 }
 
 template <class BidirectionalGraph, class GRef>
-inline std::pair<typename BidirectionalGraph::in_edge_iterator,
- typename BidirectionalGraph::in_edge_iterator>
-out_edges(const typename BidirectionalGraph::vertex_descriptor u,
+inline std::pair<typename graph_traits<BidirectionalGraph>::in_edge_iterator,
+ typename graph_traits<BidirectionalGraph>::in_edge_iterator>
+out_edges(const typename graph_traits<BidirectionalGraph>::vertex_descriptor u,
           const reverse_graph<BidirectionalGraph,GRef>& g)
 {
     return in_edges(u, g.m_g);
 }
 
 template <class BidirectionalGraph, class GRef>
-inline typename BidirectionalGraph::vertices_size_type
+inline typename graph_traits<BidirectionalGraph>::vertices_size_type
 num_vertices(const reverse_graph<BidirectionalGraph,GRef>& g)
 {
     return num_vertices(g.m_g);
@@ -169,26 +169,27 @@
 }
 
 template <class BidirectionalGraph, class GRef>
-inline typename BidirectionalGraph::degree_size_type
-out_degree(const typename BidirectionalGraph::vertex_descriptor u,
+inline typename graph_traits<BidirectionalGraph>::degree_size_type
+out_degree(const typename graph_traits<BidirectionalGraph>::vertex_descriptor u,
            const reverse_graph<BidirectionalGraph,GRef>& g)
 {
     return in_degree(u, g.m_g);
 }
 
 template <class BidirectionalGraph, class GRef>
-inline std::pair<typename BidirectionalGraph::edge_descriptor, bool>
-edge(const typename BidirectionalGraph::vertex_descriptor u,
- const typename BidirectionalGraph::vertex_descriptor v,
+inline std::pair<typename graph_traits<BidirectionalGraph>::edge_descriptor,
+ bool>
+edge(const typename graph_traits<BidirectionalGraph>::vertex_descriptor u,
+ const typename graph_traits<BidirectionalGraph>::vertex_descriptor v,
      const reverse_graph<BidirectionalGraph,GRef>& g)
 {
     return edge(v, u, g.m_g);
 }
 
 template <class BidirectionalGraph, class GRef>
-inline std::pair<typename BidirectionalGraph::out_edge_iterator,
- typename BidirectionalGraph::out_edge_iterator>
-in_edges(const typename BidirectionalGraph::vertex_descriptor u,
+inline std::pair<typename graph_traits<BidirectionalGraph>::out_edge_iterator,
+ typename graph_traits<BidirectionalGraph>::out_edge_iterator>
+in_edges(const typename graph_traits<BidirectionalGraph>::vertex_descriptor u,
          const reverse_graph<BidirectionalGraph,GRef>& g)
 {
     return out_edges(u, g.m_g);
@@ -197,20 +198,20 @@
 template <class BidirectionalGraph, class GRef>
 inline std::pair<typename reverse_graph<BidirectionalGraph,GRef>::adjacency_iterator,
     typename reverse_graph<BidirectionalGraph,GRef>::adjacency_iterator>
-adjacent_vertices(const typename BidirectionalGraph::vertex_descriptor u,
+adjacent_vertices(typename graph_traits<BidirectionalGraph>::vertex_descriptor u,
                   const reverse_graph<BidirectionalGraph,GRef>& g)
 {
     typedef reverse_graph<BidirectionalGraph,GRef> Graph;
- typename Graph::out_edge_iterator first, last;
+ typename graph_traits<Graph>::out_edge_iterator first, last;
     tie(first, last) = out_edges(u, g);
- typedef typename Graph::adjacency_iterator adjacency_iterator;
+ typedef typename graph_traits<Graph>::adjacency_iterator adjacency_iterator;
     return std::make_pair(adjacency_iterator(first, const_cast<Graph*>(&g)),
                           adjacency_iterator(last, const_cast<Graph*>(&g)));
 }
 
 template <class BidirectionalGraph, class GRef>
-inline typename BidirectionalGraph::degree_size_type
-in_degree(const typename BidirectionalGraph::vertex_descriptor u,
+inline typename graph_traits<BidirectionalGraph>::degree_size_type
+in_degree(const typename graph_traits<BidirectionalGraph>::vertex_descriptor u,
           const reverse_graph<BidirectionalGraph,GRef>& g)
 {
     return out_degree(u, g.m_g);

Modified: branches/proto/v4/boost/graph/wavefront.hpp
==============================================================================
--- branches/proto/v4/boost/graph/wavefront.hpp (original)
+++ branches/proto/v4/boost/graph/wavefront.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -16,7 +16,7 @@
 #include <boost/graph/graph_traits.hpp>
 #include <boost/detail/numeric_traits.hpp>
 #include <boost/graph/bandwidth.hpp>
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 #include <vector>
 #include <algorithm> // for std::min and std::max
 

Modified: branches/proto/v4/boost/interprocess/allocators/allocator.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/allocators/allocator.hpp (original)
+++ branches/proto/v4/boost/interprocess/allocators/allocator.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -147,7 +147,7 @@
       (void)hint;
       if(count > this->max_size())
          throw bad_alloc();
- return pointer((value_type*)mp_mngr->allocate(count*sizeof(T)));
+ return pointer(static_cast<value_type*>(mp_mngr->allocate(count*sizeof(T))));
    }
 
    //!Deallocates memory previously allocated.

Modified: branches/proto/v4/boost/interprocess/allocators/detail/adaptive_node_pool.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/allocators/detail/adaptive_node_pool.hpp (original)
+++ branches/proto/v4/boost/interprocess/allocators/detail/adaptive_node_pool.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -30,7 +30,7 @@
 #include <boost/interprocess/allocators/detail/node_tools.hpp>
 #include <boost/interprocess/allocators/detail/allocator_common.hpp>
 #include <cstddef>
-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>
 #include <cassert>
 
 //!\file
@@ -410,14 +410,14 @@
          (void)free_nodes;
          assert(free_nodes == mp_impl->m_real_num_node);
          assert(0 == to_deallocate->hdr_offset);
- hdr_offset_holder *hdr_off_holder = mp_impl->priv_first_subblock_from_block((block_info_t*)detail::get_pointer(to_deallocate));
+ hdr_offset_holder *hdr_off_holder = mp_impl->priv_first_subblock_from_block(detail::get_pointer(to_deallocate));
          mp_impl->mp_segment_mngr_base->deallocate(hdr_off_holder);
       }
       const private_adaptive_node_pool_impl *mp_impl;
    };
 
    //This macro will activate invariant checking. Slow, but helpful for debugging the code.
- #define BOOST_INTERPROCESS_ADAPTIVE_NODE_POOL_CHECK_INVARIANTS
+ //#define BOOST_INTERPROCESS_ADAPTIVE_NODE_POOL_CHECK_INVARIANTS
    void priv_invariants()
    #ifdef BOOST_INTERPROCESS_ADAPTIVE_NODE_POOL_CHECK_INVARIANTS
    #undef BOOST_INTERPROCESS_ADAPTIVE_NODE_POOL_CHECK_INVARIANTS
@@ -463,10 +463,10 @@
       for(; it != itend; ++it){
          hdr_offset_holder *hdr_off_holder = priv_first_subblock_from_block(&*it);
          for(std::size_t i = 0, max = m_num_subblocks; i < max; ++i){
- assert(hdr_off_holder->hdr_offset == std::size_t((char*)&*it- (char*)hdr_off_holder));
+ assert(hdr_off_holder->hdr_offset == std::size_t(reinterpret_cast<char*>(&*it)- reinterpret_cast<char*>(hdr_off_holder)));
             assert(0 == ((std::size_t)hdr_off_holder & (m_real_block_alignment - 1)));
             assert(0 == (hdr_off_holder->hdr_offset & (m_real_block_alignment - 1)));
- hdr_off_holder = (hdr_offset_holder *)((char*)hdr_off_holder + m_real_block_alignment);
+ hdr_off_holder = reinterpret_cast<hdr_offset_holder *>(reinterpret_cast<char*>(hdr_off_holder) + m_real_block_alignment);
          }
       }
       }
@@ -498,19 +498,20 @@
    block_info_t *priv_block_from_node(void *node) const
    {
       hdr_offset_holder *hdr_off_holder =
- (hdr_offset_holder*)((std::size_t)node & std::size_t(~(m_real_block_alignment - 1)));
+ reinterpret_cast<hdr_offset_holder*>((std::size_t)node & std::size_t(~(m_real_block_alignment - 1)));
       assert(0 == ((std::size_t)hdr_off_holder & (m_real_block_alignment - 1)));
       assert(0 == (hdr_off_holder->hdr_offset & (m_real_block_alignment - 1)));
- block_info_t *block = (block_info_t *)(((char*)hdr_off_holder) + hdr_off_holder->hdr_offset);
+ block_info_t *block = reinterpret_cast<block_info_t *>
+ (reinterpret_cast<char*>(hdr_off_holder) + hdr_off_holder->hdr_offset);
       assert(block->hdr_offset == 0);
       return block;
    }
 
    hdr_offset_holder *priv_first_subblock_from_block(block_info_t *block) const
    {
- hdr_offset_holder *hdr_off_holder = (hdr_offset_holder*)
- (((char*)block) - (m_num_subblocks-1)*m_real_block_alignment);
- assert(hdr_off_holder->hdr_offset == std::size_t((char*)block - (char*)hdr_off_holder));
+ hdr_offset_holder *hdr_off_holder = reinterpret_cast<hdr_offset_holder*>
+ (reinterpret_cast<char*>(block) - (m_num_subblocks-1)*m_real_block_alignment);
+ assert(hdr_off_holder->hdr_offset == std::size_t(reinterpret_cast<char*>(block) - reinterpret_cast<char*>(hdr_off_holder)));
       assert(0 == ((std::size_t)hdr_off_holder & (m_real_block_alignment - 1)));
       assert(0 == (hdr_off_holder->hdr_offset & (m_real_block_alignment - 1)));
       return hdr_off_holder;
@@ -526,7 +527,7 @@
       for(std::size_t i = 0; i != n; ++i){
          //We allocate a new NodeBlock and put it the last
          //element of the tree
- char *mem_address = detail::char_ptr_cast
+ char *mem_address = static_cast<char*>
             (mp_segment_mngr_base->allocate_aligned(real_block_size, m_real_block_alignment));
          if(!mem_address) throw std::bad_alloc();
          ++m_totally_free_blocks;

Modified: branches/proto/v4/boost/interprocess/allocators/detail/node_pool.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/allocators/detail/node_pool.hpp (original)
+++ branches/proto/v4/boost/interprocess/allocators/detail/node_pool.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -96,7 +96,7 @@
       if (m_freelist.empty())
          priv_alloc_block();
       //We take the first free node
- node_t *n = (node_t*)&m_freelist.front();
+ node_t *n = &m_freelist.front();
       m_freelist.pop_front();
       ++m_allocated;
       return n;
@@ -292,13 +292,13 @@
       : std::unary_function<typename free_nodes_t::value_type, bool>
    {
       is_between(const void *addr, std::size_t size)
- : beg_((const char *)addr), end_(beg_+size)
+ : beg_(static_cast<const char *>(addr)), end_(beg_+size)
       {}
       
       bool operator()(typename free_nodes_t::const_reference v) const
       {
- return (beg_ <= (const char *)&v &&
- end_ > (const char *)&v);
+ return (beg_ <= reinterpret_cast<const char *>(&v) &&
+ end_ > reinterpret_cast<const char *>(&v));
       }
       private:
       const char * beg_;
@@ -312,7 +312,7 @@
       //element in the free Node list
       std::size_t blocksize =
          detail::get_rounded_size(m_real_node_size*m_nodes_per_block, alignment_of<node_t>::value);
- char *pNode = detail::char_ptr_cast
+ char *pNode = reinterpret_cast<char*>
          (mp_segment_mngr_base->allocate(blocksize + sizeof(node_t)));
       if(!pNode) throw bad_alloc();
       char *pBlock = pNode;
@@ -337,14 +337,13 @@
    //!Returns a reference to the block hook placed in the end of the block
    static inline node_t & get_block_hook (void *block, std::size_t blocksize)
    {
- return *static_cast<node_t*>(
- static_cast<void*>((detail::char_ptr_cast(block) + blocksize)));
+ return *reinterpret_cast<node_t*>(reinterpret_cast<char*>(block) + blocksize);
    }
 
    //!Returns the starting address of the block reference to the block hook placed in the end of the block
    inline void *get_block_from_hook (node_t *hook, std::size_t blocksize)
    {
- return static_cast<void*>((detail::char_ptr_cast(hook) - blocksize));
+ return (reinterpret_cast<char*>(hook) - blocksize);
    }
 
    private:

Modified: branches/proto/v4/boost/interprocess/anonymous_shared_memory.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/anonymous_shared_memory.hpp (original)
+++ branches/proto/v4/boost/interprocess/anonymous_shared_memory.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -93,12 +93,12 @@
    #endif
 
 
- address = mmap( (void*)address
- , size
- , PROT_READ|PROT_WRITE
- , flags
- , fd
- , 0);
+ address = mmap( address
+ , size
+ , PROT_READ|PROT_WRITE
+ , flags
+ , fd
+ , 0);
 
    if(address == MAP_FAILED){
       if(fd != -1)

Modified: branches/proto/v4/boost/interprocess/containers/deque.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/containers/deque.hpp (original)
+++ branches/proto/v4/boost/interprocess/containers/deque.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -57,16 +57,21 @@
 #include <boost/interprocess/detail/min_max.hpp>
 #include <boost/interprocess/detail/mpl.hpp>
 #include <boost/interprocess/interprocess_fwd.hpp>
-#include <iterator>
 #include <cstddef>
 #include <iterator>
+#include <cassert>
 #include <memory>
 #include <algorithm>
 #include <stdexcept>
 #include <boost/detail/no_exceptions_support.hpp>
+#include <boost/type_traits/has_trivial_destructor.hpp>
+#include <boost/type_traits/has_trivial_copy.hpp>
+#include <boost/type_traits/has_trivial_assign.hpp>
+#include <boost/type_traits/has_nothrow_copy.hpp>
+#include <boost/type_traits/has_nothrow_assign.hpp>
 #include <boost/interprocess/detail/move_iterator.hpp>
 #include <boost/interprocess/detail/move.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
+#include <boost/interprocess/detail/advanced_insert_int.hpp>
 
 namespace boost {
 namespace interprocess {
@@ -75,6 +80,21 @@
 template <class T, class Alloc>
 class deque;
 
+template <class T, class A>
+struct deque_value_traits
+{
+ typedef T value_type;
+ typedef A allocator_type;
+ static const bool trivial_dctr = boost::has_trivial_destructor<value_type>::value;
+ static const bool trivial_dctr_after_move =
+ has_trivial_destructor_after_move<value_type>::value || trivial_dctr;
+ static const bool trivial_copy = has_trivial_copy<value_type>::value;
+ static const bool nothrow_copy = has_nothrow_copy<value_type>::value;
+ static const bool trivial_assign = has_trivial_assign<value_type>::value;
+ static const bool nothrow_assign = has_nothrow_assign<value_type>::value;
+
+};
+
 // Note: this function is simply a kludge to work around several compilers'
 // bugs in handling constant expressions.
 inline std::size_t deque_buf_size(std::size_t size)
@@ -105,16 +125,18 @@
    typedef allocator_type stored_allocator_type;
 
    protected:
- enum { trivial_dctr_after_move = boost::has_trivial_destructor<val_alloc_val>::value };
 
+ typedef deque_value_traits<T, Alloc> traits_t;
    typedef typename Alloc::template
       rebind<typename Alloc::pointer>::other map_allocator_type;
 
+ static std::size_t s_buffer_size() { return deque_buf_size(sizeof(T)); }
+
    val_alloc_ptr priv_allocate_node()
- { return this->alloc().allocate(deque_buf_size(sizeof(T))); }
+ { return this->alloc().allocate(s_buffer_size()); }
 
    void priv_deallocate_node(val_alloc_ptr p)
- { this->alloc().deallocate(p, deque_buf_size(sizeof(T))); }
+ { this->alloc().deallocate(p, s_buffer_size()); }
 
    ptr_alloc_ptr priv_allocate_map(std::size_t n)
       { return this->ptr_alloc().allocate(n); }
@@ -153,7 +175,7 @@
                               val_alloc_cptr, val_alloc_cref>
    {
       public:
- static std::size_t s_buffer_size() { return deque_buf_size(sizeof(T)); }
+ static std::size_t s_buffer_size() { return deque_base<T, Alloc>::s_buffer_size(); }
 
       typedef std::random_access_iterator_tag iterator_category;
       typedef val_alloc_val value_type;
@@ -297,7 +319,7 @@
       public:
       typedef std::random_access_iterator_tag iterator_category;
       typedef val_alloc_val value_type;
- typedef ptr_alloc_ptr pointer;
+ typedef val_alloc_ptr pointer;
       typedef val_alloc_ref reference;
       typedef std::size_t size_type;
       typedef std::ptrdiff_t difference_type;
@@ -371,34 +393,40 @@
          this->priv_deallocate_map(this->members_.m_map, this->members_.m_map_size);
       }
    }
+
+ private:
+ deque_base(const deque_base&);
   
    protected:
+
    void priv_initialize_map(std::size_t num_elements)
    {
- std::size_t num_nodes = num_elements / deque_buf_size(sizeof(T)) + 1;
+// if(num_elements){
+ std::size_t num_nodes = num_elements / s_buffer_size() + 1;
 
- this->members_.m_map_size = max_value((std::size_t) InitialMapSize, num_nodes + 2);
- this->members_.m_map = this->priv_allocate_map(this->members_.m_map_size);
+ this->members_.m_map_size = max_value((std::size_t) InitialMapSize, num_nodes + 2);
+ this->members_.m_map = this->priv_allocate_map(this->members_.m_map_size);
 
- ptr_alloc_ptr nstart = this->members_.m_map + (this->members_.m_map_size - num_nodes) / 2;
- ptr_alloc_ptr nfinish = nstart + num_nodes;
-
- BOOST_TRY {
- this->priv_create_nodes(nstart, nfinish);
- }
- BOOST_CATCH(...){
- this->priv_deallocate_map(this->members_.m_map, this->members_.m_map_size);
- this->members_.m_map = 0;
- this->members_.m_map_size = 0;
- BOOST_RETHROW
- }
- BOOST_CATCH_END
+ ptr_alloc_ptr nstart = this->members_.m_map + (this->members_.m_map_size - num_nodes) / 2;
+ ptr_alloc_ptr nfinish = nstart + num_nodes;
+
+ BOOST_TRY {
+ this->priv_create_nodes(nstart, nfinish);
+ }
+ BOOST_CATCH(...){
+ this->priv_deallocate_map(this->members_.m_map, this->members_.m_map_size);
+ this->members_.m_map = 0;
+ this->members_.m_map_size = 0;
+ BOOST_RETHROW
+ }
+ BOOST_CATCH_END
 
- this->members_.m_start.priv_set_node(nstart);
- this->members_.m_finish.priv_set_node(nfinish - 1);
- this->members_.m_start.m_cur = this->members_.m_start.m_first;
- this->members_.m_finish.m_cur = this->members_.m_finish.m_first +
- num_elements % deque_buf_size(sizeof(T));
+ this->members_.m_start.priv_set_node(nstart);
+ this->members_.m_finish.priv_set_node(nfinish - 1);
+ this->members_.m_start.m_cur = this->members_.m_start.m_first;
+ this->members_.m_finish.m_cur = this->members_.m_finish.m_first +
+ num_elements % s_buffer_size();
+// }
    }
 
    void priv_create_nodes(ptr_alloc_ptr nstart, ptr_alloc_ptr nfinish)
@@ -495,10 +523,14 @@
    typedef std::reverse_iterator<iterator> reverse_iterator;
 
    /// @cond
- protected: // Internal typedefs
+ private: // Internal typedefs
    typedef ptr_alloc_ptr index_pointer;
    static std::size_t s_buffer_size()
- { return deque_buf_size(sizeof(T)); }
+ { return Base::s_buffer_size(); }
+ typedef detail::advanced_insert_aux_int<value_type, iterator> advanced_insert_aux_int_t;
+ typedef repeat_iterator<T, difference_type> r_iterator;
+ typedef detail::move_iterator<r_iterator> move_it;
+
    /// @endcond
 
    allocator_type get_allocator() const { return Base::alloc(); }
@@ -528,6 +560,18 @@
    const_reverse_iterator rend() const
       { return const_reverse_iterator(this->members_.m_start); }
 
+ const_iterator cbegin() const
+ { return this->members_.m_start; }
+
+ const_iterator cend() const
+ { return this->members_.m_finish; }
+
+ const_reverse_iterator crbegin() const
+ { return const_reverse_iterator(this->members_.m_finish); }
+
+ const_reverse_iterator crend() const
+ { return const_reverse_iterator(this->members_.m_start); }
+
    reference operator[](size_type n)
       { return this->members_.m_start[difference_type(n)]; }
 
@@ -545,18 +589,12 @@
 
    reference front() { return *this->members_.m_start; }
 
- reference back()
- {
- iterator tmp = this->members_.m_finish;
- --tmp;
- return *tmp;
- }
+ reference back() { return *(end()-1); }
 
    const_reference front() const
       { return *this->members_.m_start; }
 
- const_reference back() const
- { const_iterator tmp = this->members_.m_finish; --tmp; return *tmp; }
+ const_reference back() const { return *(cend()-1); }
 
    size_type size() const
       { return this->members_.m_finish - this->members_.m_start; }
@@ -565,10 +603,11 @@
       { return this->alloc().max_size(); }
 
    bool empty() const
- { return this->members_.m_finish == this->members_.m_start; }
+ { return this->members_.m_finish == this->members_.m_start; }
 
    explicit deque(const allocator_type& a = allocator_type())
- : Base(a, 0) {}
+ : Base(a)
+ {}
 
    deque(const deque& x)
       : Base(x.alloc(), x.size())
@@ -576,11 +615,11 @@
 
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    deque(const detail::moved_object<deque> &mx)
- : Base(mx.get())
+ : Base(mx.get().alloc())
    { this->swap(mx.get()); }
    #else
    deque(deque &&x)
- : Base(detail::move_impl(x))
+ : Base(x.alloc())
    { this->swap(x); }
    #endif
 
@@ -593,8 +632,8 @@
 
    // Check whether it's an integral type. If so, it's not an iterator.
    template <class InpIt>
- deque(InpIt first, InpIt last,
- const allocator_type& a = allocator_type()) : Base(a)
+ deque(InpIt first, InpIt last, const allocator_type& a = allocator_type())
+ : Base(a)
    {
       //Dispatch depending on integer/iterator
       const bool aux_boolean = detail::is_convertible<InpIt, std::size_t>::value;
@@ -603,7 +642,9 @@
    }
 
    ~deque()
- { priv_destroy_range(this->members_.m_start, this->members_.m_finish); }
+ {
+ priv_destroy_range(this->members_.m_start, this->members_.m_finish);
+ }
 
    deque& operator= (const deque& x)
    {
@@ -622,13 +663,22 @@
 
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    deque& operator= (const detail::moved_object<deque> &mx)
- { this->clear(); this->swap(mx.get()); return *this; }
+ {
+ deque &x = mx.get();
    #else
- deque& operator= (deque &&mx)
- { this->clear(); this->swap(mx); return *this; }
+ deque& operator= (deque &&x)
+ {
    #endif
+ this->clear();
+ this->swap(x);
+ return *this;
+ }
 
+ #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    void swap(deque& x)
+ #else
+ void swap(deque &&x)
+ #endif
    {
       std::swap(this->members_.m_start, x.members_.m_start);
       std::swap(this->members_.m_finish, x.members_.m_finish);
@@ -639,16 +689,14 @@
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    void swap(const detail::moved_object<deque> &mx)
    { this->swap(mx.get()); }
- #else
- void swap(deque &&mx)
- { this->swap(mx); }
    #endif
 
    void assign(size_type n, const T& val)
    { this->priv_fill_assign(n, val); }
 
    template <class InpIt>
- void assign(InpIt first, InpIt last) {
+ void assign(InpIt first, InpIt last)
+ {
       //Dispatch depending on integer/iterator
       const bool aux_boolean = detail::is_convertible<InpIt, std::size_t>::value;
       typedef detail::bool_<aux_boolean> Result;
@@ -657,67 +705,59 @@
 
    void push_back(const value_type& t)
    {
- if (this->members_.m_finish.m_cur != this->members_.m_finish.m_last - 1) {
- new((void*)detail::get_pointer(this->members_.m_finish.m_cur))value_type(t);
- ++this->members_.m_finish.m_cur;
+ if(this->priv_push_back_simple_available()){
+ new(this->priv_push_back_simple_pos())value_type(t);
+ this->priv_push_back_simple_commit();
+ }
+ else{
+ this->priv_insert_aux(cend(), size_type(1), t);
       }
- else
- this->priv_push_back_aux(t);
    }
 
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    void push_back(const detail::moved_object<value_type> &mt)
    {
- if (this->members_.m_finish.m_cur != this->members_.m_finish.m_last - 1) {
- new((void*)detail::get_pointer(this->members_.m_finish.m_cur))value_type(mt);
- ++this->members_.m_finish.m_cur;
- }
- else
- this->priv_push_back_aux(mt);
- }
+ value_type &t = mt.get();
    #else
- void push_back(value_type &&mt)
+ void push_back(value_type &&t)
    {
- if (this->members_.m_finish.m_cur != this->members_.m_finish.m_last - 1) {
- new((void*)detail::get_pointer(this->members_.m_finish.m_cur))value_type(detail::move_impl(mt));
- ++this->members_.m_finish.m_cur;
+ #endif
+ if(this->priv_push_back_simple_available()){
+ new(this->priv_push_back_simple_pos())value_type(detail::move_impl(t));
+ this->priv_push_back_simple_commit();
+ }
+ else{
+ this->priv_insert_aux(cend(), move_it(r_iterator(t, 1)), move_it(r_iterator()));
       }
- else
- this->priv_push_back_aux(detail::move_impl(mt));
    }
- #endif
 
    void push_front(const value_type& t)
    {
- if (this->members_.m_start.m_cur != this->members_.m_start.m_first) {
- new((void*)(detail::get_pointer(this->members_.m_start.m_cur)- 1))value_type(t);
- --this->members_.m_start.m_cur;
+ if(this->priv_push_front_simple_available()){
+ new(this->priv_push_front_simple_pos())value_type(t);
+ this->priv_push_front_simple_commit();
+ }
+ else{
+ this->priv_insert_aux(cbegin(), size_type(1), t);
       }
- else
- this->priv_push_front_aux(t);
    }
 
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    void push_front(const detail::moved_object<value_type> &mt)
    {
- if (this->members_.m_start.m_cur != this->members_.m_start.m_first) {
- new((void*)(detail::get_pointer(this->members_.m_start.m_cur)- 1))value_type(mt);
- --this->members_.m_start.m_cur;
- }
- else
- this->priv_push_front_aux(mt);
- }
+ value_type &t = mt.get();
    #else
- void push_front(value_type &&mt)
+ void push_front(value_type &&t)
    {
- if (this->members_.m_start.m_cur != this->members_.m_start.m_first) {
- new((void*)(detail::get_pointer(this->members_.m_start.m_cur)- 1))value_type(detail::move_impl(mt));
- --this->members_.m_start.m_cur;
+ #endif
+ if(this->priv_push_front_simple_available()){
+ new(this->priv_push_front_simple_pos())value_type(detail::move_impl(t));
+ this->priv_push_front_simple_commit();
+ }
+ else{
+ this->priv_insert_aux(cbegin(), move_it(r_iterator(t, 1)), move_it(r_iterator()));
       }
- else
- this->priv_push_front_aux(detail::move_impl(mt));
    }
- #endif
 
    void pop_back()
    {
@@ -739,65 +779,53 @@
          this->priv_pop_front_aux();
    }
 
- iterator insert(iterator position, const value_type& x)
+ iterator insert(const_iterator position, const value_type& x)
    {
- if (position.m_cur == this->members_.m_start.m_cur) {
+ if (position == cbegin()){
          this->push_front(x);
- return this->members_.m_start;
+ return begin();
       }
- else if (position.m_cur == this->members_.m_finish.m_cur) {
+ else if (position == cend()){
          this->push_back(x);
- iterator tmp = this->members_.m_finish;
- --tmp;
- return tmp;
+ return (end()-1);
       }
       else {
- return this->priv_insert_aux(position, x);
+ size_type n = position - cbegin();
+ this->priv_insert_aux(position, size_type(1), x);
+ return iterator(this->begin() + n);
       }
    }
 
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- iterator insert(iterator position, const detail::moved_object<value_type> &mx)
+ iterator insert(const_iterator position, const detail::moved_object<value_type> &m)
    {
- if (position.m_cur == this->members_.m_start.m_cur) {
- this->push_front(mx);
- return this->members_.m_start;
- }
- else if (position.m_cur == this->members_.m_finish.m_cur) {
- this->push_back(mx);
- iterator tmp = this->members_.m_finish;
- --tmp;
- return tmp;
- }
- else {
- return this->priv_insert_aux(position, mx);
- }
- }
+ value_type &mx = m.get();
    #else
- iterator insert(iterator position, value_type &&mx)
+ iterator insert(const_iterator position, value_type &&mx)
    {
- if (position.m_cur == this->members_.m_start.m_cur) {
+ #endif
+ if (position == cbegin()) {
          this->push_front(detail::move_impl(mx));
- return this->members_.m_start;
+ return begin();
       }
- else if (position.m_cur == this->members_.m_finish.m_cur) {
+ else if (position == cend()) {
          this->push_back(detail::move_impl(mx));
- iterator tmp = this->members_.m_finish;
- --tmp;
- return tmp;
+ return(end()-1);
       }
       else {
- return this->priv_insert_aux(position, detail::move_impl(mx));
+ //Just call more general insert(pos, size, value) and return iterator
+ size_type n = position - begin();
+ this->priv_insert_aux(position, move_it(r_iterator(mx, 1)), move_it(r_iterator()));
+ return iterator(this->begin() + n);
       }
    }
- #endif
 
- void insert(iterator pos, size_type n, const value_type& x)
- { this->priv_fill_insert(pos, n, x); }
+ void insert(const_iterator pos, size_type n, const value_type& x)
+ { this->priv_fill_insert(pos, n, x); }
 
    // Check whether it's an integral type. If so, it's not an iterator.
    template <class InpIt>
- void insert(iterator pos, InpIt first, InpIt last)
+ void insert(const_iterator pos, InpIt first, InpIt last)
    {
       //Dispatch depending on integer/iterator
       const bool aux_boolean = detail::is_convertible<InpIt, std::size_t>::value;
@@ -805,6 +833,158 @@
       this->priv_insert_dispatch(pos, first, last, Result());
    }
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ template <class... Args>
+ void emplace_back(Args&&... args)
+ {
+ if(this->priv_push_back_simple_available()){
+ new(this->priv_push_back_simple_pos())value_type(detail::forward_impl<Args>(args)...);
+ this->priv_push_back_simple_commit();
+ }
+ else{
+ detail::advanced_insert_aux_emplace<T, iterator, Args...> proxy(detail::forward_impl<Args>(args)...);
+ this->priv_insert_aux_impl(this->cend(), 1, proxy);
+ }
+ }
+
+ template <class... Args>
+ void emplace_front(Args&&... args)
+ {
+ if(this->priv_push_front_simple_available()){
+ new(this->priv_push_front_simple_pos())value_type(detail::forward_impl<Args>(args)...);
+ this->priv_push_front_simple_commit();
+ }
+ else{
+ detail::advanced_insert_aux_emplace<T, iterator, Args...> proxy(detail::forward_impl<Args>(args)...);
+ this->priv_insert_aux_impl(this->cbegin(), 1, proxy);
+ }
+ }
+
+ template <class... Args>
+ iterator emplace(const_iterator p, Args&&... args)
+ {
+ if(p == this->cbegin()){
+ this->emplace_front(detail::forward_impl<Args>(args)...);
+ return this->begin();
+ }
+ else if(p == this->cend()){
+ this->emplace_back(detail::forward_impl<Args>(args)...);
+ return (this->end()-1);
+ }
+ else{
+ size_type n = p - this->cbegin();
+ detail::advanced_insert_aux_emplace<T, iterator, Args...> proxy(detail::forward_impl<Args>(args)...);
+ this->priv_insert_aux_impl(p, 1, proxy);
+ return iterator(this->begin() + n);
+ }
+ }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //0 args
+ void emplace_back()
+ {
+ if(priv_push_front_simple_available()){
+ new(priv_push_front_simple_pos())value_type();
+ priv_push_front_simple_commit();
+ }
+ else{
+ detail::advanced_insert_aux_emplace<T, iterator> proxy;
+ priv_insert_aux_impl(cend(), 1, proxy);
+ }
+ }
+
+ void emplace_front()
+ {
+ if(priv_push_front_simple_available()){
+ new(priv_push_front_simple_pos())value_type();
+ priv_push_front_simple_commit();
+ }
+ else{
+ detail::advanced_insert_aux_emplace<T, iterator> proxy;
+ priv_insert_aux_impl(cbegin(), 1, proxy);
+ }
+ }
+
+ iterator emplace(const_iterator p)
+ {
+ if(p == cbegin()){
+ emplace_front();
+ return begin();
+ }
+ else if(p == cend()){
+ emplace_back();
+ return (end()-1);
+ }
+ else{
+ size_type n = p - cbegin();
+ detail::advanced_insert_aux_emplace<T, iterator> proxy;
+ priv_insert_aux_impl(p, 1, proxy);
+ return iterator(this->begin() + n);
+ }
+ }
+
+ //advanced_insert_int.hpp includes all necessary preprocessor machinery...
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ void emplace_back(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ if(priv_push_back_simple_available()){ \
+ new(priv_push_back_simple_pos())value_type \
+ (BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ priv_push_back_simple_commit(); \
+ } \
+ else{ \
+ detail::BOOST_PP_CAT(BOOST_PP_CAT(advanced_insert_aux_emplace, n), arg) \
+ <value_type, iterator, BOOST_PP_ENUM_PARAMS(n, P)> \
+ proxy(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ priv_insert_aux_impl(cend(), 1, proxy); \
+ } \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ void emplace_front(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ if(priv_push_front_simple_available()){ \
+ new(priv_push_front_simple_pos())value_type \
+ (BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ priv_push_front_simple_commit(); \
+ } \
+ else{ \
+ detail::BOOST_PP_CAT(BOOST_PP_CAT(advanced_insert_aux_emplace, n), arg) \
+ <value_type, iterator, BOOST_PP_ENUM_PARAMS(n, P)> \
+ proxy(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ priv_insert_aux_impl(cbegin(), 1, proxy); \
+ } \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace(const_iterator p, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ if(p == this->cbegin()){ \
+ this->emplace_front(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ return this->begin(); \
+ } \
+ else if(p == cend()){ \
+ this->emplace_back(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ return (this->end()-1); \
+ } \
+ else{ \
+ size_type pos_num = p - this->cbegin(); \
+ detail::BOOST_PP_CAT(BOOST_PP_CAT(advanced_insert_aux_emplace, n), arg) \
+ <value_type, iterator, BOOST_PP_ENUM_PARAMS(n, P)> \
+ proxy(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ this->priv_insert_aux_impl(p, 1, proxy); \
+ return iterator(this->begin() + pos_num); \
+ } \
+ } \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    void resize(size_type new_size, const value_type& x)
    {
       const size_type len = size();
@@ -821,41 +1001,32 @@
          this->erase(this->members_.m_start + new_size, this->members_.m_finish);
       else{
          size_type n = new_size - this->size();
- this->priv_reserve_elements_at_back(new_size);
-
- while(n--){
- //T default_constructed = detail::move_impl(T());
- T default_constructed;
-/* if(boost::is_scalar<T>::value){
- //Value initialization
- new(&default_constructed)T();
- }*/
- this->push_back(detail::move_impl(default_constructed));
- }
+ detail::default_construct_aux_proxy<T, iterator, size_type> proxy(n);
+ priv_insert_aux_impl(this->cend(), n, proxy);
       }
    }
 
- iterator erase(iterator pos)
+ iterator erase(const_iterator pos)
    {
- iterator next = pos;
+ const_iterator next = pos;
       ++next;
       difference_type index = pos - this->members_.m_start;
       if (size_type(index) < (this->size() >> 1)) {
- std::copy_backward( detail::make_move_iterator(this->members_.m_start)
- , detail::make_move_iterator(pos)
- , next);
+ std::copy_backward( detail::make_move_iterator(begin())
+ , detail::make_move_iterator(iterator(pos))
+ , iterator(next));
          pop_front();
       }
       else {
- std::copy( detail::make_move_iterator(next)
- , detail::make_move_iterator(this->members_.m_finish)
- , pos);
+ std::copy( detail::make_move_iterator(iterator(next))
+ , detail::make_move_iterator(end())
+ , iterator(pos));
          pop_back();
       }
       return this->members_.m_start + index;
    }
 
- iterator erase(iterator first, iterator last)
+ iterator erase(const_iterator first, const_iterator last)
    {
       if (first == this->members_.m_start && last == this->members_.m_finish) {
          this->clear();
@@ -865,21 +1036,21 @@
          difference_type n = last - first;
          difference_type elems_before = first - this->members_.m_start;
          if (elems_before < static_cast<difference_type>(this->size() - n) - elems_before) {
- std::copy_backward( detail::make_move_iterator(this->members_.m_start)
- , detail::make_move_iterator(first)
- , last);
+ std::copy_backward( detail::make_move_iterator(begin())
+ , detail::make_move_iterator(iterator(first))
+ , iterator(last));
             iterator new_start = this->members_.m_start + n;
- if(!Base::trivial_dctr_after_move)
+ if(!Base::traits_t::trivial_dctr_after_move)
                this->priv_destroy_range(this->members_.m_start, new_start);
             this->priv_destroy_nodes(new_start.m_node, this->members_.m_start.m_node);
             this->members_.m_start = new_start;
          }
          else {
- std::copy( detail::make_move_iterator(last)
- , detail::make_move_iterator(this->members_.m_finish)
- , first);
+ std::copy( detail::make_move_iterator(iterator(last))
+ , detail::make_move_iterator(end())
+ , iterator(first));
             iterator new_finish = this->members_.m_finish - n;
- if(!Base::trivial_dctr_after_move)
+ if(!Base::traits_t::trivial_dctr_after_move)
                this->priv_destroy_range(new_finish, this->members_.m_finish);
             this->priv_destroy_nodes(new_finish.m_node + 1, this->members_.m_finish.m_node + 1);
             this->members_.m_finish = new_finish;
@@ -911,56 +1082,58 @@
    /// @cond
    private:
 
- template <class InpIt>
- void insert(iterator pos, InpIt first, InpIt last, std::input_iterator_tag)
- { std::copy(first, last, std::inserter(*this, pos)); }
+ bool priv_push_back_simple_available() const
+ {
+ return this->members_.m_map &&
+ (this->members_.m_finish.m_cur != (this->members_.m_finish.m_last - 1));
+ }
 
- template <class FwdIt>
- void insert(iterator pos, FwdIt first, FwdIt last, std::forward_iterator_tag)
+ void *priv_push_back_simple_pos() const
    {
-
- size_type n = 0;
- n = std::distance(first, last);
+ return static_cast<void*>(detail::get_pointer(this->members_.m_finish.m_cur));
+ }
 
- if (pos.m_cur == this->members_.m_start.m_cur) {
- iterator new_start = this->priv_reserve_elements_at_front(n);
- BOOST_TRY{
- std::uninitialized_copy(first, last, new_start);
- this->members_.m_start = new_start;
- }
- BOOST_CATCH(...){
- this->priv_destroy_nodes(new_start.m_node, this->members_.m_start.m_node);
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
- else if (pos.m_cur == this->members_.m_finish.m_cur) {
- iterator new_finish = this->priv_reserve_elements_at_back(n);
- BOOST_TRY{
- std::uninitialized_copy(first, last, this->members_.m_finish);
- this->members_.m_finish = new_finish;
- }
- BOOST_CATCH(...){
- this->priv_destroy_nodes(this->members_.m_finish.m_node + 1, new_finish.m_node + 1);
- BOOST_RETHROW
- }
- BOOST_CATCH_END
+ void priv_push_back_simple_commit()
+ {
+ ++this->members_.m_finish.m_cur;
+ }
+
+ bool priv_push_front_simple_available() const
+ {
+ return this->members_.m_map &&
+ (this->members_.m_start.m_cur != this->members_.m_start.m_first);
+ }
+
+ void *priv_push_front_simple_pos() const
+ { return static_cast<void*>(detail::get_pointer(this->members_.m_start.m_cur) - 1); }
+
+ void priv_push_front_simple_commit()
+ { --this->members_.m_start.m_cur; }
+
+ template <class InpIt>
+ void priv_insert_aux(const_iterator pos, InpIt first, InpIt last, std::input_iterator_tag)
+ {
+ for(;first != last; ++first){
+ this->insert(pos, move_impl(value_type(*first)));
       }
- else
- this->priv_insert_aux(pos, first, last, n);
    }
 
+ template <class FwdIt>
+ void priv_insert_aux(const_iterator pos, FwdIt first, FwdIt last, std::forward_iterator_tag)
+ { this->priv_insert_aux(pos, first, last); }
+
   // assign(), a generalized assignment member function. Two
   // versions: one that takes a count, and one that takes a range.
   // The range version is a member template, so we dispatch on whether
   // or not the type is an integer.
- void priv_fill_assign(size_type n, const T& val) {
+ void priv_fill_assign(size_type n, const T& val)
+ {
       if (n > size()) {
          std::fill(begin(), end(), val);
- this->insert(end(), n - size(), val);
+ this->insert(cend(), n - size(), val);
       }
       else {
- this->erase(begin() + n, end());
+ this->erase(cbegin() + n, cend());
          std::fill(begin(), end(), val);
       }
    }
@@ -1009,112 +1182,80 @@
       for ( ; first != last && cur != end(); ++cur, ++first)
          *cur = *first;
       if (first == last)
- this->erase(cur, end());
+ this->erase(cur, cend());
       else
- this->insert(end(), first, last);
+ this->insert(cend(), first, last);
    }
 
    template <class FwdIt>
- void priv_assign_aux(FwdIt first, FwdIt last,
- std::forward_iterator_tag) {
- size_type len = 0;
- std::distance(first, last, len);
+ void priv_assign_aux(FwdIt first, FwdIt last, std::forward_iterator_tag)
+ {
+ size_type len = std::distance(first, last);
       if (len > size()) {
          FwdIt mid = first;
          std::advance(mid, size());
          std::copy(first, mid, begin());
- this->insert(end(), mid, last);
+ this->insert(cend(), mid, last);
       }
       else
- this->erase(std::copy(first, last, begin()), end());
+ this->erase(std::copy(first, last, begin()), cend());
    }
 
    template <class Integer>
- void priv_insert_dispatch(iterator pos, Integer n, Integer x,
- detail::true_)
- {
- this->priv_fill_insert(pos, (size_type) n, (value_type) x);
- }
+ void priv_insert_dispatch(const_iterator pos, Integer n, Integer x, detail::true_)
+ { this->priv_fill_insert(pos, (size_type) n, (value_type) x); }
 
    template <class InpIt>
- void priv_insert_dispatch(iterator pos,
- InpIt first, InpIt last,
- detail::false_)
+ void priv_insert_dispatch(const_iterator pos,InpIt first, InpIt last, detail::false_)
    {
       typedef typename std::iterator_traits<InpIt>::iterator_category ItCat;
- this->insert(pos, first, last, ItCat());
+ this->priv_insert_aux(pos, first, last, ItCat());
    }
 
- iterator priv_insert_aux(iterator pos, const value_type& x)
+ void priv_insert_aux(const_iterator pos, size_type n, const value_type& x)
    {
- size_type n = pos - begin();
- this->priv_insert_aux(pos, size_type(1), x);
- return iterator(this->begin() + n);
+ typedef constant_iterator<value_type, difference_type> c_it;
+ this->priv_insert_aux(pos, c_it(x, n), c_it());
    }
 
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- iterator priv_insert_aux(iterator pos, const detail::moved_object<value_type> &mx)
- {
- typedef repeat_iterator<T, difference_type> r_iterator;
- typedef detail::move_iterator<r_iterator> move_it;
- //Just call more general insert(pos, size, value) and return iterator
- size_type n = pos - begin();
- this->insert(pos
- ,move_it(r_iterator(mx.get(), 1))
- ,move_it(r_iterator()));
- return iterator(this->begin() + n);
- }
- #else
- iterator priv_insert_aux(iterator pos, value_type &&mx)
+ //Just forward all operations to priv_insert_aux_impl
+ template <class FwdIt>
+ void priv_insert_aux(const_iterator p, FwdIt first, FwdIt last)
    {
- typedef repeat_iterator<T, difference_type> r_iterator;
- typedef detail::move_iterator<r_iterator> move_it;
- //Just call more general insert(pos, size, value) and return iterator
- size_type n = pos - begin();
- this->insert(pos
- ,move_it(r_iterator(mx, 1))
- ,move_it(r_iterator()));
- return iterator(this->begin() + n);
+ detail::advanced_insert_aux_proxy<T, FwdIt, iterator> proxy(first, last);
+ priv_insert_aux_impl(p, (size_type)std::distance(first, last), proxy);
    }
- #endif
 
- void priv_insert_aux(iterator pos, size_type n, const value_type& x)
+ void priv_insert_aux_impl(const_iterator p, size_type n, advanced_insert_aux_int_t &interf)
    {
- typedef constant_iterator<value_type, difference_type> c_it;
- this->insert(pos, c_it(x, n), c_it());
- }
+ iterator pos(p);
+ if(!this->members_.m_map){
+ this->priv_initialize_map(0);
+ pos = this->begin();
+ }
 
- template <class FwdIt>
- void priv_insert_aux(iterator pos, FwdIt first, FwdIt last, size_type n)
- {
       const difference_type elemsbefore = pos - this->members_.m_start;
- size_type length = size();
+ size_type length = this->size();
       if (elemsbefore < static_cast<difference_type>(length / 2)) {
          iterator new_start = this->priv_reserve_elements_at_front(n);
          iterator old_start = this->members_.m_start;
          pos = this->members_.m_start + elemsbefore;
- BOOST_TRY {
- if (elemsbefore >= difference_type(n)) {
- iterator start_n = this->members_.m_start + difference_type(n);
- std::uninitialized_copy(detail::make_move_iterator(this->members_.m_start), detail::make_move_iterator(start_n), new_start);
- this->members_.m_start = new_start;
- std::copy(detail::make_move_iterator(start_n), detail::make_move_iterator(pos), old_start);
- std::copy(first, last, pos - difference_type(n));
- }
- else {
- FwdIt mid = first;
- std::advance(mid, difference_type(n) - elemsbefore);
- this->priv_uninitialized_copy_copy
- (detail::make_move_iterator(this->members_.m_start), detail::make_move_iterator(pos), first, mid, new_start);
- this->members_.m_start = new_start;
- std::copy(mid, last, old_start);
- }
+ if (elemsbefore >= difference_type(n)) {
+ iterator start_n = this->members_.m_start + difference_type(n);
+ std::uninitialized_copy(detail::make_move_iterator(this->members_.m_start), detail::make_move_iterator(start_n), new_start);
+ this->members_.m_start = new_start;
+ std::copy(detail::make_move_iterator(start_n), detail::make_move_iterator(pos), old_start);
+ interf.copy_all_to(pos - difference_type(n));
          }
- BOOST_CATCH(...){
- this->priv_destroy_nodes(new_start.m_node, this->members_.m_start.m_node);
- BOOST_RETHROW
+ else {
+ difference_type mid_count = (difference_type(n) - elemsbefore);
+ iterator mid_start = old_start - mid_count;
+ interf.uninitialized_copy_some_and_update(mid_start, mid_count, true);
+ this->members_.m_start = mid_start;
+ std::uninitialized_copy(detail::make_move_iterator(old_start), detail::make_move_iterator(pos), new_start);
+ this->members_.m_start = new_start;
+ interf.copy_all_to(old_start);
          }
- BOOST_CATCH_END
       }
       else {
          iterator new_finish = this->priv_reserve_elements_at_back(n);
@@ -1122,31 +1263,24 @@
          const difference_type elemsafter =
             difference_type(length) - elemsbefore;
          pos = this->members_.m_finish - elemsafter;
- BOOST_TRY {
- if (elemsafter > difference_type(n)) {
- iterator finish_n = this->members_.m_finish - difference_type(n);
- std::uninitialized_copy(detail::make_move_iterator(finish_n), detail::make_move_iterator(this->members_.m_finish), this->members_.m_finish);
- this->members_.m_finish = new_finish;
- std::copy_backward(detail::make_move_iterator(pos), detail::make_move_iterator(finish_n), old_finish);
- std::copy(first, last, pos);
- }
- else {
- FwdIt mid = first;
- std::advance(mid, elemsafter);
- this->priv_uninitialized_copy_copy(mid, last, detail::make_move_iterator(pos), detail::make_move_iterator(this->members_.m_finish), this->members_.m_finish);
- this->members_.m_finish = new_finish;
- std::copy(first, mid, pos);
- }
+ if (elemsafter >= difference_type(n)) {
+ iterator finish_n = this->members_.m_finish - difference_type(n);
+ std::uninitialized_copy(detail::make_move_iterator(finish_n), detail::make_move_iterator(this->members_.m_finish), this->members_.m_finish);
+ this->members_.m_finish = new_finish;
+ std::copy_backward(detail::make_move_iterator(pos), detail::make_move_iterator(finish_n), old_finish);
+ interf.copy_all_to(pos);
          }
- BOOST_CATCH(...){
- this->priv_destroy_nodes(this->members_.m_finish.m_node + 1, new_finish.m_node + 1);
- BOOST_RETHROW
+ else {
+ interf.uninitialized_copy_some_and_update(old_finish, elemsafter, false);
+ this->members_.m_finish += n-elemsafter;
+ std::uninitialized_copy(detail::make_move_iterator(pos), detail::make_move_iterator(old_finish), this->members_.m_finish);
+ this->members_.m_finish = new_finish;
+ interf.copy_all_to(pos);
          }
- BOOST_CATCH_END
       }
    }
 
- void priv_fill_insert(iterator pos, size_type n, const value_type& x)
+ void priv_fill_insert(const_iterator pos, size_type n, const value_type& x)
    {
       typedef constant_iterator<value_type, difference_type> c_it;
       this->insert(pos, c_it(x, n), c_it());
@@ -1211,112 +1345,6 @@
       BOOST_CATCH_END
    }
 
- // Called only if this->members_.m_finish.m_cur == this->members_.m_finish.m_last - 1.
- void priv_push_back_aux(const value_type& t = value_type())
- {
- this->priv_reserve_map_at_back();
- *(this->members_.m_finish.m_node + 1) = this->priv_allocate_node();
- BOOST_TRY {
- new((void*)detail::get_pointer(this->members_.m_finish.m_cur))value_type(t);
- this->members_.m_finish.priv_set_node(this->members_.m_finish.m_node + 1);
- this->members_.m_finish.m_cur = this->members_.m_finish.m_first;
- }
- BOOST_CATCH(...){
- this->priv_deallocate_node(*(this->members_.m_finish.m_node + 1));
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
-
- // Called only if this->members_.m_finish.m_cur == this->members_.m_finish.m_last - 1.
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- void priv_push_back_aux(const detail::moved_object<value_type> &mt)
- {
- this->priv_reserve_map_at_back();
- *(this->members_.m_finish.m_node + 1) = this->priv_allocate_node();
- BOOST_TRY {
- new((void*)detail::get_pointer(this->members_.m_finish.m_cur))value_type(mt);
- this->members_.m_finish.priv_set_node(this->members_.m_finish.m_node + 1);
- this->members_.m_finish.m_cur = this->members_.m_finish.m_first;
- }
- BOOST_CATCH(...){
- this->priv_deallocate_node(*(this->members_.m_finish.m_node + 1));
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
- #else
- void priv_push_back_aux(value_type &&mt)
- {
- this->priv_reserve_map_at_back();
- *(this->members_.m_finish.m_node + 1) = this->priv_allocate_node();
- BOOST_TRY {
- new((void*)detail::get_pointer(this->members_.m_finish.m_cur))value_type(detail::move_impl(mt));
- this->members_.m_finish.priv_set_node(this->members_.m_finish.m_node + 1);
- this->members_.m_finish.m_cur = this->members_.m_finish.m_first;
- }
- BOOST_CATCH(...){
- this->priv_deallocate_node(*(this->members_.m_finish.m_node + 1));
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
- #endif
-
- // Called only if this->members_.m_start.m_cur == this->members_.m_start.m_first.
- void priv_push_front_aux(const value_type& t)
- {
- this->priv_reserve_map_at_front();
- *(this->members_.m_start.m_node - 1) = this->priv_allocate_node();
- BOOST_TRY {
- this->members_.m_start.priv_set_node(this->members_.m_start.m_node - 1);
- this->members_.m_start.m_cur = this->members_.m_start.m_last - 1;
- new((void*)detail::get_pointer(this->members_.m_start.m_cur))value_type(t);
- }
- BOOST_CATCH(...){
- ++this->members_.m_start;
- this->priv_deallocate_node(*(this->members_.m_start.m_node - 1));
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
-
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- void priv_push_front_aux(const detail::moved_object<value_type> &mt)
- {
- this->priv_reserve_map_at_front();
- *(this->members_.m_start.m_node - 1) = this->priv_allocate_node();
- BOOST_TRY {
- this->members_.m_start.priv_set_node(this->members_.m_start.m_node - 1);
- this->members_.m_start.m_cur = this->members_.m_start.m_last - 1;
- new((void*)detail::get_pointer(this->members_.m_start.m_cur))value_type(mt);
- }
- BOOST_CATCH(...){
- ++this->members_.m_start;
- this->priv_deallocate_node(*(this->members_.m_start.m_node - 1));
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
- #else
- void priv_push_front_aux(value_type &&mt)
- {
- this->priv_reserve_map_at_front();
- *(this->members_.m_start.m_node - 1) = this->priv_allocate_node();
- BOOST_TRY {
- this->members_.m_start.priv_set_node(this->members_.m_start.m_node - 1);
- this->members_.m_start.m_cur = this->members_.m_start.m_last - 1;
- new((void*)detail::get_pointer(this->members_.m_start.m_cur))value_type(detail::move_impl(mt));
- }
- BOOST_CATCH(...){
- ++this->members_.m_start;
- this->priv_deallocate_node(*(this->members_.m_start.m_node - 1));
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
- #endif
-
    // Called only if this->members_.m_finish.m_cur == this->members_.m_finish.m_first.
    void priv_pop_back_aux()
    {
@@ -1341,68 +1369,52 @@
    iterator priv_reserve_elements_at_front(size_type n)
    {
       size_type vacancies = this->members_.m_start.m_cur - this->members_.m_start.m_first;
- if (n > vacancies)
- this->priv_new_elements_at_front(n - vacancies);
+ if (n > vacancies){
+ size_type new_elems = n-vacancies;
+ size_type new_nodes = (new_elems + this->s_buffer_size() - 1) /
+ this->s_buffer_size();
+ size_type s = (size_type)(this->members_.m_start.m_node - this->members_.m_map);
+ if (new_nodes > s){
+ this->priv_reallocate_map(new_nodes, true);
+ }
+ size_type i = 1;
+ BOOST_TRY {
+ for (; i <= new_nodes; ++i)
+ *(this->members_.m_start.m_node - i) = this->priv_allocate_node();
+ }
+ BOOST_CATCH(...) {
+ for (size_type j = 1; j < i; ++j)
+ this->priv_deallocate_node(*(this->members_.m_start.m_node - j));
+ BOOST_RETHROW
+ }
+ BOOST_CATCH_END
+ }
       return this->members_.m_start - difference_type(n);
    }
 
    iterator priv_reserve_elements_at_back(size_type n)
    {
       size_type vacancies = (this->members_.m_finish.m_last - this->members_.m_finish.m_cur) - 1;
- if (n > vacancies)
- this->priv_new_elements_at_back(n - vacancies);
- return this->members_.m_finish + difference_type(n);
- }
-
- void priv_new_elements_at_front(size_type new_elems)
- {
- size_type new_nodes = (new_elems + this->s_buffer_size() - 1) /
- this->s_buffer_size();
- this->priv_reserve_map_at_front(new_nodes);
- size_type i = 1;
- BOOST_TRY {
- for (; i <= new_nodes; ++i)
- *(this->members_.m_start.m_node - i) = this->priv_allocate_node();
- }
- BOOST_CATCH(...) {
- for (size_type j = 1; j < i; ++j)
- this->priv_deallocate_node(*(this->members_.m_start.m_node - j));
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
-
- void priv_new_elements_at_back(size_type new_elems)
- {
- size_type new_nodes = (new_elems + this->s_buffer_size() - 1)
- / this->s_buffer_size();
- this->priv_reserve_map_at_back(new_nodes);
- size_type i;
- BOOST_TRY {
- for (i = 1; i <= new_nodes; ++i)
- *(this->members_.m_finish.m_node + i) = this->priv_allocate_node();
- }
- BOOST_CATCH(...) {
- for (size_type j = 1; j < i; ++j)
- this->priv_deallocate_node(*(this->members_.m_finish.m_node + j));
- BOOST_RETHROW
+ if (n > vacancies){
+ size_type new_elems = n - vacancies;
+ size_type new_nodes = (new_elems + this->s_buffer_size() - 1)/s_buffer_size();
+ size_type s = (size_type)(this->members_.m_map_size - (this->members_.m_finish.m_node - this->members_.m_map));
+ if (new_nodes + 1 > s){
+ this->priv_reallocate_map(new_nodes, false);
+ }
+ size_type i;
+ BOOST_TRY {
+ for (i = 1; i <= new_nodes; ++i)
+ *(this->members_.m_finish.m_node + i) = this->priv_allocate_node();
+ }
+ BOOST_CATCH(...) {
+ for (size_type j = 1; j < i; ++j)
+ this->priv_deallocate_node(*(this->members_.m_finish.m_node + j));
+ BOOST_RETHROW
+ }
+ BOOST_CATCH_END
       }
- BOOST_CATCH_END
- }
-
- // Makes sure the this->members_.m_map has space for new nodes. Does not actually
- // add the nodes. Can invalidate this->members_.m_map pointers. (And consequently,
- // deque iterators.)
- void priv_reserve_map_at_back (size_type nodes_to_add = 1)
- {
- if (nodes_to_add + 1 > this->members_.m_map_size - (this->members_.m_finish.m_node - this->members_.m_map))
- this->priv_reallocate_map(nodes_to_add, false);
- }
-
- void priv_reserve_map_at_front (size_type nodes_to_add = 1)
- {
- if (nodes_to_add > size_type(this->members_.m_start.m_node - this->members_.m_map))
- this->priv_reallocate_map(nodes_to_add, true);
+ return this->members_.m_finish + difference_type(n);
    }
 
    void priv_reallocate_map(size_type nodes_to_add, bool add_at_front)
@@ -1437,68 +1449,6 @@
       this->members_.m_start.priv_set_node(new_nstart);
       this->members_.m_finish.priv_set_node(new_nstart + old_num_nodes - 1);
    }
-
- // this->priv_uninitialized_copy_fill
- // Copies [first1, last1) into [first2, first2 + (last1 - first1)), and
- // fills [first2 + (last1 - first1), last2) with x.
- void priv_uninitialized_copy_fill(iterator first1, iterator last1,
- iterator first2, iterator last2,
- const T& x)
- {
- iterator mid2 = std::uninitialized_copy(first1, last1, first2);
- BOOST_TRY {
- std::uninitialized_fill(mid2, last2, x);
- }
- BOOST_CATCH(...){
- for(;first2 != mid2; ++first2){
- detail::get_pointer(&*first2)->~value_type();
- }
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
-
- // this->priv_uninitialized_fill_copy
- // Fills [result, mid) with x, and copies [first, last) into
- // [mid, mid + (last - first)).
- iterator priv_uninitialized_fill_copy(iterator result, iterator mid,
- const T& x,
- iterator first, iterator last)
- {
- std::uninitialized_fill(result, mid, x);
- BOOST_TRY {
- return std::uninitialized_copy(first, last, mid);
- }
- BOOST_CATCH(...){
- for(;result != mid; ++result){
- detail::get_pointer(&*result)->~value_type();
- }
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
-
- // this->priv_uninitialized_copy_copy
- // Copies [first1, last1) into [result, result + (last1 - first1)), and
- // copies [first2, last2) into
- // [result, result + (last1 - first1) + (last2 - first2)).
- template <class InpIt1, class InpIt2, class FwdIt>
- FwdIt priv_uninitialized_copy_copy(InpIt1 first1, InpIt1 last1,
- InpIt2 first2, InpIt2 last2,
- FwdIt result)
- {
- FwdIt mid = std::uninitialized_copy(first1, last1, result);
- BOOST_TRY {
- return std::uninitialized_copy(first2, last2, mid);
- }
- BOOST_CATCH(...){
- for(;result != mid; ++result){
- detail::get_pointer(&*result)->~value_type();
- }
- BOOST_RETHROW
- }
- BOOST_CATCH_END
- }
    /// @endcond
 };
 

Modified: branches/proto/v4/boost/interprocess/containers/detail/flat_tree.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/containers/detail/flat_tree.hpp (original)
+++ branches/proto/v4/boost/interprocess/containers/detail/flat_tree.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -175,25 +175,37 @@
    { return this->m_data.m_vect.begin(); }
 
    const_iterator begin() const
+ { return this->cbegin(); }
+
+ const_iterator cbegin() const
    { return this->m_data.m_vect.begin(); }
 
    iterator end()
    { return this->m_data.m_vect.end(); }
 
    const_iterator end() const
+ { return this->cend(); }
+
+ const_iterator cend() const
    { return this->m_data.m_vect.end(); }
 
    reverse_iterator rbegin()
    { return reverse_iterator(this->end()); }
 
    const_reverse_iterator rbegin() const
- { return const_reverse_iterator(this->end()); }
+ { return this->crbegin(); }
+
+ const_reverse_iterator crbegin() const
+ { return const_reverse_iterator(this->cend()); }
 
    reverse_iterator rend()
    { return reverse_iterator(this->begin()); }
 
    const_reverse_iterator rend() const
- { return const_reverse_iterator(this->begin()); }
+ { return this->crend(); }
+
+ const_reverse_iterator crend() const
+ { return const_reverse_iterator(this->cbegin()); }
 
    bool empty() const
    { return this->m_data.m_vect.empty(); }
@@ -237,24 +249,18 @@
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    std::pair<iterator,bool> insert_unique(const detail::moved_object<value_type>& mval)
    {
- insert_commit_data data;
- std::pair<iterator,bool> ret = priv_insert_unique_prepare(mval.get(), data);
- if(ret.second){
- ret.first = priv_insert_commit(data, mval);
- }
- return ret;
- }
+ value_type &val = mval.get();
    #else
- std::pair<iterator,bool> insert_unique(value_type && mval)
+ std::pair<iterator,bool> insert_unique(value_type && val)
    {
+ #endif
       insert_commit_data data;
- std::pair<iterator,bool> ret = priv_insert_unique_prepare(mval, data);
+ std::pair<iterator,bool> ret = priv_insert_unique_prepare(val, data);
       if(ret.second){
- ret.first = priv_insert_commit(data, detail::move_impl(mval));
+ ret.first = priv_insert_commit(data, detail::move_impl(val));
       }
       return ret;
    }
- #endif
 
 
    iterator insert_equal(const value_type& val)
@@ -350,6 +356,146 @@
       priv_insert_equal(first, last, ItCat());
    }
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ template <class... Args>
+ iterator emplace_unique(Args&&... args)
+ {
+ value_type val(detail::forward_impl<Args>(args)...);
+ insert_commit_data data;
+ std::pair<iterator,bool> ret =
+ priv_insert_unique_prepare(val, data);
+ if(ret.second){
+ ret.first = priv_insert_commit(data, detail::move_impl<value_type>(val));
+ }
+ return ret.first;
+ }
+
+ template <class... Args>
+ iterator emplace_hint_unique(const_iterator hint, Args&&... args)
+ {
+ value_type val(detail::forward_impl<Args>(args)...);
+ insert_commit_data data;
+ std::pair<iterator,bool> ret = priv_insert_unique_prepare(hint, val, data);
+ if(ret.second){
+ ret.first = priv_insert_commit(data, detail::move_impl<value_type>(val));
+ }
+ return ret.first;
+ }
+
+ template <class... Args>
+ iterator emplace_equal(Args&&... args)
+ {
+ value_type val(detail::forward_impl<Args>(args)...);
+ iterator i = this->upper_bound(KeyOfValue()(val));
+ i = this->m_data.m_vect.insert(i, detail::move_impl<value_type>(val));
+ return i;
+ }
+
+ template <class... Args>
+ iterator emplace_hint_equal(const_iterator hint, Args&&... args)
+ {
+ value_type val(detail::forward_impl<Args>(args)...);
+ insert_commit_data data;
+ priv_insert_equal_prepare(hint, val, data);
+ return priv_insert_commit(data, detail::move_impl<value_type>(val));
+ }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ iterator emplace_unique()
+ {
+ detail::value_init<value_type> vval;
+ value_type &val = vval.m_t;
+ insert_commit_data data;
+ std::pair<iterator,bool> ret =
+ priv_insert_unique_prepare(val, data);
+ if(ret.second){
+ ret.first = priv_insert_commit(data, detail::move_impl<value_type>(val));
+ }
+ return ret.first;
+ }
+
+ iterator emplace_hint_unique(const_iterator hint)
+ {
+ detail::value_init<value_type> vval;
+ value_type &val = vval.m_t;
+ insert_commit_data data;
+ std::pair<iterator,bool> ret = priv_insert_unique_prepare(hint, val, data);
+ if(ret.second){
+ ret.first = priv_insert_commit(data, detail::move_impl<value_type>(val));
+ }
+ return ret.first;
+ }
+
+ iterator emplace_equal()
+ {
+ detail::value_init<value_type> vval;
+ value_type &val = vval.m_t;
+ iterator i = this->upper_bound(KeyOfValue()(val));
+ i = this->m_data.m_vect.insert(i, detail::move_impl<value_type>(val));
+ return i;
+ }
+
+ iterator emplace_hint_equal(const_iterator hint)
+ {
+ detail::value_init<value_type> vval;
+ value_type &val = vval.m_t;
+ insert_commit_data data;
+ priv_insert_equal_prepare(hint, val, data);
+ return priv_insert_commit(data, detail::move_impl<value_type>(val));
+ }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_unique(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ value_type val(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ insert_commit_data data; \
+ std::pair<iterator,bool> ret = priv_insert_unique_prepare(val, data); \
+ if(ret.second){ \
+ ret.first = priv_insert_commit(data, detail::move_impl<value_type>(val)); \
+ } \
+ return ret.first; \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint_unique(const_iterator hint, \
+ BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ value_type val(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ insert_commit_data data; \
+ std::pair<iterator,bool> ret = priv_insert_unique_prepare(hint, val, data); \
+ if(ret.second){ \
+ ret.first = priv_insert_commit(data, detail::move_impl<value_type>(val)); \
+ } \
+ return ret.first; \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_equal(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ value_type val(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ iterator i = this->upper_bound(KeyOfValue()(val)); \
+ i = this->m_data.m_vect.insert(i, detail::move_impl<value_type>(val)); \
+ return i; \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint_equal(const_iterator hint, \
+ BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ value_type val(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ insert_commit_data data; \
+ priv_insert_equal_prepare(hint, val, data); \
+ return priv_insert_commit(data, detail::move_impl<value_type>(val)); \
+ } \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    iterator erase(const_iterator position)
    { return this->m_data.m_vect.erase(position); }
 
@@ -435,14 +581,13 @@
    private:
    struct insert_commit_data
    {
- iterator position;
+ const_iterator position;
    };
 
    // insert/erase
    void priv_insert_equal_prepare
- (const_iterator p, const value_type& val, insert_commit_data &data)
+ (const_iterator pos, const value_type& val, insert_commit_data &data)
    {
- iterator &pos = (iterator &)(const_iterator &)p;
       // N1780
       // To insert val at pos:
       // if pos == end || val <= *pos
@@ -456,13 +601,13 @@
       // insert val before lower_bound(val)
       const value_compare &value_comp = this->m_data;
 
- if(pos == this->end() || !value_comp(*pos, val)){
- if (pos == this->begin() || !value_comp(val, pos[-1])){
+ if(pos == this->cend() || !value_comp(*pos, val)){
+ if (pos == this->cbegin() || !value_comp(val, pos[-1])){
             data.position = pos;
          }
          else{
             data.position =
- this->priv_upper_bound(this->begin(), pos, KeyOfValue()(val));
+ this->priv_upper_bound(this->cbegin(), pos, KeyOfValue()(val));
          }
       }
       //Works, but increases code complexity
@@ -471,17 +616,17 @@
       //}
       else{
          data.position =
- this->priv_lower_bound(pos, this->end(), KeyOfValue()(val));
+ this->priv_lower_bound(pos, this->cend(), KeyOfValue()(val));
       }
    }
 
    std::pair<iterator,bool> priv_insert_unique_prepare
- (iterator beg, iterator end, const value_type& val, insert_commit_data &commit_data)
+ (const_iterator beg, const_iterator end, const value_type& val, insert_commit_data &commit_data)
    {
       const value_compare &value_comp = this->m_data;
       commit_data.position = this->priv_lower_bound(beg, end, KeyOfValue()(val));
       return std::pair<iterator,bool>
- ( commit_data.position
+ ( *reinterpret_cast<iterator*>(&commit_data.position)
          , commit_data.position == end || value_comp(val, *commit_data.position));
    }
 
@@ -490,9 +635,8 @@
    { return priv_insert_unique_prepare(this->begin(), this->end(), val, commit_data); }
 
    std::pair<iterator,bool> priv_insert_unique_prepare
- (const_iterator p, const value_type& val, insert_commit_data &commit_data)
+ (const_iterator pos, const value_type& val, insert_commit_data &commit_data)
    {
- iterator &pos = (iterator &)(const_iterator &)p;
       //N1780. Props to Howard Hinnant!
       //To insert val at pos:
       //if pos == end || val <= *pos
@@ -506,17 +650,17 @@
       // insert val before lower_bound(val)
       const value_compare &value_comp = this->m_data;
 
- if(pos == this->end() || value_comp(val, *pos)){
- if(pos != this->begin() && !value_comp(val, pos[-1])){
+ if(pos == this->cend() || value_comp(val, *pos)){
+ if(pos != this->cbegin() && !value_comp(val, pos[-1])){
             if(value_comp(pos[-1], val)){
- commit_data.position = iterator(pos);
- return std::pair<iterator,bool>(pos, true);
+ commit_data.position = pos;
+ return std::pair<iterator,bool>(*reinterpret_cast<iterator*>(&pos), true);
             }
             else{
- return std::pair<iterator,bool>(pos, false);
+ return std::pair<iterator,bool>(*reinterpret_cast<iterator*>(&pos), false);
             }
          }
- return this->priv_insert_unique_prepare(this->begin(), pos, val, commit_data);
+ return this->priv_insert_unique_prepare(this->cbegin(), pos, val, commit_data);
       }
 
       // Works, but increases code complexity

Modified: branches/proto/v4/boost/interprocess/containers/detail/node_alloc_holder.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/containers/detail/node_alloc_holder.hpp (original)
+++ branches/proto/v4/boost/interprocess/containers/detail/node_alloc_holder.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -54,7 +54,7 @@
    { return static_cast<const ValueCompare &>(*this); }
 
    bool operator()(const Node &a, const Node &b) const
- { return ValueCompare::operator()(a.m_data, b.m_data); }
+ { return ValueCompare::operator()(a.get_data(), b.get_data()); }
 };
 
 template<class A, class ICont>
@@ -143,22 +143,8 @@
    { this->node_alloc().deallocate_one(p); }
 
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- template<class Convertible>
- static void construct(const NodePtr &ptr, const Convertible &value)
- { new((void*)detail::get_pointer(ptr)) Node(value); }
- #else
- template<class Convertible>
- static void construct(const NodePtr &ptr, Convertible &&value)
- { new((void*)detail::get_pointer(ptr)) Node(detail::forward_impl<Convertible>(value)); }
- #endif
-
- static void construct(const NodePtr &ptr)
- { new((void*)detail::get_pointer(ptr)) Node(); }
-
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    template<class Convertible1, class Convertible2>
- static void construct(const NodePtr &ptr,
- const detail::moved_object<std::pair<Convertible1, Convertible2> > &value)
+ static void construct(const NodePtr &ptr, const detail::moved_object<std::pair<Convertible1, Convertible2> > &value)
    {
       typedef typename Node::hook_type hook_type;
       typedef typename Node::value_type::first_type first_type;
@@ -168,7 +154,7 @@
       //Hook constructor does not throw
       new(static_cast<hook_type*>(nodeptr))hook_type();
       //Now construct pair members_holder
- value_type *valueptr = &nodeptr->m_data;
+ value_type *valueptr = &nodeptr->get_data();
       new((void*)&valueptr->first) first_type(detail::move_impl(value.get().first));
       BOOST_TRY{
          new((void*)&valueptr->second) second_type(detail::move_impl(value.get().second));
@@ -182,8 +168,7 @@
    }
    #else
    template<class Convertible1, class Convertible2>
- static void construct(const NodePtr &ptr,
- std::pair<Convertible1, Convertible2> &&value)
+ static void construct(const NodePtr &ptr, std::pair<Convertible1, Convertible2> &&value)
    {
       typedef typename Node::hook_type hook_type;
       typedef typename Node::value_type::first_type first_type;
@@ -193,7 +178,7 @@
       //Hook constructor does not throw
       new(static_cast<hook_type*>(nodeptr))hook_type();
       //Now construct pair members_holder
- value_type *valueptr = &nodeptr->m_data;
+ value_type *valueptr = &nodeptr->get_data();
       new((void*)&valueptr->first) first_type(detail::move_impl(value.first));
       BOOST_TRY{
          new((void*)&valueptr->second) second_type(detail::move_impl(value.second));
@@ -210,43 +195,82 @@
    static void destroy(const NodePtr &ptr)
    { detail::get_pointer(ptr)->~Node(); }
 
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- template<class Convertible>
- NodePtr create_node(const Convertible& x)
+
+ #ifdef BOOST_INTERPROCESS_RVALUE_REFERENCE
+ Deallocator
+ #else
+ move_return<Deallocator>
+ #endif
+ create_node_and_deallocator()
    {
       NodePtr p = this->allocate_one();
       Deallocator node_deallocator(p, this->node_alloc());
- self_t::construct(p, x);
- node_deallocator.release();
- return (p);
+ return node_deallocator;
    }
- #else
- template<class Convertible>
- NodePtr create_node(Convertible &&x)
+
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ template<class ...Args>
+ static void construct(const NodePtr &ptr, Args &&...args)
+ { new((void*)detail::get_pointer(ptr)) Node(detail::forward_impl<Args>(args)...); }
+
+ template<class ...Args>
+ NodePtr create_node(Args &&...args)
    {
       NodePtr p = this->allocate_one();
       Deallocator node_deallocator(p, this->node_alloc());
- self_t::construct(p, detail::forward_impl<Convertible>(x));
+ self_t::construct(p, detail::forward_impl<Args>(args)...);
       node_deallocator.release();
       return (p);
    }
- #endif
 
- template<class It>
- NodePtr create_node_from_it(It it)
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ static void construct(const NodePtr &ptr)
+ { new((void*)detail::get_pointer(ptr)) Node(); }
+
+ NodePtr create_node()
    {
       NodePtr p = this->allocate_one();
       Deallocator node_deallocator(p, this->node_alloc());
- ::boost::interprocess::construct_in_place(detail::get_pointer(p), it);
+ self_t::construct(p);
       node_deallocator.release();
       return (p);
    }
 
- NodePtr create_node()
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ void construct(const NodePtr &ptr, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ new((void*)detail::get_pointer(ptr)) \
+ Node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ } \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ NodePtr create_node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ NodePtr p = this->allocate_one(); \
+ Deallocator node_deallocator(p, this->node_alloc()); \
+ self_t::construct(p, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ node_deallocator.release(); \
+ return (p); \
+ } \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ template<class It>
+ NodePtr create_node_from_it(It it)
    {
       NodePtr p = this->allocate_one();
       Deallocator node_deallocator(p, this->node_alloc());
- self_t::construct(p);
+ ::boost::interprocess::construct_in_place(detail::get_pointer(p), it);
       node_deallocator.release();
       return (p);
    }
@@ -339,7 +363,7 @@
       {}
 
       NodePtr operator()(const Node &other) const
- { return m_holder.create_node(other.m_data); }
+ { return m_holder.create_node(other.get_data()); }
 
       node_alloc_holder &m_holder;
    };

Modified: branches/proto/v4/boost/interprocess/containers/detail/tree.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/containers/detail/tree.hpp (original)
+++ branches/proto/v4/boost/interprocess/containers/detail/tree.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -52,7 +52,11 @@
 #include <boost/detail/no_exceptions_support.hpp>
 #include <boost/interprocess/containers/detail/node_alloc_holder.hpp>
 #include <boost/intrusive/rbtree.hpp>
+#ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
+#include <boost/interprocess/detail/preprocessor.hpp>
+#endif
 
+#include <utility> //std::pair
 #include <iterator>
 #include <algorithm>
 
@@ -84,39 +88,79 @@
    { return key_compare::operator()(KeyOfValue()(a), KeyOfValue()(b)); }
 };
 
-template <class T, class VoidPointer>
-struct rbtree_node
- : public bi::make_set_base_hook
- < bi::void_pointer<VoidPointer>
- , bi::link_mode<bi::normal_link>
- , bi::optimize_size<true>
- >::type
+template<class VoidPointer>
+struct rbtree_hook
 {
    typedef typename bi::make_set_base_hook
       < bi::void_pointer<VoidPointer>
       , bi::link_mode<bi::normal_link>
       , bi::optimize_size<true>
- >::type hook_type;
+ >::type type;
+};
+
+template<class T>
+struct rbtree_type
+{
+ typedef T type;
+};
+
+template<class T1, class T2>
+struct rbtree_type< std::pair<T1, T2> >
+{
+ typedef detail::pair<T1, T2> type;
+};
+
+template <class T, class VoidPointer>
+struct rbtree_node
+ : public rbtree_hook<VoidPointer>::type
+{
+ typedef typename rbtree_hook<VoidPointer>::type hook_type;
 
    typedef T value_type;
+ typedef typename rbtree_type<T>::type internal_type;
 
    typedef rbtree_node<T, VoidPointer> node_type;
 
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- template<class Convertible>
- rbtree_node(const Convertible &conv)
- : m_data(conv){}
- #else
- template<class Convertible>
- rbtree_node(Convertible &&conv)
- : m_data(detail::forward_impl<Convertible>(conv)){}
- #endif
+ #ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ rbtree_node()
+ : m_data()
+ {}
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ rbtree_node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ : m_data(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)) \
+ {} \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #else //#ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ template<class ...Args>
+ rbtree_node(Args &&...args)
+ : m_data(detail::forward_impl<Args>(args)...)
+ {}
+ #endif//#ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
 
    rbtree_node &operator=(const rbtree_node &other)
    { do_assign(other.m_data); return *this; }
 
- T m_data;
- private:
+ T &get_data()
+ {
+ T* ptr = reinterpret_cast<T*>(&this->m_data);
+ return *ptr;
+ }
+
+ const T &get_data() const
+ {
+ const T* ptr = reinterpret_cast<const T*>(&this->m_data);
+ return *ptr;
+ }
+
+ private:
+ internal_type m_data;
 
    template<class A, class B>
    void do_assign(const std::pair<const A, B> &p)
@@ -125,49 +169,27 @@
       m_data.second = p.second;
    }
 
+ template<class A, class B>
+ void do_assign(const detail::pair<const A, B> &p)
+ {
+ const_cast<A&>(m_data.first) = p.first;
+ m_data.second = p.second;
+ }
+
    template<class V>
    void do_assign(const V &v)
    { m_data = v; }
 
    public:
- #if !defined(BOOST_INTERPROCESS_RVALUE_REFERENCE)
-
- template<class Convertible>
- static void construct(node_type *ptr, const Convertible &value)
- { new(ptr) node_type(value); }
-
- template<class Convertible1, class Convertible2>
- static void construct(node_type *ptr,
- const detail::moved_object<std::pair<Convertible1, Convertible2> > &value)
- {
- //std::pair is not movable so we define our own type and overwrite it
- typedef detail::pair<typename node_type::value_type::first_type
- ,typename node_type::value_type::second_type> hack_pair_t;
-
- typedef rbtree_node<hack_pair_t, VoidPointer> hack_node_t;
-
- new((void*)ptr) hack_node_t(value);
- }
-
- #elif !defined(BOOST_INTERPROCESS_RVALUE_PAIR)
-
    template<class Convertible>
- static void construct(node_type *ptr, Convertible &&value)
- { new(ptr) node_type(detail::forward_impl<Convertible>(value)); }
-
- template<class Convertible1, class Convertible2>
- static void construct(node_type *ptr,
- std::pair<Convertible1, Convertible2> &&value)
- {
- //std::pair is not movable so we define our own type and overwrite it
- typedef detail::pair<typename node_type::value_type::first_type
- ,typename node_type::value_type::second_type> hack_pair_t;
 
- typedef rbtree_node<hack_pair_t, VoidPointer> hack_node_t;
-
- new((void*)ptr) hack_node_t(value);
- }
+ static void construct(node_type *ptr
+ #if !defined(BOOST_INTERPROCESS_RVALUE_REFERENCE)
+ , const Convertible &value)
+ #else
+ , Convertible &&value)
    #endif
+ { new(ptr) node_type(detail::forward_impl<Convertible>(value)); }
 };
 
 }//namespace detail {
@@ -193,7 +215,7 @@
    typedef typename bi::make_rbtree
       <node_type
       ,bi::compare<node_compare_type>
- ,bi::base_hook<typename node_type::hook_type>
+ ,bi::base_hook<typename rbtree_hook<void_pointer>::type>
       ,bi::constant_time_size<true>
       ,bi::size_type<typename A::size_type>
>::type container_type;
@@ -302,11 +324,11 @@
       
       template<class KeyType>
       bool operator()(const Node &n, const KeyType &k) const
- { return KeyValueCompare::operator()(n.m_data, k); }
+ { return KeyValueCompare::operator()(n.get_data(), k); }
 
       template<class KeyType>
       bool operator()(const KeyType &k, const Node &n) const
- { return KeyValueCompare::operator()(k, n.m_data); }
+ { return KeyValueCompare::operator()(k, n.get_data()); }
    };
 
    typedef key_node_compare<value_compare> KeyNodeCompare;
@@ -341,10 +363,10 @@
 
       //Pointer like operators
       const_reference operator*() const
- { return m_it->m_data; }
+ { return m_it->get_data(); }
 
       const_pointer operator->() const
- { return const_pointer(&m_it->m_data); }
+ { return const_pointer(&m_it->get_data()); }
 
       //Increment / Decrement
       const_iterator& operator++()
@@ -387,8 +409,8 @@
       iterator(){}
 
       //Pointer like operators
- reference operator*() const { return this->m_it->m_data; }
- pointer operator->() const { return pointer(&this->m_it->m_data); }
+ reference operator*() const { return this->m_it->get_data(); }
+ pointer operator->() const { return pointer(&this->m_it->get_data()); }
 
       //Increment / Decrement
       iterator& operator++()
@@ -495,25 +517,59 @@
    { return iterator(this->icont().begin()); }
 
    const_iterator begin() const
- { return const_iterator(this->non_const_icont().begin()); }
+ { return this->cbegin(); }
 
    iterator end()
    { return iterator(this->icont().end()); }
 
    const_iterator end() const
- { return const_iterator(this->non_const_icont().end()); }
+ { return this->cend(); }
 
    reverse_iterator rbegin()
    { return reverse_iterator(end()); }
 
    const_reverse_iterator rbegin() const
- { return const_reverse_iterator(end()); }
+ { return this->crbegin(); }
 
    reverse_iterator rend()
    { return reverse_iterator(begin()); }
 
    const_reverse_iterator rend() const
- { return const_reverse_iterator(begin()); }
+ { return this->crend(); }
+
+ //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cbegin() const
+ { return const_iterator(this->non_const_icont().begin()); }
+
+ //! <b>Effects</b>: Returns a const_iterator to the end of the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cend() const
+ { return const_iterator(this->non_const_icont().end()); }
+
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crbegin() const
+ { return const_reverse_iterator(cend()); }
+
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crend() const
+ { return const_reverse_iterator(cbegin()); }
 
    bool empty() const
    { return !this->size(); }
@@ -621,6 +677,113 @@
    }
    #endif
 
+ private:
+ iterator emplace_unique_impl(NodePtr p)
+ {
+ value_type &v = p->get_data();
+ insert_commit_data data;
+ std::pair<iterator,bool> ret =
+ this->insert_unique_check(KeyOfValue()(v), data);
+ if(!ret.second){
+ Destroyer(this->node_alloc())(p);
+ return ret.first;
+ }
+ return iterator(iiterator(this->icont().insert_unique_commit(*p, data)));
+ }
+
+ iterator emplace_unique_hint_impl(const_iterator hint, NodePtr p)
+ {
+ value_type &v = p->get_data();
+ insert_commit_data data;
+ std::pair<iterator,bool> ret =
+ this->insert_unique_check(hint, KeyOfValue()(v), data);
+ if(!ret.second){
+ Destroyer(this->node_alloc())(p);
+ return ret.first;
+ }
+ return iterator(iiterator(this->icont().insert_unique_commit(*p, data)));
+ }
+
+ public:
+
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ template <class... Args>
+ iterator emplace_unique(Args&&... args)
+ { return this->emplace_unique_impl(AllocHolder::create_node(detail::forward_impl<Args>(args)...)); }
+
+ template <class... Args>
+ iterator emplace_hint_unique(const_iterator hint, Args&&... args)
+ { return this->emplace_unique_hint_impl(hint, AllocHolder::create_node(detail::forward_impl<Args>(args)...)); }
+
+ template <class... Args>
+ iterator emplace_equal(Args&&... args)
+ {
+ NodePtr p(AllocHolder::create_node(detail::forward_impl<Args>(args)...));
+ return iterator(this->icont().insert_equal(this->icont().end(), *p));
+ }
+
+ template <class... Args>
+ iterator emplace_hint_equal(const_iterator hint, Args&&... args)
+ {
+ NodePtr p(AllocHolder::create_node(detail::forward_impl<Args>(args)...));
+ return iterator(this->icont().insert_equal(hint.get(), *p));
+ }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ iterator emplace_unique()
+ { return this->emplace_unique_impl(AllocHolder::create_node()); }
+
+ iterator emplace_hint_unique(const_iterator hint)
+ { return this->emplace_unique_hint_impl(hint, AllocHolder::create_node()); }
+
+ iterator emplace_equal()
+ {
+ NodePtr p(AllocHolder::create_node());
+ return iterator(this->icont().insert_equal(this->icont().end(), *p));
+ }
+
+ iterator emplace_hint_equal(const_iterator hint)
+ {
+ NodePtr p(AllocHolder::create_node());
+ return iterator(this->icont().insert_equal(hint.get(), *p));
+ }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_unique(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ return this->emplace_unique_impl \
+ (AllocHolder::create_node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _))); \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint_unique(const_iterator hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ return this->emplace_unique_hint_impl \
+ (hint, AllocHolder::create_node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _))); \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_equal(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ NodePtr p(AllocHolder::create_node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _))); \
+ return iterator(this->icont().insert_equal(this->icont().end(), *p)); \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint_equal(const_iterator hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ NodePtr p(AllocHolder::create_node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _))); \
+ return iterator(this->icont().insert_equal(hint.get(), *p)); \
+ } \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    iterator insert_unique(const_iterator hint, const value_type& v)
    {
       insert_commit_data data;
@@ -663,7 +826,7 @@
       if(this->empty()){
          //Insert with end hint, to achieve linear
          //complexity if [first, last) is ordered
- iterator end(this->end());
+ const_iterator end(this->end());
          for( ; first != last; ++first)
             this->insert_unique(end, *first);
       }
@@ -722,7 +885,7 @@
    {
       //Insert with end hint, to achieve linear
       //complexity if [first, last) is ordered
- iterator end(this->end());
+ const_iterator end(this->cend());
       for( ; first != last; ++first)
          this->insert_equal(end, *first);
    }
@@ -815,7 +978,6 @@
    class insertion_functor
    {
       Icont &icont_;
- typename Icont::iterator pos_;
 
       public:
       insertion_functor(Icont &icont)
@@ -823,7 +985,7 @@
       {}
 
       void operator()(Node &n)
- { this->icont_.insert_equal(this->icont_.end(), n); }
+ { this->icont_.insert_equal(this->icont_.cend(), n); }
    };
 
 

Modified: branches/proto/v4/boost/interprocess/containers/flat_map.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/containers/flat_map.hpp (original)
+++ branches/proto/v4/boost/interprocess/containers/flat_map.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -77,7 +77,7 @@
                            Pred,
                            Alloc> tree_t;
 
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
+ //#ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    //This is the real tree stored here. It's based on a movable pair
    typedef detail::flat_tree<Key,
                            detail::pair<Key, T>,
@@ -85,10 +85,11 @@
                            Pred,
                            typename Alloc::template
                               rebind<detail::pair<Key, T> >::other> impl_tree_t;
+/*
    #else
    typedef tree_t impl_tree_t;
    #endif
-
+*/
    impl_tree_t m_flat_tree; // flat tree representing flat_map
 
    typedef typename impl_tree_t::value_type impl_value_type;
@@ -106,20 +107,17 @@
    typedef detail::moved_object<impl_value_type> impl_moved_value_type;
    #endif
 
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
+ //#ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    template<class D, class S>
    static D &force(const S &s)
- { return *((D*)(void*)(const void*)(&s)); }
- #else
- //For rvalue-aware compilers, just forward
- template<class Type>
- static const Type &force(const Type &t)
- { return t; }
-
- template<class Type>
- static Type &force(Type &t)
- { return t; }
- #endif
+ { return *const_cast<D*>(reinterpret_cast<const D*>(&s)); }
+
+ template<class D, class S>
+ static D force_copy(S s)
+ {
+ value_type *vp = reinterpret_cast<value_type *>(&*s);
+ return D(vp);
+ }
 
    /// @endcond
 
@@ -235,7 +233,7 @@
    //!
    //! <b>Complexity</b>: Constant.
    iterator begin()
- { return force<iterator>(m_flat_tree.begin()); }
+ { return force_copy<iterator>(m_flat_tree.begin()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
    //!
@@ -245,13 +243,21 @@
    const_iterator begin() const
       { return force<const_iterator>(m_flat_tree.begin()); }
 
+ //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cbegin() const
+ { return force<const_iterator>(m_flat_tree.cbegin()); }
+
    //! <b>Effects</b>: Returns an iterator to the end of the container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
    iterator end()
- { return force<iterator>(m_flat_tree.end()); }
+ { return force_copy<iterator>(m_flat_tree.end()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the end of the container.
    //!
@@ -261,6 +267,14 @@
    const_iterator end() const
       { return force<const_iterator>(m_flat_tree.end()); }
 
+ //! <b>Effects</b>: Returns a const_iterator to the end of the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cend() const
+ { return force<const_iterator>(m_flat_tree.cend()); }
+
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
    //! of the reversed container.
    //!
@@ -279,6 +293,15 @@
    const_reverse_iterator rbegin() const
       { return force<const_reverse_iterator>(m_flat_tree.rbegin()); }
 
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crbegin() const
+ { return force<const_reverse_iterator>(m_flat_tree.crbegin()); }
+
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
    //! of the reversed container.
    //!
@@ -297,6 +320,15 @@
    const_reverse_iterator rend() const
       { return force<const_reverse_iterator>(m_flat_tree.rend()); }
 
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crend() const
+ { return force<const_reverse_iterator>(m_flat_tree.crend()); }
+
    //! <b>Effects</b>: Returns true if the container contains no elements.
    //!
    //! <b>Throws</b>: Nothing.
@@ -425,7 +457,8 @@
          m_flat_tree.insert_unique(force<impl_moved_value_type>(x))); }
    #else
    std::pair<iterator,bool> insert(value_type &&x)
- { return m_flat_tree.insert_unique(detail::move_impl(x)); }
+ { return force<std::pair<iterator,bool> >(
+ m_flat_tree.insert_unique(detail::move_impl(force<impl_value_type>(x)))); }
    #endif
 
    //! <b>Effects</b>: Inserts a copy of x in the container if and only if there is
@@ -439,9 +472,9 @@
    //! right before p) plus insertion linear to the elements with bigger keys than x.
    //!
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
- iterator insert(iterator position, const value_type& x)
- { return force<iterator>(
- m_flat_tree.insert_unique(force<impl_iterator>(position), force<impl_value_type>(x))); }
+ iterator insert(const_iterator position, const value_type& x)
+ { return force_copy<iterator>(
+ m_flat_tree.insert_unique(force<impl_const_iterator>(position), force<impl_value_type>(x))); }
 
    //! <b>Effects</b>: Inserts an element move constructed from x in the container.
    //! p is a hint pointing to where the insert should start to search.
@@ -453,12 +486,13 @@
    //!
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- iterator insert(iterator position, const detail::moved_object<value_type>& x)
- { return force<iterator>(
- m_flat_tree.insert_unique(force<impl_iterator>(position), force<impl_moved_value_type>(x))); }
+ iterator insert(const_iterator position, const detail::moved_object<value_type>& x)
+ { return force_copy<iterator>(
+ m_flat_tree.insert_unique(force<impl_const_iterator>(position), force<impl_moved_value_type>(x))); }
    #else
- iterator insert(iterator position, value_type &&x)
- { return m_flat_tree.insert_unique(position, detail::move_impl(x)); }
+ iterator insert(const_iterator position, value_type &&x)
+ { return force_copy<iterator>(
+ m_flat_tree.insert_unique(force<impl_const_iterator>(position), detail::move_impl(force<impl_value_type>(x)))); }
    #endif
 
    //! <b>Requires</b>: i, j are not iterators into *this.
@@ -472,7 +506,70 @@
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
    template <class InputIterator>
    void insert(InputIterator first, InputIterator last)
- { m_flat_tree.insert_unique(first, last); }
+ { m_flat_tree.insert_unique(first, last); }
+
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... if and only if there is no element in the container
+ //! with key equivalent to the key of x.
+ //!
+ //! <b>Returns</b>: The bool component of the returned pair is true if and only
+ //! if the insertion takes place, and the iterator component of the pair
+ //! points to the element with key equivalent to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic search time plus linear insertion
+ //! to the elements with bigger keys than x.
+ //!
+ //! <b>Note</b>: If an element it's inserted it might invalidate elements.
+ template <class... Args>
+ iterator emplace(Args&&... args)
+ { return force_copy<iterator>(m_flat_tree.emplace_unique(detail::forward_impl<Args>(args)...)); }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the container if and only if there is
+ //! no element in the container with key equivalent to the key of x.
+ //! p is a hint pointing to where the insert should start to search.
+ //!
+ //! <b>Returns</b>: An iterator pointing to the element with key equivalent
+ //! to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic search time (constant if x is inserted
+ //! right before p) plus insertion linear to the elements with bigger keys than x.
+ //!
+ //! <b>Note</b>: If an element it's inserted it might invalidate elements.
+ template <class... Args>
+ iterator emplace_hint(const_iterator hint, Args&&... args)
+ { return force_copy<iterator>(m_flat_tree.emplace_hint_unique(force<impl_const_iterator>(hint), detail::forward_impl<Args>(args)...)); }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ iterator emplace()
+ { return force_copy<iterator>(m_flat_tree.emplace_unique()); }
+
+ iterator emplace_hint(const_iterator hint)
+ { return force_copy<iterator>(m_flat_tree.emplace_hint_unique(force<impl_const_iterator>(hint))); }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ return force_copy<iterator>(m_flat_tree.emplace_unique \
+ (BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _))); \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint(const_iterator hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ return force_copy<iterator>(m_flat_tree.emplace_hint_unique \
+ (force<impl_const_iterator>(hint), \
+ BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _))); \
+ } \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
 
    //! <b>Effects</b>: Erases the element pointed to by position.
    //!
@@ -485,7 +582,7 @@
    //! <b>Note</b>: Invalidates elements with keys
    //! not less than the erased element.
    iterator erase(const_iterator position)
- { return force<iterator>(m_flat_tree.erase(force<impl_const_iterator>(position))); }
+ { return force_copy<iterator>(m_flat_tree.erase(force<impl_const_iterator>(position))); }
 
    //! <b>Effects</b>: Erases all elements in the container with key equivalent to x.
    //!
@@ -505,7 +602,7 @@
    //! <b>Complexity</b>: Logarithmic search time plus erasure time
    //! linear to the elements with bigger keys.
    iterator erase(const_iterator first, const_iterator last)
- { return force<iterator>(m_flat_tree.erase(force<impl_const_iterator>(first), force<impl_const_iterator>(last))); }
+ { return force_copy<iterator>(m_flat_tree.erase(force<impl_const_iterator>(first), force<impl_const_iterator>(last))); }
 
    //! <b>Effects</b>: erase(a.begin(),a.end()).
    //!
@@ -529,7 +626,7 @@
    //!
    //! <b>Complexity</b>: Logarithmic.
    iterator find(const key_type& x)
- { return force<iterator>(m_flat_tree.find(x)); }
+ { return force_copy<iterator>(m_flat_tree.find(x)); }
 
    //! <b>Returns</b>: A const_iterator pointing to an element with the key
    //! equivalent to x, or end() if such an element is not found.
@@ -549,7 +646,7 @@
    //!
    //! <b>Complexity</b>: Logarithmic
    iterator lower_bound(const key_type& x)
- { return force<iterator>(m_flat_tree.lower_bound(x)); }
+ { return force_copy<iterator>(m_flat_tree.lower_bound(x)); }
 
    //! <b>Returns</b>: A const iterator pointing to the first element with key not
    //! less than k, or a.end() if such an element is not found.
@@ -563,7 +660,7 @@
    //!
    //! <b>Complexity</b>: Logarithmic
    iterator upper_bound(const key_type& x)
- { return force<iterator>(m_flat_tree.upper_bound(x)); }
+ { return force_copy<iterator>(m_flat_tree.upper_bound(x)); }
 
    //! <b>Returns</b>: A const iterator pointing to the first element with key not
    //! less than x, or end() if such an element is not found.
@@ -725,7 +822,7 @@
                            detail::select1st< std::pair<Key, T> >,
                            Pred,
                            Alloc> tree_t;
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
+ //#ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    //This is the real tree stored here. It's based on a movable pair
    typedef detail::flat_tree<Key,
                            detail::pair<Key, T>,
@@ -733,10 +830,11 @@
                            Pred,
                            typename Alloc::template
                               rebind<detail::pair<Key, T> >::other> impl_tree_t;
+/*
    #else
    typedef tree_t impl_tree_t;
    #endif
-
+*/
    impl_tree_t m_flat_tree; // flat tree representing flat_map
 
    typedef typename impl_tree_t::value_type impl_value_type;
@@ -754,20 +852,17 @@
    typedef detail::moved_object<impl_value_type> impl_moved_value_type;
    #endif
 
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
+ //#ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    template<class D, class S>
    static D &force(const S &s)
    { return *const_cast<D*>((reinterpret_cast<const D*>(&s))); }
- #else
- //For rvalue-aware compilers, just forward
- template<class Type>
- static const Type &force(const Type &t)
- { return t; }
-
- template<class Type>
- static Type &force(Type &t)
- { return t; }
- #endif
+
+ template<class D, class S>
+ static D force_copy(S s)
+ {
+ value_type *vp = reinterpret_cast<value_type *>(&*s);
+ return D(vp);
+ }
    /// @endcond
 
    public:
@@ -882,7 +977,7 @@
    //!
    //! <b>Complexity</b>: Constant.
    iterator begin()
- { return force<iterator>(m_flat_tree.begin()); }
+ { return force_copy<iterator>(m_flat_tree.begin()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
    //!
@@ -898,7 +993,7 @@
    //!
    //! <b>Complexity</b>: Constant.
    iterator end()
- { return force<iterator>(m_flat_tree.end()); }
+ { return force_copy<iterator>(m_flat_tree.end()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the end of the container.
    //!
@@ -999,7 +1094,7 @@
    //!
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
    iterator insert(const value_type& x)
- { return force<iterator>(m_flat_tree.insert_equal(force<impl_value_type>(x))); }
+ { return force_copy<iterator>(m_flat_tree.insert_equal(force<impl_value_type>(x))); }
 
    //! <b>Effects</b>: Inserts a new value move-constructed from x and returns
    //! the iterator pointing to the newly inserted element.
@@ -1010,10 +1105,10 @@
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    iterator insert(const detail::moved_object<value_type>& x)
- { return force<iterator>(m_flat_tree.insert_equal(force<impl_moved_value_type>(x))); }
+ { return force_copy<iterator>(m_flat_tree.insert_equal(force<impl_moved_value_type>(x))); }
    #else
    iterator insert(value_type &&x)
- { return m_flat_tree.insert_equal(detail::move_impl(x)); }
+ { return force_copy<iterator>(m_flat_tree.insert_equal(detail::move_impl(x))); }
    #endif
 
    //! <b>Effects</b>: Inserts a copy of x in the container.
@@ -1027,8 +1122,8 @@
    //! to the elements with bigger keys than x.
    //!
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
- iterator insert(iterator position, const value_type& x)
- { return force<iterator>(m_flat_tree.insert_equal(force<impl_iterator>(position), force<impl_value_type>(x))); }
+ iterator insert(const_iterator position, const value_type& x)
+ { return force_copy<iterator>(m_flat_tree.insert_equal(force<impl_const_iterator>(position), force<impl_value_type>(x))); }
 
    //! <b>Effects</b>: Inserts a value move constructed from x in the container.
    //! p is a hint pointing to where the insert should start to search.
@@ -1042,11 +1137,11 @@
    //!
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- iterator insert(iterator position, const detail::moved_object<value_type>& x)
- { return force<iterator>(m_flat_tree.insert_equal(force<impl_iterator>(position), force<impl_moved_value_type>(x))); }
+ iterator insert(const_iterator position, const detail::moved_object<value_type>& x)
+ { return force_copy<iterator>(m_flat_tree.insert_equal(force<impl_const_iterator>(position), force<impl_moved_value_type>(x))); }
    #else
- iterator insert(iterator position, value_type &&x)
- { return m_flat_tree.insert_equal(force<impl_iterator>(position), detail::move_impl(x)); }
+ iterator insert(const_iterator position, value_type &&x)
+ { return force_copy<iterator>(m_flat_tree.insert_equal(force<impl_const_iterator>(position), detail::move_impl(x))); }
    #endif
 
    //! <b>Requires</b>: i, j are not iterators into *this.
@@ -1061,6 +1156,68 @@
    void insert(InputIterator first, InputIterator last)
       { m_flat_tree.insert_equal(first, last); }
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... and returns the iterator pointing to the
+ //! newly inserted element.
+ //!
+ //! <b>Complexity</b>: Logarithmic search time plus linear insertion
+ //! to the elements with bigger keys than x.
+ //!
+ //! <b>Note</b>: If an element it's inserted it might invalidate elements.
+ template <class... Args>
+ iterator emplace(Args&&... args)
+ { return force_copy<iterator>(m_flat_tree.emplace_equal(detail::forward_impl<Args>(args)...)); }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the container.
+ //! p is a hint pointing to where the insert should start to search.
+ //!
+ //! <b>Returns</b>: An iterator pointing to the element with key equivalent
+ //! to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic search time (constant time if the value
+ //! is to be inserted before p) plus linear insertion
+ //! to the elements with bigger keys than x.
+ //!
+ //! <b>Note</b>: If an element it's inserted it might invalidate elements.
+ template <class... Args>
+ iterator emplace_hint(const_iterator hint, Args&&... args)
+ {
+ return force_copy<iterator>(m_flat_tree.emplace_hint_equal
+ (force<impl_const_iterator>(hint), detail::forward_impl<Args>(args)...));
+ }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ iterator emplace()
+ { return force_copy<iterator>(m_flat_tree.emplace_equal()); }
+
+ iterator emplace_hint(const_iterator hint)
+ { return force_copy<iterator>(m_flat_tree.emplace_hint_equal(force<impl_const_iterator>(hint))); }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ return force_copy<iterator>(m_flat_tree.emplace_equal \
+ (BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _))); \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint(const_iterator hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ return force_copy<iterator>(m_flat_tree.emplace_hint_equal \
+ (force<impl_const_iterator>(hint), \
+ BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _))); \
+ } \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    //! <b>Effects</b>: Erases the element pointed to by position.
    //!
    //! <b>Returns</b>: Returns an iterator pointing to the element immediately
@@ -1072,7 +1229,7 @@
    //! <b>Note</b>: Invalidates elements with keys
    //! not less than the erased element.
    iterator erase(const_iterator position)
- { return force<iterator>(m_flat_tree.erase(force<impl_const_iterator>(position))); }
+ { return force_copy<iterator>(m_flat_tree.erase(force<impl_const_iterator>(position))); }
 
    //! <b>Effects</b>: Erases all elements in the container with key equivalent to x.
    //!
@@ -1092,7 +1249,7 @@
    //! <b>Complexity</b>: Logarithmic search time plus erasure time
    //! linear to the elements with bigger keys.
    iterator erase(const_iterator first, const_iterator last)
- { return force<iterator>(m_flat_tree.erase(force<impl_const_iterator>(first), force<impl_const_iterator>(last))); }
+ { return force_copy<iterator>(m_flat_tree.erase(force<impl_const_iterator>(first), force<impl_const_iterator>(last))); }
 
    //! <b>Effects</b>: erase(a.begin(),a.end()).
    //!
@@ -1116,7 +1273,7 @@
    //!
    //! <b>Complexity</b>: Logarithmic.
    iterator find(const key_type& x)
- { return force<iterator>(m_flat_tree.find(x)); }
+ { return force_copy<iterator>(m_flat_tree.find(x)); }
 
    //! <b>Returns</b>: An const_iterator pointing to an element with the key
    //! equivalent to x, or end() if such an element is not found.
@@ -1136,7 +1293,7 @@
    //!
    //! <b>Complexity</b>: Logarithmic
    iterator lower_bound(const key_type& x)
- {return force<iterator>(m_flat_tree.lower_bound(x)); }
+ {return force_copy<iterator>(m_flat_tree.lower_bound(x)); }
 
    //! <b>Returns</b>: A const iterator pointing to the first element with key
    //! not less than k, or a.end() if such an element is not found.
@@ -1150,7 +1307,7 @@
    //!
    //! <b>Complexity</b>: Logarithmic
    iterator upper_bound(const key_type& x)
- {return force<iterator>(m_flat_tree.upper_bound(x)); }
+ {return force_copy<iterator>(m_flat_tree.upper_bound(x)); }
 
    //! <b>Returns</b>: A const iterator pointing to the first element with key
    //! not less than x, or end() if such an element is not found.
@@ -1163,14 +1320,14 @@
    //!
    //! <b>Complexity</b>: Logarithmic
    std::pair<iterator,iterator> equal_range(const key_type& x)
- { return force<std::pair<iterator,iterator> >(m_flat_tree.equal_range(x)); }
+ { return force_copy<std::pair<iterator,iterator> >(m_flat_tree.equal_range(x)); }
 
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic
    std::pair<const_iterator,const_iterator>
       equal_range(const key_type& x) const
- { return force<std::pair<const_iterator,const_iterator> >(m_flat_tree.equal_range(x)); }
+ { return force_copy<std::pair<const_iterator,const_iterator> >(m_flat_tree.equal_range(x)); }
 
    //! <b>Effects</b>: Number of elements for which memory has been allocated.
    //! capacity() is always greater than or equal to size().

Modified: branches/proto/v4/boost/interprocess/containers/flat_set.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/containers/flat_set.hpp (original)
+++ branches/proto/v4/boost/interprocess/containers/flat_set.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -185,6 +185,14 @@
    const_iterator begin() const
       { return m_flat_tree.begin(); }
 
+ //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cbegin() const
+ { return m_flat_tree.cbegin(); }
+
    //! <b>Effects</b>: Returns an iterator to the end of the container.
    //!
    //! <b>Throws</b>: Nothing.
@@ -201,6 +209,14 @@
    const_iterator end() const
       { return m_flat_tree.end(); }
 
+ //! <b>Effects</b>: Returns a const_iterator to the end of the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cend() const
+ { return m_flat_tree.cend(); }
+
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
    //! of the reversed container.
    //!
@@ -219,6 +235,15 @@
    const_reverse_iterator rbegin() const
       { return m_flat_tree.rbegin(); }
 
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crbegin() const
+ { return m_flat_tree.crbegin(); }
+
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
    //! of the reversed container.
    //!
@@ -237,6 +262,15 @@
    const_reverse_iterator rend() const
       { return m_flat_tree.rend(); }
 
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crend() const
+ { return m_flat_tree.crend(); }
+
    //! <b>Effects</b>: Returns true if the container contains no elements.
    //!
    //! <b>Throws</b>: Nothing.
@@ -328,7 +362,7 @@
    //! right before p) plus insertion linear to the elements with bigger keys than x.
    //!
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
- iterator insert(iterator position, const value_type& x)
+ iterator insert(const_iterator position, const value_type& x)
       { return m_flat_tree.insert_unique(position, x); }
 
    //! <b>Effects</b>: Inserts an element move constructed from x in the container.
@@ -341,10 +375,10 @@
    //!
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- iterator insert(iterator position, const detail::moved_object<value_type>& x)
+ iterator insert(const_iterator position, const detail::moved_object<value_type>& x)
       { return m_flat_tree.insert_unique(position, x); }
    #else
- iterator insert(iterator position, value_type && x)
+ iterator insert(const_iterator position, value_type && x)
       { return m_flat_tree.insert_unique(position, detail::move_impl(x)); }
    #endif
 
@@ -361,6 +395,62 @@
    void insert(InputIterator first, InputIterator last)
       { m_flat_tree.insert_unique(first, last); }
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... if and only if there is no element in the container
+ //! with key equivalent to the key of x.
+ //!
+ //! <b>Returns</b>: The bool component of the returned pair is true if and only
+ //! if the insertion takes place, and the iterator component of the pair
+ //! points to the element with key equivalent to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic search time plus linear insertion
+ //! to the elements with bigger keys than x.
+ //!
+ //! <b>Note</b>: If an element it's inserted it might invalidate elements.
+ template <class... Args>
+ iterator emplace(Args&&... args)
+ { return m_flat_tree.emplace_unique(detail::forward_impl<Args>(args)...); }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the container if and only if there is
+ //! no element in the container with key equivalent to the key of x.
+ //! p is a hint pointing to where the insert should start to search.
+ //!
+ //! <b>Returns</b>: An iterator pointing to the element with key equivalent
+ //! to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic search time (constant if x is inserted
+ //! right before p) plus insertion linear to the elements with bigger keys than x.
+ //!
+ //! <b>Note</b>: If an element it's inserted it might invalidate elements.
+ template <class... Args>
+ iterator emplace_hint(const_iterator hint, Args&&... args)
+ { return m_flat_tree.emplace_hint_unique(hint, detail::forward_impl<Args>(args)...); }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ iterator emplace()
+ { return m_flat_tree.emplace_unique(); }
+
+ iterator emplace_hint(const_iterator hint)
+ { return m_flat_tree.emplace_hint_unique(hint); }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_flat_tree.emplace_unique(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint(const_iterator hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_flat_tree.emplace_hint_unique(hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); }\
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    //! <b>Effects</b>: Erases the element pointed to by position.
    //!
    //! <b>Returns</b>: Returns an iterator pointing to the element immediately
@@ -704,6 +794,14 @@
    const_iterator begin() const
       { return m_flat_tree.begin(); }
 
+ //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cbegin() const
+ { return m_flat_tree.cbegin(); }
+
    //! <b>Effects</b>: Returns an iterator to the end of the container.
    //!
    //! <b>Throws</b>: Nothing.
@@ -720,6 +818,14 @@
    const_iterator end() const
       { return m_flat_tree.end(); }
 
+ //! <b>Effects</b>: Returns a const_iterator to the end of the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cend() const
+ { return m_flat_tree.cend(); }
+
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
    //! of the reversed container.
    //!
@@ -738,6 +844,15 @@
    const_reverse_iterator rbegin() const
       { return m_flat_tree.rbegin(); }
 
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crbegin() const
+ { return m_flat_tree.crbegin(); }
+
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
    //! of the reversed container.
    //!
@@ -756,6 +871,15 @@
    const_reverse_iterator rend() const
       { return m_flat_tree.rend(); }
 
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crend() const
+ { return m_flat_tree.crend(); }
+
    //! <b>Effects</b>: Returns true if the container contains no elements.
    //!
    //! <b>Throws</b>: Nothing.
@@ -838,7 +962,7 @@
    //! right before p) plus insertion linear to the elements with bigger keys than x.
    //!
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
- iterator insert(iterator position, const value_type& x)
+ iterator insert(const_iterator position, const value_type& x)
       { return m_flat_tree.insert_equal(position, x); }
 
    //! <b>Effects</b>: Inserts a new value move constructed from x in the container.
@@ -852,10 +976,10 @@
    //!
    //! <b>Note</b>: If an element it's inserted it might invalidate elements.
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- iterator insert(iterator position, const detail::moved_object<value_type>& x)
+ iterator insert(const_iterator position, const detail::moved_object<value_type>& x)
       { return m_flat_tree.insert_equal(position, x); }
    #else
- iterator insert(iterator position, value_type && x)
+ iterator insert(const_iterator position, value_type && x)
       { return m_flat_tree.insert_equal(position, detail::move_impl(x)); }
    #endif
 
@@ -871,6 +995,57 @@
    void insert(InputIterator first, InputIterator last)
       { m_flat_tree.insert_equal(first, last); }
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... and returns the iterator pointing to the
+ //! newly inserted element.
+ //!
+ //! <b>Complexity</b>: Logarithmic search time plus linear insertion
+ //! to the elements with bigger keys than x.
+ //!
+ //! <b>Note</b>: If an element it's inserted it might invalidate elements.
+ template <class... Args>
+ iterator emplace(Args&&... args)
+ { return m_flat_tree.emplace_equal(detail::forward_impl<Args>(args)...); }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the container.
+ //! p is a hint pointing to where the insert should start to search.
+ //!
+ //! <b>Returns</b>: An iterator pointing to the element with key equivalent
+ //! to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic search time (constant if x is inserted
+ //! right before p) plus insertion linear to the elements with bigger keys than x.
+ //!
+ //! <b>Note</b>: If an element it's inserted it might invalidate elements.
+ template <class... Args>
+ iterator emplace_hint(const_iterator hint, Args&&... args)
+ { return m_flat_tree.emplace_hint_equal(hint, detail::forward_impl<Args>(args)...); }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ iterator emplace()
+ { return m_flat_tree.emplace_equal(); }
+
+ iterator emplace_hint(const_iterator hint)
+ { return m_flat_tree.emplace_hint_equal(hint); }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_flat_tree.emplace_equal(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint(const_iterator hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_flat_tree.emplace_hint_equal(hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); } \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    //! <b>Effects</b>: Erases the element pointed to by position.
    //!
    //! <b>Returns</b>: Returns an iterator pointing to the element immediately

Modified: branches/proto/v4/boost/interprocess/containers/list.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/containers/list.hpp (original)
+++ branches/proto/v4/boost/interprocess/containers/list.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -49,7 +49,6 @@
 
 #include <boost/interprocess/detail/config_begin.hpp>
 #include <boost/interprocess/detail/workaround.hpp>
-
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/interprocess/detail/version_type.hpp>
 #include <boost/interprocess/detail/move.hpp>
@@ -60,6 +59,11 @@
 #include <boost/intrusive/list.hpp>
 #include <boost/interprocess/containers/detail/node_alloc_holder.hpp>
 
+#ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
+//Preprocessor library to emulate perfect forwarding
+#include <boost/interprocess/detail/preprocessor.hpp>
+#endif
+
 #include <iterator>
 #include <utility>
 #include <memory>
@@ -73,29 +77,40 @@
 /// @cond
 namespace detail {
 
+template<class VoidPointer>
+struct list_hook
+{
+ typedef typename bi::make_list_base_hook
+ <bi::void_pointer<VoidPointer>, bi::link_mode<bi::normal_link> >::type type;
+};
+
 template <class T, class VoidPointer>
 struct list_node
- : public bi::make_list_base_hook
- <bi::void_pointer<VoidPointer>, bi::link_mode<bi::normal_link> >::type
+ : public list_hook<VoidPointer>::type
 {
- typedef typename bi::make_list_base_hook
- <bi::void_pointer<VoidPointer>, bi::link_mode<bi::normal_link> >::type hook_type;
+
+ #ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
 
    list_node()
       : m_data()
    {}
 
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- template<class Convertible>
- list_node(const Convertible &conv)
- : m_data(conv)
- {}
- #else
- template<class Convertible>
- list_node(Convertible &&conv)
- : m_data(detail::forward_impl<Convertible>(conv))
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ list_node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ : m_data(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)) \
+ {} \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #else //#ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ template<class ...Args>
+ list_node(Args &&...args)
+ : m_data(detail::forward_impl<Args>(args)...)
    {}
- #endif
+ #endif//#ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
 
    T m_data;
 };
@@ -110,7 +125,7 @@
          <value_type, void_pointer> node_type;
    typedef typename bi::make_list
       < node_type
- , bi::base_hook<typename node_type::hook_type>
+ , bi::base_hook<typename list_hook<void_pointer>::type>
       , bi::constant_time_size<true>
       , bi::size_type<typename A::size_type>
>::type container_type;
@@ -335,7 +350,7 @@
    //! <b>Complexity</b>: Linear to n.
    list(size_type n, const T& value = T(), const A& a = A())
       : AllocHolder(a)
- { this->insert(begin(), n, value); }
+ { this->insert(this->cbegin(), n, value); }
 
    //! <b>Effects</b>: Copy constructs a list.
    //!
@@ -346,7 +361,7 @@
    //! <b>Complexity</b>: Linear to the elements x contains.
    list(const list& x)
       : AllocHolder(x)
- { this->insert(begin(), x.begin(), x.end()); }
+ { this->insert(this->cbegin(), x.begin(), x.end()); }
 
    //! <b>Effects</b>: Move constructor. Moves mx's resources to *this.
    //!
@@ -373,7 +388,7 @@
    template <class InpIt>
    list(InpIt first, InpIt last, const A &a = A())
       : AllocHolder(a)
- { insert(begin(), first, last); }
+ { this->insert(this->cbegin(), first, last); }
 
    //! <b>Effects</b>: Destroys the list. All stored values are destroyed
    //! and used memory is deallocated.
@@ -420,7 +435,7 @@
    //!
    //! <b>Complexity</b>: Constant.
    const_iterator begin() const
- { return const_iterator(this->non_const_icont().begin()); }
+ { return this->cbegin(); }
 
    //! <b>Effects</b>: Returns an iterator to the end of the list.
    //!
@@ -436,7 +451,7 @@
    //!
    //! <b>Complexity</b>: Constant.
    const_iterator end() const
- { return const_iterator(this->non_const_icont().end()); }
+ { return this->cend(); }
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
    //! of the reversed list.
@@ -454,7 +469,7 @@
    //!
    //! <b>Complexity</b>: Constant.
    const_reverse_iterator rbegin() const
- { return const_reverse_iterator(end()); }
+ { return this->crbegin(); }
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
    //! of the reversed list.
@@ -472,7 +487,41 @@
    //!
    //! <b>Complexity</b>: Constant.
    const_reverse_iterator rend() const
- { return const_reverse_iterator(begin()); }
+ { return this->crend(); }
+
+ //! <b>Effects</b>: Returns a const_iterator to the first element contained in the list.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cbegin() const
+ { return const_iterator(this->non_const_icont().begin()); }
+
+ //! <b>Effects</b>: Returns a const_iterator to the end of the list.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cend() const
+ { return const_iterator(this->non_const_icont().end()); }
+
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
+ //! of the reversed list.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crbegin() const
+ { return const_reverse_iterator(this->cend()); }
+
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
+ //! of the reversed list.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crend() const
+ { return const_reverse_iterator(this->cbegin()); }
 
    //! <b>Effects</b>: Returns true if the list contains no elements.
    //!
@@ -505,7 +554,7 @@
    //!
    //! <b>Complexity</b>: Amortized constant time.
    void push_front(const T& x)
- { this->insert(this->begin(), x); }
+ { this->insert(this->cbegin(), x); }
 
    //! <b>Effects</b>: Constructs a new element in the beginning of the list
    //! and moves the resources of t to this new element.
@@ -515,10 +564,10 @@
    //! <b>Complexity</b>: Amortized constant time.
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    void push_front(const detail::moved_object<T>& x)
- { this->insert(this->begin(), x); }
+ { this->insert(this->cbegin(), x); }
    #else
    void push_front(T &&x)
- { this->insert(this->begin(), detail::move_impl(x)); }
+ { this->insert(this->cbegin(), detail::move_impl(x)); }
    #endif
 
    //! <b>Effects</b>: Removes the last element from the list.
@@ -527,7 +576,7 @@
    //!
    //! <b>Complexity</b>: Amortized constant time.
    void push_back (const T& x)
- { this->insert(this->end(), x); }
+ { this->insert(this->cend(), x); }
 
    //! <b>Effects</b>: Removes the first element from the list.
    //!
@@ -536,10 +585,10 @@
    //! <b>Complexity</b>: Amortized constant time.
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
    void push_back (const detail::moved_object<T>& x)
- { this->insert(this->end(), x); }
+ { this->insert(this->cend(), x); }
    #else
    void push_back (T &&x)
- { this->insert(this->end(), detail::move_impl(x)); }
+ { this->insert(this->cend(), detail::move_impl(x)); }
    #endif
 
    //! <b>Effects</b>: Removes the first element from the list.
@@ -548,7 +597,7 @@
    //!
    //! <b>Complexity</b>: Amortized constant time.
    void pop_front()
- { this->erase(this->begin()); }
+ { this->erase(this->cbegin()); }
 
    //! <b>Effects</b>: Removes the last element from the list.
    //!
@@ -556,7 +605,7 @@
    //!
    //! <b>Complexity</b>: Amortized constant time.
    void pop_back()
- { iterator tmp = this->end(); this->erase(--tmp); }
+ { const_iterator tmp = this->cend(); this->erase(--tmp); }
 
    //! <b>Requires</b>: !empty()
    //!
@@ -610,7 +659,7 @@
    //! <b>Complexity</b>: Linear to the difference between size() and new_size.
    void resize(size_type new_size, const T& x)
    {
- iterator iend = this->end();
+ const_iterator iend = this->cend();
       size_type len = this->size();
       
       if(len > new_size){
@@ -618,7 +667,7 @@
          while(to_erase--){
             --iend;
          }
- this->erase(iend, this->end());
+ this->erase(iend, this->cend());
       }
       else{
          this->priv_create_and_insert_nodes(iend, new_size - len, x);
@@ -633,12 +682,12 @@
    //! <b>Complexity</b>: Linear to the difference between size() and new_size.
    void resize(size_type new_size)
    {
- iterator iend = this->end();
+ const_iterator iend = this->end();
       size_type len = this->size();
       
       if(len > new_size){
          size_type to_erase = len - new_size;
- iterator ifirst;
+ const_iterator ifirst;
          if(to_erase < len/2u){
             ifirst = iend;
             while(to_erase--){
@@ -655,7 +704,7 @@
          this->erase(ifirst, iend);
       }
       else{
- this->priv_create_and_insert_nodes(this->end(), new_size - len);
+ this->priv_create_and_insert_nodes(this->cend(), new_size - len);
       }
    }
 
@@ -726,7 +775,7 @@
    //! <b>Throws</b>: If memory allocation throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to n.
- void insert(iterator p, size_type n, const T& x)
+ void insert(const_iterator p, size_type n, const T& x)
    { this->priv_create_and_insert_nodes(p, n, x); }
 
    //! <b>Requires</b>: p must be a valid iterator of *this.
@@ -738,7 +787,7 @@
    //!
    //! <b>Complexity</b>: Linear to std::distance [first, last).
    template <class InpIt>
- void insert(iterator p, InpIt first, InpIt last)
+ void insert(const_iterator p, InpIt first, InpIt last)
    {
       const bool aux_boolean = detail::is_convertible<InpIt, std::size_t>::value;
       typedef detail::bool_<aux_boolean> Result;
@@ -752,7 +801,7 @@
    //! <b>Throws</b>: If memory allocation throws or x's copy constructor throws.
    //!
    //! <b>Complexity</b>: Amortized constant time.
- iterator insert(iterator p, const T& x)
+ iterator insert(const_iterator p, const T& x)
    {
       NodePtr tmp = AllocHolder::create_node(x);
       return iterator(this->icont().insert(p.get(), *tmp));
@@ -766,19 +815,109 @@
    //!
    //! <b>Complexity</b>: Amortized constant time.
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- iterator insert(iterator p, const detail::moved_object<T>& x)
+ iterator insert(const_iterator p, const detail::moved_object<T>& x)
    {
       NodePtr tmp = AllocHolder::create_node(x);
       return iterator(this->icont().insert(p.get(), *tmp));
    }
    #else
- iterator insert(iterator p, T &&x)
+ iterator insert(const_iterator p, T &&x)
    {
       NodePtr tmp = AllocHolder::create_node(detail::move_impl(x));
       return iterator(this->icont().insert(p.get(), *tmp));
    }
    #endif
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the end of the list.
+ //!
+ //! <b>Throws</b>: If memory allocation throws or
+ //! T's in-place constructor throws.
+ //!
+ //! <b>Complexity</b>: Constant
+ template <class... Args>
+ void emplace_back(Args&&... args)
+ {
+ this->emplace(this->cend(), detail::forward_impl<Args>(args)...);
+ }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the beginning of the list.
+ //!
+ //! <b>Throws</b>: If memory allocation throws or
+ //! T's in-place constructor throws.
+ //!
+ //! <b>Complexity</b>: Constant
+ template <class... Args>
+ void emplace_front(Args&&... args)
+ {
+ this->emplace(this->cbegin(), detail::forward_impl<Args>(args)...);
+ }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... before p.
+ //!
+ //! <b>Throws</b>: If memory allocation throws or
+ //! T's in-place constructor throws.
+ //!
+ //! <b>Complexity</b>: Constant
+ template <class... Args>
+ iterator emplace(const_iterator p, Args&&... args)
+ {
+ typename AllocHolder::Deallocator d(AllocHolder::create_node_and_deallocator());
+ new ((void*)detail::get_pointer(d.get())) Node(detail::forward_impl<Args>(args)...);
+ NodePtr node = d.get();
+ d.release();
+ return iterator(this->icont().insert(p.get(), *node));
+ }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //0 args
+ void emplace_back()
+ { this->emplace(this->cend()); }
+
+ void emplace_front()
+ { this->emplace(this->cbegin()); }
+
+ iterator emplace(const_iterator p)
+ {
+ typename AllocHolder::Deallocator d(AllocHolder::create_node_and_deallocator());
+ new ((void*)detail::get_pointer(d.get())) Node();
+ NodePtr node = d.get();
+ d.release();
+ return iterator(this->icont().insert(p.get(), *node));
+ }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ void emplace_back(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ this->emplace(this->cend(), BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ void emplace_front(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { this->emplace(this->cbegin(), BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _));} \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace(const_iterator p, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ typename AllocHolder::Deallocator d(AllocHolder::create_node_and_deallocator()); \
+ new ((void*)detail::get_pointer(d.get())) \
+ Node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ NodePtr node = d.get(); \
+ d.release(); \
+ return iterator(this->icont().insert(p.get(), *node)); \
+ } \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    //! <b>Requires</b>: p must be a valid iterator of *this.
    //!
    //! <b>Effects</b>: Erases the element at p p.
@@ -786,7 +925,7 @@
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Amortized constant time.
- iterator erase(iterator p)
+ iterator erase(const_iterator p)
    { return iterator(this->icont().erase_and_dispose(p.get(), Destroyer(this->node_alloc()))); }
 
    //! <b>Requires</b>: first and last must be valid iterator to elements in *this.
@@ -796,7 +935,7 @@
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Linear to the distance between first and last.
- iterator erase(iterator first, iterator last)
+ iterator erase(const_iterator first, const_iterator last)
    { return iterator(AllocHolder::erase_range(first.get(), last.get(), alloc_version())); }
 
    //! <b>Effects</b>: Assigns the n copies of val to *this.
@@ -861,7 +1000,7 @@
    //!
    //! <b>Note</b>: Iterators of values obtained from list x now point to elements of this
    //! list. Iterators of this list and all the references are not invalidated.
- void splice(iterator p, ThisType &x, iterator i)
+ void splice(const_iterator p, ThisType &x, const_iterator i)
    {
       if((NodeAlloc&)*this == (NodeAlloc&)x){
          this->icont().splice(p.get(), x.icont(), i.get());
@@ -871,7 +1010,7 @@
       }
    }
 
-// void splice(iterator p, const detail::moved_object<ThisType> &x, iterator i)
+// void splice(const_iterator p, const detail::moved_object<ThisType> &x, const_iterator i)
 // { this->splice(p, x.get(), i); }
 
    //! <b>Requires</b>: p must point to an element contained
@@ -887,7 +1026,7 @@
    //!
    //! <b>Note</b>: Iterators of values obtained from list x now point to elements of this
    //! list. Iterators of this list and all the references are not invalidated.
- void splice(iterator p, ThisType &x, iterator first, iterator last)
+ void splice(const_iterator p, ThisType &x, const_iterator first, const_iterator last)
    {
       if((NodeAlloc&)*this == (NodeAlloc&)x){
          this->icont().splice(p.get(), x.icont(), first.get(), last.get());
@@ -897,7 +1036,7 @@
       }
    }
 
-// void splice(iterator p, detail::moved_object<ThisType> &x, iterator first, iterator last)
+// void splice(const_iterator p, detail::moved_object<ThisType> &x, const_iterator first, const_iterator last)
 // { return this->splice(p, x.get(), first, last); }
 
    //! <b>Requires</b>: p must point to an element contained
@@ -914,7 +1053,7 @@
    //!
    //! <b>Note</b>: Iterators of values obtained from list x now point to elements of this
    //! list. Iterators of this list and all the references are not invalidated.
- void splice(iterator p, ThisType &x, iterator first, iterator last, size_type n)
+ void splice(const_iterator p, ThisType &x, const_iterator first, const_iterator last, size_type n)
    {
       if((NodeAlloc&)*this == (NodeAlloc&)x){
          this->icont().splice(p.get(), x.icont(), first.get(), last.get(), n);
@@ -924,7 +1063,7 @@
       }
    }
 
-// void splice(iterator p, detail::moved_object<ThisType> &x, iterator first, iterator last, size_type n)
+// void splice(const_iterator p, detail::moved_object<ThisType> &x, const_iterator first, const_iterator last, size_type n)
 // { return this->splice(p, x.get(), first, last, n); }
 
    //! <b>Effects</b>: Reverses the order of elements in the list.
@@ -1128,10 +1267,10 @@
    class insertion_functor
    {
       Icont &icont_;
- typename Icont::iterator pos_;
+ typename Icont::const_iterator pos_;
 
       public:
- insertion_functor(Icont &icont, typename Icont::iterator pos)
+ insertion_functor(Icont &icont, typename Icont::const_iterator pos)
          : icont_(icont), pos_(pos)
       {}
 
@@ -1165,13 +1304,13 @@
 
    //Dispatch to detect iterator range or integer overloads
    template <class InputIter>
- void priv_insert_dispatch(iterator p,
+ void priv_insert_dispatch(const_iterator p,
                              InputIter first, InputIter last,
                              detail::false_)
    { this->priv_create_and_insert_nodes(p, first, last); }
 
    template<class Integer>
- void priv_insert_dispatch(iterator p, Integer n, Integer x, detail::true_)
+ void priv_insert_dispatch(const_iterator p, Integer n, Integer x, detail::true_)
    { this->insert(p, (size_type)n, x); }
 
    void priv_fill_assign(size_type n, const T& val)
@@ -1181,10 +1320,10 @@
       for ( ; i != iend && n > 0; ++i, --n)
          *i = val;
       if (n > 0){
- this->priv_create_and_insert_nodes(this->end(), n, val);
+ this->priv_create_and_insert_nodes(this->cend(), n, val);
       }
       else{
- this->erase(i, end());
+ this->erase(i, cend());
       }
    }
 
@@ -1193,8 +1332,7 @@
    { this->priv_fill_assign((size_type) n, (T) val); }
 
    template <class InputIter>
- void priv_assign_dispatch(InputIter first2, InputIter last2,
- detail::false_)
+ void priv_assign_dispatch(InputIter first2, InputIter last2, detail::false_)
    {
       iterator first1 = this->begin();
       iterator last1 = this->end();

Modified: branches/proto/v4/boost/interprocess/containers/map.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/containers/map.hpp (original)
+++ branches/proto/v4/boost/interprocess/containers/map.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -530,6 +530,58 @@
    void insert(InputIterator first, InputIterator last)
    { m_tree.insert_unique(first, last); }
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the container if and only if there is
+ //! no element in the container with an equivalent key.
+ //! p is a hint pointing to where the insert should start to search.
+ //!
+ //! <b>Returns</b>: An iterator pointing to the element with key equivalent
+ //! to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
+ //! is inserted right before p.
+ template <class... Args>
+ iterator emplace(Args&&... args)
+ { return m_tree.emplace_unique(detail::forward_impl<Args>(args)...); }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the container if and only if there is
+ //! no element in the container with an equivalent key.
+ //! p is a hint pointing to where the insert should start to search.
+ //!
+ //! <b>Returns</b>: An iterator pointing to the element with key equivalent
+ //! to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
+ //! is inserted right before p.
+ template <class... Args>
+ iterator emplace_hint(const_iterator hint, Args&&... args)
+ { return m_tree.emplace_hint_unique(hint, detail::forward_impl<Args>(args)...); }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ iterator emplace()
+ { return m_tree.emplace_unique(); }
+
+ iterator emplace_hint(const_iterator hint)
+ { return m_tree.emplace_hint_unique(hint); }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_tree.emplace_unique(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint(const_iterator hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_tree.emplace_hint_unique(hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _));}\
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    //! <b>Effects</b>: Erases the element pointed to by position.
    //!
    //! <b>Returns</b>: Returns an iterator pointing to the element immediately
@@ -1056,6 +1108,56 @@
    void insert(InputIterator first, InputIterator last)
    { m_tree.insert_equal(first, last); }
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the container.
+ //! p is a hint pointing to where the insert should start to search.
+ //!
+ //! <b>Returns</b>: An iterator pointing to the element with key equivalent
+ //! to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
+ //! is inserted right before p.
+ template <class... Args>
+ iterator emplace(Args&&... args)
+ { return m_tree.emplace_equal(detail::forward_impl<Args>(args)...); }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the container.
+ //! p is a hint pointing to where the insert should start to search.
+ //!
+ //! <b>Returns</b>: An iterator pointing to the element with key equivalent
+ //! to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
+ //! is inserted right before p.
+ template <class... Args>
+ iterator emplace_hint(const_iterator hint, Args&&... args)
+ { return m_tree.emplace_hint_equal(hint, detail::forward_impl<Args>(args)...); }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ iterator emplace()
+ { return m_tree.emplace_equal(); }
+
+ iterator emplace_hint(const_iterator hint)
+ { return m_tree.emplace_hint_equal(hint); }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_tree.emplace_equal(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint(const_iterator hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_tree.emplace_hint_equal(hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); }\
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    //! <b>Effects</b>: Erases the element pointed to by position.
    //!
    //! <b>Returns</b>: Returns an iterator pointing to the element immediately

Modified: branches/proto/v4/boost/interprocess/containers/set.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/containers/set.hpp (original)
+++ branches/proto/v4/boost/interprocess/containers/set.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -59,6 +59,9 @@
 #include <boost/interprocess/detail/mpl.hpp>
 #include <boost/interprocess/containers/detail/tree.hpp>
 #include <boost/interprocess/detail/move.hpp>
+#ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
+#include <boost/interprocess/detail/preprocessor.hpp>
+#endif
 
 namespace boost { namespace interprocess {
 
@@ -263,6 +266,40 @@
    const_reverse_iterator rend() const
    { return m_tree.rend(); }
 
+ //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cbegin() const
+ { return m_tree.cbegin(); }
+
+ //! <b>Effects</b>: Returns a const_iterator to the end of the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cend() const
+ { return m_tree.cend(); }
+
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crbegin() const
+ { return m_tree.crbegin(); }
+
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crend() const
+ { return m_tree.crend(); }
+
    //! <b>Effects</b>: Returns true if the container contains no elements.
    //!
    //! <b>Throws</b>: Nothing.
@@ -373,6 +410,57 @@
    void insert(InputIterator first, InputIterator last)
    { m_tree.insert_unique(first, last); }
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... if and only if there is
+ //! no element in the container with equivalent value.
+ //! and returns the iterator pointing to the
+ //! newly inserted element.
+ //!
+ //! <b>Throws</b>: If memory allocation throws or
+ //! T's in-place constructor throws.
+ //!
+ //! <b>Complexity</b>: Logarithmic.
+ template <class... Args>
+ iterator emplace(Args&&... args)
+ { return m_tree.emplace_unique(detail::forward_impl<Args>(args)...); }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... if and only if there is
+ //! no element in the container with equivalent value.
+ //! p is a hint pointing to where the insert
+ //! should start to search.
+ //!
+ //! <b>Returns</b>: An iterator pointing to the element with key equivalent to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic.
+ template <class... Args>
+ iterator emplace_hint(const_iterator hint, Args&&... args)
+ { return m_tree.emplace_hint_unique(hint, detail::forward_impl<Args>(args)...); }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ iterator emplace()
+ { return m_tree.emplace_unique(); }
+
+ iterator emplace_hint(const_iterator hint)
+ { return m_tree.emplace_hint_unique(hint); }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_tree.emplace_unique(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint(const_iterator hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_tree.emplace_hint_unique(hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _));}\
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    //! <b>Effects</b>: Erases the element pointed to by p.
    //!
    //! <b>Returns</b>: Returns an iterator pointing to the element immediately
@@ -752,6 +840,40 @@
    const_reverse_iterator rend() const
    { return m_tree.rend(); }
 
+ //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cbegin() const
+ { return m_tree.cbegin(); }
+
+ //! <b>Effects</b>: Returns a const_iterator to the end of the container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cend() const
+ { return m_tree.cend(); }
+
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crbegin() const
+ { return m_tree.crbegin(); }
+
+ //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
+ //! of the reversed container.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_reverse_iterator crend() const
+ { return m_tree.crend(); }
+
    //! <b>Effects</b>: Returns true if the container contains no elements.
    //!
    //! <b>Throws</b>: Nothing.
@@ -857,6 +979,51 @@
    void insert(InputIterator first, InputIterator last)
    { m_tree.insert_equal(first, last); }
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... and returns the iterator pointing to the
+ //! newly inserted element.
+ //!
+ //! <b>Complexity</b>: Logarithmic.
+ template <class... Args>
+ iterator emplace(Args&&... args)
+ { return m_tree.emplace_equal(detail::forward_impl<Args>(args)...); }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)...
+ //!
+ //! <b>Returns</b>: An iterator pointing to the element with key equivalent
+ //! to the key of x.
+ //!
+ //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
+ //! is inserted right before p.
+ template <class... Args>
+ iterator emplace_hint(const_iterator hint, Args&&... args)
+ { return m_tree.emplace_hint_equal(hint, detail::forward_impl<Args>(args)...); }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ iterator emplace()
+ { return m_tree.emplace_equal(); }
+
+ iterator emplace_hint(const_iterator hint)
+ { return m_tree.emplace_hint_equal(hint); }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_tree.emplace_equal(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_hint(const_iterator hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { return m_tree.emplace_hint_equal(hint, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); }\
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    //! <b>Effects</b>: Erases the element pointed to by p.
    //!
    //! <b>Returns</b>: Returns an iterator pointing to the element immediately

Modified: branches/proto/v4/boost/interprocess/containers/slist.hpp
==============================================================================
--- branches/proto/v4/boost/interprocess/containers/slist.hpp (original)
+++ branches/proto/v4/boost/interprocess/containers/slist.hpp 2008-10-22 16:32:22 EDT (Wed, 22 Oct 2008)
@@ -59,6 +59,12 @@
 #include <boost/interprocess/containers/detail/node_alloc_holder.hpp>
 #include <boost/intrusive/slist.hpp>
 
+
+#ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
+//Preprocessor library to emulate perfect forwarding
+#include <boost/interprocess/detail/preprocessor.hpp>
+#endif
+
 #include <iterator>
 #include <utility>
 #include <memory>
@@ -67,28 +73,43 @@
 
 namespace boost{ namespace interprocess{
 
-namespace detail {
 /// @cond
+
+namespace detail {
+
+template<class VoidPointer>
+struct slist_hook
+{
+ typedef typename bi::make_slist_base_hook
+ <bi::void_pointer<VoidPointer>, bi::link_mode<bi::normal_link> >::type type;
+};
+
 template <class T, class VoidPointer>
 struct slist_node
- : public bi::make_slist_base_hook
- <bi::void_pointer<VoidPointer>, bi::link_mode<bi::normal_link> >::type
+ : public slist_hook<VoidPointer>::type
 {
- typedef typename bi::make_slist_base_hook
- <bi::void_pointer<VoidPointer>, bi::link_mode<bi::normal_link> >::type hook_type;
+ #ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
 
    slist_node()
       : m_data()
    {}
- #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- template<class Convertible>
- slist_node(const Convertible &value)
- : m_data(value){}
- #else
- template<class Convertible>
- slist_node(Convertible &&value)
- : m_data(detail::forward_impl<Convertible>(value)){}
- #endif
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ slist_node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ : m_data(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)) \
+ {} \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #else //#ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ template<class ...Args>
+ slist_node(Args &&...args)
+ : m_data(detail::forward_impl<Args>(args)...)
+ {}
+ #endif//#ifndef BOOST_INTERPROCESS_PERFECT_FORWARDING
 
    T m_data;
 };
@@ -104,16 +125,17 @@
 
    typedef typename bi::make_slist
       <node_type
- ,bi::base_hook<typename node_type::hook_type>
+ ,bi::base_hook<typename slist_hook<void_pointer>::type>
       ,bi::constant_time_size<true>
       ,bi::size_type<typename A::size_type>
>::type container_type;
    typedef container_type type ;
 };
 
-/// @endcond
 } //namespace detail {
 
+/// @endcond
+
 //! An slist is a singly linked list: a list where each element is linked to the next
 //! element, but not to the previous element. That is, it is a Sequence that
 //! supports forward but not backward traversal, and (amortized) constant time
@@ -480,7 +502,7 @@
    //!
    //! <b>Complexity</b>: Constant.
    const_iterator begin() const
- { return const_iterator(this->non_const_icont().begin()); }
+ { return this->cbegin(); }
 
    //! <b>Effects</b>: Returns an iterator to the end of the list.
    //!
@@ -496,7 +518,7 @@
    //!
    //! <b>Complexity</b>: Constant.
    const_iterator end() const
- { return const_iterator(this->non_const_icont().end()); }
+ { return this->cend(); }
 
    //! <b>Effects</b>: Returns a non-dereferenceable iterator that,
    //! when incremented, yields begin(). This iterator may be used
@@ -516,6 +538,32 @@
    //!
    //! <b>Complexity</b>: Constant.
    const_iterator before_begin() const
+ { return this->cbefore_begin(); }
+
+ //! <b>Effects</b>: Returns a const_iterator to the first element contained in the list.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cbegin() const
+ { return const_iterator(this->non_const_icont().begin()); }
+
+ //! <b>Effects</b>: Returns a const_iterator to the end of the list.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cend() const
+ { return const_iterator(this->non_const_icont().end()); }
+
+ //! <b>Effects</b>: Returns a non-dereferenceable const_iterator
+ //! that, when incremented, yields begin(). This iterator may be used
+ //! as the argument toinsert_after, erase_after, etc.
+ //!
+ //! <b>Throws</b>: Nothing.
+ //!
+ //! <b>Complexity</b>: Constant.
+ const_iterator cbefore_begin() const
    { return const_iterator(end()); }
 
    //! <b>Effects</b>: Returns the number of the elements contained in the list.
@@ -638,7 +686,7 @@
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references of
    //! previous values.
- iterator insert_after(iterator prev_pos, const value_type& x)
+ iterator insert_after(const_iterator prev_pos, const value_type& x)
    { return iterator(this->icont().insert_after(prev_pos.get(), *this->create_node(x))); }
 
    //! <b>Requires</b>: prev_pos must be a valid iterator of *this.
@@ -655,10 +703,10 @@
    //! <b>Note</b>: Does not affect the validity of iterators and references of
    //! previous values.
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- iterator insert_after(iterator prev_pos, const detail::moved_object<value_type>& x)
+ iterator insert_after(const_iterator prev_pos, const detail::moved_object<value_type>& x)
    { return iterator(this->icont().insert_after(prev_pos.get(), *this->create_node(x))); }
    #else
- iterator insert_after(iterator prev_pos, value_type && x)
+ iterator insert_after(const_iterator prev_pos, value_type && x)
    { return iterator(this->icont().insert_after(prev_pos.get(), *this->create_node(detail::move_impl(x)))); }
    #endif
 
@@ -672,7 +720,7 @@
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references of
    //! previous values.
- void insert_after(iterator prev_pos, size_type n, const value_type& x)
+ void insert_after(const_iterator prev_pos, size_type n, const value_type& x)
    { this->priv_create_and_insert_nodes(prev_pos, n, x); }
 
    //! <b>Requires</b>: prev_pos must be a valid iterator of *this.
@@ -688,7 +736,7 @@
    //! <b>Note</b>: Does not affect the validity of iterators and references of
    //! previous values.
    template <class InIter>
- void insert_after(iterator prev_pos, InIter first, InIter last)
+ void insert_after(const_iterator prev_pos, InIter first, InIter last)
    {
       const bool aux_boolean = detail::is_convertible<InIter, std::size_t>::value;
       typedef detail::bool_<aux_boolean> Result;
@@ -702,7 +750,7 @@
    //! <b>Throws</b>: If memory allocation throws or x's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to the elements before p.
- iterator insert(iterator p, const value_type& x)
+ iterator insert(const_iterator p, const value_type& x)
    { return this->insert_after(previous(p), x); }
 
    //! <b>Requires</b>: p must be a valid iterator of *this.
@@ -713,10 +761,10 @@
    //!
    //! <b>Complexity</b>: Linear to the elements before p.
    #ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
- iterator insert(iterator p, const detail::moved_object<value_type>& x)
+ iterator insert(const_iterator p, const detail::moved_object<value_type>& x)
    { return this->insert_after(previous(p), x); }
    #else
- iterator insert(iterator p, value_type && x)
+ iterator insert(const_iterator p, value_type && x)
    { return this->insert_after(previous(p), detail::move_impl(x)); }
    #endif
 
@@ -727,7 +775,7 @@
    //! <b>Throws</b>: If memory allocation throws or T's copy constructor throws.
    //!
    //! <b>Complexity</b>: Linear to n plus linear to the elements before p.
- void insert(iterator p, size_type n, const value_type& x)
+ void insert(const_iterator p, size_type n, const value_type& x)
    { return this->insert_after(previous(p), n, x); }
       
    //! <b>Requires</b>: p must be a valid iterator of *this.
@@ -740,9 +788,101 @@
    //! <b>Complexity</b>: Linear to std::distance [first, last) plus
    //! linear to the elements before p.
    template <class InIter>
- void insert(iterator p, InIter first, InIter last)
+ void insert(const_iterator p, InIter first, InIter last)
    { return this->insert_after(previous(p), first, last); }
 
+ #ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... in the front of the list
+ //!
+ //! <b>Throws</b>: If memory allocation throws or
+ //! T's copy constructor throws.
+ //!
+ //! <b>Complexity</b>: Amortized constant time.
+ template <class... Args>
+ void emplace_front(Args&&... args)
+ { this->emplace_after(this->cbefore_begin(), detail::forward_impl<Args>(args)...); }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... before p
+ //!
+ //! <b>Throws</b>: If memory allocation throws or
+ //! T's in-place constructor throws.
+ //!
+ //! <b>Complexity</b>: Linear to the elements before p
+ template <class... Args>
+ iterator emplace(const_iterator p, Args&&... args)
+ { return this->emplace_after(this->previous(p), detail::forward_impl<Args>(args)...); }
+
+ //! <b>Effects</b>: Inserts an object of type T constructed with
+ //! std::forward<Args>(args)... after prev
+ //!
+ //! <b>Throws</b>: If memory allocation throws or
+ //! T's in-place constructor throws.
+ //!
+ //! <b>Complexity</b>: Constant
+ template <class... Args>
+ iterator emplace_after(const_iterator prev, Args&&... args)
+ {
+ typename AllocHolder::Deallocator d(AllocHolder::create_node_and_deallocator());
+ new ((void*)detail::get_pointer(d.get())) Node(detail::forward_impl<Args>(args)...);
+ NodePtr node = d.get();
+ d.release();
+ return iterator(this->icont().insert_after(prev.get(), *node));
+ }
+
+ #else //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
+ //0 args
+ void emplace_front()
+ { this->emplace_after(this->cbefore_begin()); }
+
+ iterator emplace(const_iterator p)
+ { return this->emplace_after(this->previous(p)); }
+
+ iterator emplace_after(const_iterator prev)
+ {
+ typename AllocHolder::Deallocator d(AllocHolder::create_node_and_deallocator());
+ new ((void*)detail::get_pointer(d.get())) Node();
+ NodePtr node = d.get();
+ d.release();
+ return iterator(this->icont().insert_after(prev.get(), *node));
+ }
+
+ #define BOOST_PP_LOCAL_MACRO(n) \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ void emplace_front(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ this->emplace \
+ (this->cbegin(), BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace \
+ (const_iterator p, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ return this->emplace_after \
+ (this->previous(p), BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ } \
+ \
+ template<BOOST_PP_ENUM_PARAMS(n, class P)> \
+ iterator emplace_after \
+ (const_iterator prev, BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_LIST, _)) \
+ { \
+ typename AllocHolder::Deallocator d(AllocHolder::create_node_and_deallocator()); \
+ new ((void*)detail::get_pointer(d.get())) \
+ Node(BOOST_PP_ENUM(n, BOOST_INTERPROCESS_PP_PARAM_FORWARD, _)); \
+ NodePtr node = d.get(); \
+ d.release(); \
+ return iterator(this->icont().insert_after(prev.get(), *node)); \
+ } \
+ //!
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_INTERPROCESS_MAX_CONSTRUCTOR_PARAMETERS)
+ #include BOOST_PP_LOCAL_ITERATE()
+
+ #endif //#ifdef BOOST_INTERPROCESS_PERFECT_FORWARDING
+
    //! <b>Effects</b>: Erases the element after the element pointed by prev_pos
    //! of the list.
    //!
@@ -754,7 +894,7 @@
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Does not invalidate iterators or references to non erased elements.
- iterator erase_after(iterator prev_pos)
+ iterator erase_after(const_iterator prev_pos)
    {
       return iterator(this->icont().erase_after_and_dispose(prev_pos.get(), Destroyer(this->node_alloc())));
    }
@@ -770,7 +910,7 @@
    //! <b>Complexity</b>: Linear to the number of erased elements.
    //!
    //! <b>Note</b>: Does not invalidate iterators or references to non erased elements.
- iterator erase_after(iterator before_first, iterator last)
+ iterator erase_after(const_iterator before_first, const_iterator last)
    {
       return iterator(this->icont().erase_after_and_dispose(before_first.get(), last.get(), Destroyer(this->node_alloc())));
    }
@@ -782,7 +922,7 @@
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Linear to the number of elements before p.
- iterator erase(iterator p)
+ iterator erase(const_iterator p)
    { return iterator(this->erase_after(previous(p))); }
 
    //! <b>Requires</b>: first and last must be valid iterator to elements in *this.
@@ -793,7 +933,7 @@
    //!
    //! <b>Complexity</b>: Linear to the distance between first and last plus
    //! linear to the elements before first.
- iterator erase(iterator first, iterator last)
+ iterator erase(const_iterator first, const_iterator last)
    { return iterator(this->erase_after(previous(first), last)); }
 
    //! <b>Effects</b>: Inserts or erases elements at the end such that
@@ -810,9 +950,9 @@
          cur = cur_next;
       }
       if (cur_next != end_n)
- this->erase_after(iterator(cur), iterator(end_n));
+ this->erase_after(const_iterator(cur), const_iterator(end_n));
       else
- this->insert_after(iterator(cur), new_size, x);
+ this->insert_after(const_iterator(cur), new_size, x);
    }
 
    //! <b>Effects</b>: Inserts or erases elements at the end such that
@@ -832,10 +972,10 @@
          cur = cur_next;
       }
       if (cur_next != end_n){
- this->erase_after(iterator(cur), iterator(end_n));
+ this->erase_after(const_iterator(cur), const_iterator(end_n));
       }
       else{
- this->priv_create_and_insert_nodes(iterator(cur), new_size - len);
+ this->priv_create_and_insert_nodes(const_iterator(cur), new_size - len);
       }
    }
 
@@ -860,7 +1000,7 @@
    //!
    //! <b>Note</b>: Iterators of values obtained from list x now point to elements of
    //! this list. Iterators of this list and all the references are not invalidated.
- void splice_after(iterator prev_pos, slist& x)
+ void splice_after(const_iterator prev_pos, slist& x)
    {
       if((NodeAlloc&)*this == (NodeAlloc&)x){
          this->icont().splice_after(prev_pos.get(), x.icont());
@@ -870,7 +1010,7 @@
       }
    }
 
- //void splice_after(iterator prev_pos, const detail::moved_object<slist>& x)
+ //void splice_after(const_iterator prev_pos, const detail::moved_object<slist>& x)
    //{ this->splice_after(prev_pos, x.get()); }
 
    // Moves the element that follows prev to *this, inserting it immediately
@@ -890,7 +1030,7 @@
    //!
    //! <b>Note</b>: Iterators of values obtained from list x now point to elements of this
    //! list. Iterators of this list and all the references are not invalidated.
- void splice_after(iterator prev_pos, slist& x, iterator prev)
+ void splice_after(const_iterator prev_pos, slist& x, const_iterator prev)
    {
       if((NodeAlloc&)*this == (NodeAlloc&)x){
          this->icont().splice_after(prev_pos.get(), x.icont(), prev.get());
@@ -900,7 +1040,7 @@
       }
    }
 
- //void splice_after(iterator prev_pos, const detail::moved_object<slist>& x, iterator prev)
+ //void splice_after(const_iterator prev_pos, const detail::moved_object<slist>& x, iterator prev)
    //{ return splice_after(prev_pos, x.get(), prev); }
 
    // Moves the range [before_first + 1, before_last + 1) to *this,
@@ -921,8 +1061,8 @@
    //!
    //! <b>Note</b>: Iterators of values obtained from list x now point to elements of this
    //! list. Iterators of this list and all the references are not invalidated.
- void splice_after(iterator prev_pos, slist& x,
- iterator before_first, iterator before_last)
+ void splice_after(const_iterator prev_pos, slist& x,
+ const_iterator before_first, const_iterator before_last)
    {
       if((NodeAlloc&)*this == (NodeAlloc&)x){
          this->icont().splice_after
@@ -933,8 +1073,8 @@
       }
    }
 
- //void splice_after(iterator prev_pos, const detail::moved_object<slist>& x,
- // iterator before_first, iterator before_last)
+ //void splice_after(const_iterator prev_pos, const detail::moved_object<slist>& x,
+ // const_iterator before_first, const_iterator before_last)
    //{ this->splice_after(prev_pos, x.get(), before_first, before_last); }
 
    //! <b>Requires</b>: prev_pos must be a valid iterator of this.
@@ -952,8 +1092,8 @@
    //!
    //! <b>Note</b>: Iterators of values obtained from list x now point to elements of this
    //! list. Iterators of this list and all the references are not invalidated.
- void splice_after(iterator prev_pos, slist& x,
- iterator before_first, iterator before_last,
+ void splice_after(const_iterator prev_pos, slist& x,
+ const_iterator before_first, const_iterator before_last,
                      size_type n)
    {
       if((NodeAlloc&)*this == (NodeAlloc&)x){
@@ -965,8 +1105,8 @@
       }
    }
 
- //void splice_after(iterator prev_pos, const detail::moved_object<slist>& x,
- // iterator before_first, iterator before_last, size_type n)
+ //void splice_after(const_iterator prev_pos, const detail::moved_object<slist>& x,
+ // const_iterator before_first, const_iterator before_last, size_type n)
    //{ this->splice_after(prev_pos, x.get(), before_first, before_last, n); }
 
    //! <b>Requires</b>: p must point to an element contained
@@ -982,10 +1122,10 @@
    //!
    //! <b>Note</b>: Iterators of values obtained from list x now point to elements of
    //! this list. Iterators of this list and all the references are not invalidated.
- void splice(iterator p, slist& x)
+ void splice(const_iterator p, slist& x)
    { this->splice_after(this->previous(p), x); }
 
- //void splice(iterator p, const detail::moved_object<slist>& x)
+ //void splice(const_iterator p, const detail::moved_object<slist>& x)
    //{ return this->splice(p, x.get()); }
 
    //! <b>Requires</b>: p must point to an element contained
@@ -1002,10 +1142,10 @@
    //!
    //! <b>Note</b>: Iterators of values obtained from list x now point to elements of this
    //! list. Iterators of this list and all the references are not invalidated.
- void splice(iterator p, slist& x, iterator i)
+ void splice(const_iterator p, slist& x, const_iterator i)
    { this->splice_after(previous(p), x, i); }
 
- //void splice(iterator p, const detail::moved_object<slist>& x, iterator i)
+ //void splice(const_iterator p, const detail::moved_object<slist>& x, const_iterator i)
    //{ this->splice(p, x.get(), i); }
 
    //! <b>Requires</b>: p must point to an element contained
@@ -1022,10 +1162,10 @@
    //!
    //! <b>Note</b>: Iterators of values obtained from list x now point to elements of this
    //! list. Iterators of this list and all the references are not invalidated.
- void splice(iterator p, slist& x, iterator first, iterator last)
+ void splice(const_iterator p, slist& x, const_iterator first, const_iterator last)
    { this->splice_after(previous(p), x, previous(first), previous(last)); }
 
- //void splice(iterator p, const detail::moved_object<slist>& x, iterator first, iterator last)
+ //void splice(const_iterator p, const detail::moved_object<slist>& x, const_iterator first, const_iterator last)
    //{ this->splice(p, x.get(), first, last); }
 
    //! <b>Effects</b>: Reverses the order of elements in the list.
@@ -1205,10 +1345,10 @@
    class insertion_functor
    {
       Icont &icont_;
- typename Icont::iterator prev_;
+ typename Icont::const_iterator prev_;
 
       public:
- insertion_functor(Icont &icont, typename Icont::iterator prev)
+ insertion_functor(Icont &icont, typename Icont::const_iterator prev)
          : icont_(icont), prev_(prev)
       {}
 
@@ -1241,13 +1381,13 @@
 
    //Dispatch to detect iterator range or integer overloads
    template <class InputIter>
- void priv_insert_dispatch(iterator prev,
+ void priv_insert_dispatch(const_iterator prev,
                              InputIter first, InputIter last,
                              detail::false_)
    { this->priv_create_and_insert_nodes(prev, first, last); }
 
    template<class Integer>
- void priv_insert_dispatch(iterator prev, Integer n, Integer x, detail::true_)
+ void priv_insert_dispatch(const_iterator prev, Integer n, Integer x, detail::true_)
    { this->priv_create_and_insert_nodes(prev, n, x); }
 
    void priv_fill_assign(size_type n, const T& val)
@@ -1271,8 +1411,7 @@
    { this->priv_fill_assign((size_type) n, (T)val); }
 
    template <class InpIt>
- void priv_assign_dispatch(InpIt first, InpIt last,
- detail::false_)
+ void priv_assign_dispatch(InpIt first, InpIt last, detail::false_)
    {
       iterator end_n(this->end());
       iterator prev(this->before_begin());
@@ -1290,11 +1429,11 @@
    }
 
    template <class Int>
- void priv_insert_after_range_dispatch(iterator prev_pos, Int n, Int x, detail::true_)
+ void priv_insert_after_range_dispatch(const_iterator prev_pos, Int n, Int x, detail::true_)
    { this->priv_create_and_insert_nodes(prev_pos, n, x); }
 
    template <class InIter>
- void priv_insert_after_range_dispatch(iterator prev_pos, InIter first, InIter last, detail::false_)
+ void priv_insert_after_range_dispatch(const_iterator prev_pos, InIter first, InIter last, detail::false_)
    { this->priv_create_and_insert_nodes(prev_pos, first, last); }
 
    //Functors for member algorithm defaults