Subject: [Boost-commit] svn:boost r85509 - branches/release/boost
From: joaquin_at_[hidden]
Date: 2013-08-29 02:10:38
Author: joaquin
Date: 2013-08-29 02:10:38 EDT (Thu, 29 Aug 2013)
New Revision: 85509
URL: http://svn.boost.org/trac/boost/changeset/85509
Log:
merged [85497] from trunk
Properties modified:
branches/release/boost/multi_index_container.hpp (contents, props changed)
Text files modified:
branches/release/boost/multi_index_container.hpp | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
Modified: branches/release/boost/multi_index_container.hpp
==============================================================================
--- branches/release/boost/multi_index_container.hpp Wed Aug 28 20:36:52 2013 (r85508)
+++ branches/release/boost/multi_index_container.hpp 2013-08-29 02:10:38 EDT (Thu, 29 Aug 2013) (r85509)
@@ -188,28 +188,21 @@
/* construct/copy/destroy */
- /* Do not merge this ctor with the following waiting for resolution of
- * EWG issue 2193.
- */
-
- multi_index_container():
- bfm_allocator(allocator_type()),
- super(ctor_args_list(),bfm_allocator::member),
- node_count(0)
- {
- BOOST_MULTI_INDEX_CHECK_INVARIANT;
- }
-
explicit multi_index_container(
- const ctor_args_list& args_list,
#if BOOST_WORKAROUND(__IBMCPP__,<=600)
- /* VisualAge seems to have an ETI issue with the default value of al */
+ /* VisualAge seems to have an ETI issue with the default values
+ * for arguments args_list and al.
+ */
+ const ctor_args_list& args_list=
+ typename mpl::identity<multi_index_container>::type::
+ ctor_args_list(),
const allocator_type& al=
typename mpl::identity<multi_index_container>::type::
allocator_type()):
#else
+ const ctor_args_list& args_list=ctor_args_list(),
const allocator_type& al=allocator_type()):
#endif
@@ -218,7 +211,7 @@
node_count(0)
{
BOOST_MULTI_INDEX_CHECK_INVARIANT;
- }
+ }
explicit multi_index_container(const allocator_type& al):
bfm_allocator(al),