merged from trunk to branch

[SVN r37079]
This commit is contained in:
Joaquín M. López Muñoz 2007-02-26 09:16:36 +00:00
parent 5d2015ed2e
commit 543fbad471
5 changed files with 26 additions and 5 deletions

View File

@ -1,4 +1,4 @@
/* Copyright 2003-2006 Joaqu匤 M L<>ez Mu<4D>z. /* Copyright 2003-2007 Joaquín M López Muñoz.
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
@ -550,6 +550,11 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
hashed_index( hashed_index(
const hashed_index<KeyFromValue,Hash,Pred,SuperMeta,TagList,Category>& x): const hashed_index<KeyFromValue,Hash,Pred,SuperMeta,TagList,Category>& x):
super(x), super(x),
#if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE)
safe_super(),
#endif
key(x.key), key(x.key),
hash(x.hash), hash(x.hash),
eq(x.eq), eq(x.eq),

View File

@ -1,4 +1,4 @@
/* Copyright 2003-2006 Joaqu匤 M L<>ez Mu<4D>z. /* Copyright 2003-2007 Joaquín M López Muñoz.
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
@ -467,6 +467,11 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
ordered_index( ordered_index(
const ordered_index<KeyFromValue,Compare,SuperMeta,TagList,Category>& x): const ordered_index<KeyFromValue,Compare,SuperMeta,TagList,Category>& x):
super(x), super(x),
#if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE)
safe_super(),
#endif
key(x.key), key(x.key),
comp(x.comp) comp(x.comp)
{ {

View File

@ -1,4 +1,4 @@
/* Copyright 2003-2006 Joaqu匤 M L<>ez Mu<4D>z. /* Copyright 2003-2007 Joaquín M López Muñoz.
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
@ -596,6 +596,11 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
random_access_index(const random_access_index<SuperMeta,TagList>& x): random_access_index(const random_access_index<SuperMeta,TagList>& x):
super(x), super(x),
#if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE)
safe_super(),
#endif
ptrs(x.get_allocator(),header()->impl(),x.size()) ptrs(x.get_allocator(),header()->impl(),x.size())
{ {
/* The actual copying takes place in subsequent call to copy_(). /* The actual copying takes place in subsequent call to copy_().

View File

@ -1,4 +1,4 @@
/* Copyright 2003-2006 Joaqu匤 M L<>ez Mu<4D>z. /* Copyright 2003-2007 Joaquín M López Muñoz.
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
@ -502,6 +502,11 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
sequenced_index(const sequenced_index<SuperMeta,TagList>& x): sequenced_index(const sequenced_index<SuperMeta,TagList>& x):
super(x) super(x)
#if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE)
,safe_super()
#endif
{ {
/* The actual copying takes place in subsequent call to copy_(). /* The actual copying takes place in subsequent call to copy_().
*/ */

View File

@ -1,6 +1,6 @@
/* Multiply indexed container. /* Multiply indexed container.
* *
* Copyright 2003-2006 Joaqu匤 M L<EFBFBD>ez Mu<EFBFBD>z. * Copyright 2003-2007 Joaquín M López Muñoz.
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
@ -230,6 +230,7 @@ public:
multi_index_container( multi_index_container(
const multi_index_container<Value,IndexSpecifierList,Allocator>& x): const multi_index_container<Value,IndexSpecifierList,Allocator>& x):
bfm_allocator(x.bfm_allocator::member), bfm_allocator(x.bfm_allocator::member),
bfm_header(),
super(x), super(x),
node_count(0) node_count(0)
{ {