boost_mirror/multi_index
1
0
Fork 0
mirror of https://github.com/boostorg/multi_index.git synced 2025-05-11 05:14:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged [85497] from trunk

Browse Source 
[SVN r85509]
This commit is contained in:
Joaquín M López Muñoz 2013-08-29 06:10:38 +00:00
parent 078944b1b5
commit 590e3d1511
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/boost/multi_index_container.hpp
View File

@ -188,28 +188,21 @@ public:
/* construct/copy/destroy */ /* 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( explicit multi_index_container(
const ctor_args_list& args_list,
#if BOOST_WORKAROUND(__IBMCPP__,<=600) #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= const allocator_type& al=
typename mpl::identity<multi_index_container>::type:: typename mpl::identity<multi_index_container>::type::
allocator_type()): allocator_type()):
#else #else
const ctor_args_list& args_list=ctor_args_list(),
const allocator_type& al=allocator_type()): const allocator_type& al=allocator_type()):
#endif #endif
@ -218,7 +211,7 @@ public:
node_count(0) node_count(0)
{ {
BOOST_MULTI_INDEX_CHECK_INVARIANT; BOOST_MULTI_INDEX_CHECK_INVARIANT;
} }
explicit multi_index_container(const allocator_type& al): explicit multi_index_container(const allocator_type& al):
bfm_allocator(al), bfm_allocator(al),