2009-10-03 04:17:41 +02:00
|
|
|
// Profiling unordered_map/unordered_multimap implementation -*- C++ -*-
|
|
|
|
|
2013-01-16 10:20:34 +01:00
|
|
|
// Copyright (C) 2009-2013 Free Software Foundation, Inc.
|
2009-10-03 04:17:41 +02:00
|
|
|
//
|
|
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
|
|
// software; you can redistribute it and/or modify it under the
|
|
|
|
// terms of the GNU General Public License as published by the
|
2012-02-21 11:55:54 +01:00
|
|
|
// Free Software Foundation; either version 3, or (at your option)
|
2009-10-03 04:17:41 +02:00
|
|
|
// any later version.
|
2012-02-21 11:55:54 +01:00
|
|
|
//
|
2009-10-03 04:17:41 +02:00
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
2012-02-21 22:30:26 +01:00
|
|
|
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
// You should have received a copy of the GNU General Public License along
|
2012-02-21 11:55:54 +01:00
|
|
|
// with this library; see the file COPYING3. If not see
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
/** @file profile/unordered_map
|
|
|
|
* This file is a GNU profile extension to the Standard C++ Library.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _GLIBCXX_PROFILE_UNORDERED_MAP
|
|
|
|
#define _GLIBCXX_PROFILE_UNORDERED_MAP 1
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus < 201103L
|
2010-02-10 20:14:33 +01:00
|
|
|
# include <bits/c++0x_warning.h>
|
2010-03-30 12:59:17 +02:00
|
|
|
#else
|
|
|
|
# include <unordered_map>
|
2009-10-03 04:17:41 +02:00
|
|
|
|
2010-03-30 12:59:17 +02:00
|
|
|
#include <profile/base.h>
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
#define _GLIBCXX_BASE unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
#define _GLIBCXX_STD_BASE _GLIBCXX_STD_C::_GLIBCXX_BASE
|
2009-10-03 04:17:41 +02:00
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
namespace __profile
|
|
|
|
{
|
2009-11-17 21:45:32 +01:00
|
|
|
/// Class std::unordered_map wrapper with performance instrumentation.
|
2009-10-03 04:17:41 +02:00
|
|
|
template<typename _Key, typename _Tp,
|
|
|
|
typename _Hash = std::hash<_Key>,
|
|
|
|
typename _Pred = std::equal_to<_Key>,
|
|
|
|
typename _Alloc = std::allocator<_Key> >
|
|
|
|
class unordered_map
|
|
|
|
: public _GLIBCXX_STD_BASE
|
|
|
|
{
|
|
|
|
typedef typename _GLIBCXX_STD_BASE _Base;
|
|
|
|
|
|
|
|
public:
|
|
|
|
typedef typename _Base::size_type size_type;
|
|
|
|
typedef typename _Base::hasher hasher;
|
|
|
|
typedef typename _Base::key_equal key_equal;
|
|
|
|
typedef typename _Base::allocator_type allocator_type;
|
|
|
|
typedef typename _Base::key_type key_type;
|
|
|
|
typedef typename _Base::value_type value_type;
|
|
|
|
typedef typename _Base::difference_type difference_type;
|
|
|
|
typedef typename _Base::reference reference;
|
|
|
|
typedef typename _Base::const_reference const_reference;
|
|
|
|
typedef typename _Base::mapped_type mapped_type;
|
|
|
|
|
|
|
|
typedef typename _Base::iterator iterator;
|
|
|
|
typedef typename _Base::const_iterator const_iterator;
|
|
|
|
|
|
|
|
explicit
|
|
|
|
unordered_map(size_type __n = 10,
|
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
|
|
|
: _Base(__n, __hf, __eql, __a)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
__profcxx_hashtable_construct2(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _InputIterator>
|
|
|
|
unordered_map(_InputIterator __f, _InputIterator __l,
|
hashtable.h (_Hashtable<>::operator=(const _Hashtable&)): Move inline.
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::operator=(const
_Hashtable&)): Move inline.
(operator=(_Hashtable&&)): Define.
* include/bits/unordered_map.h (unordered_map(unordered_map&&),
unordered_map(const unordered_map&), unordered_multimap
(unordered_multimap&&), unordered_multimap(const unordered_multimap&),
__unordered_map(__unordered_map&&), __unordered_map(const
__unordered_map&), __unordered_multimap(__unordered_multimap&&),
__unordered_multimap(const __unordered_multimap&)): Do not define,
leave implicit.
* include/bits/unordered_set.h (unordered_set(unordered_set&&),
unordered_set(const unordered_set&), unordered_multiset
(unordered_multiset&&), unordered_multiset(const unordered_multiset&),
__unordered_set(__unordered_set&&), __unordered_set(const
__unordered_set&), __unordered_multiset(__unordered_multiset&&),
__unordered_multiset(const __unordered_multiset&)): Likewise.
* include/bits/unordered_map.h (__unordered_map(initializer_list<>),
__unordered_map<>::operator=(initializer_list<>),
__unordered_multimap(initializer_list<>), __unordered_multimap<>::
operator=(initializer_list<>)): Add.
* include/bits/unordered_set.h (__unordered_set(initializer_list<>),
__unordered_set<>::operator=(initializer_list<>),
__unordered_multiset(initializer_list<>), __unordered_multiset<>::
operator=(initializer_list<>)): Likewise.
* include/bits/unordered_map.h (__unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Fix __n default to 0.
* include/bits/unordered_set.h (__unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
From-SVN: r163236
2010-08-14 03:00:23 +02:00
|
|
|
size_type __n = 0,
|
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
2009-10-03 04:17:41 +02:00
|
|
|
: _Base(__f, __l, __n, __hf, __eql, __a)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
__profcxx_hashtable_construct2(this);
|
|
|
|
}
|
|
|
|
|
2011-11-09 09:23:30 +01:00
|
|
|
unordered_map(const unordered_map& __x)
|
|
|
|
: _Base(__x)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
__profcxx_hashtable_construct2(this);
|
|
|
|
}
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
unordered_map(const _Base& __x)
|
|
|
|
: _Base(__x)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
__profcxx_hashtable_construct2(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_map(unordered_map&& __x)
|
2010-08-05 09:34:08 +02:00
|
|
|
: _Base(std::move(__x))
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
__profcxx_hashtable_construct2(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_map(initializer_list<value_type> __l,
|
hashtable.h (_Hashtable<>::operator=(const _Hashtable&)): Move inline.
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::operator=(const
_Hashtable&)): Move inline.
(operator=(_Hashtable&&)): Define.
* include/bits/unordered_map.h (unordered_map(unordered_map&&),
unordered_map(const unordered_map&), unordered_multimap
(unordered_multimap&&), unordered_multimap(const unordered_multimap&),
__unordered_map(__unordered_map&&), __unordered_map(const
__unordered_map&), __unordered_multimap(__unordered_multimap&&),
__unordered_multimap(const __unordered_multimap&)): Do not define,
leave implicit.
* include/bits/unordered_set.h (unordered_set(unordered_set&&),
unordered_set(const unordered_set&), unordered_multiset
(unordered_multiset&&), unordered_multiset(const unordered_multiset&),
__unordered_set(__unordered_set&&), __unordered_set(const
__unordered_set&), __unordered_multiset(__unordered_multiset&&),
__unordered_multiset(const __unordered_multiset&)): Likewise.
* include/bits/unordered_map.h (__unordered_map(initializer_list<>),
__unordered_map<>::operator=(initializer_list<>),
__unordered_multimap(initializer_list<>), __unordered_multimap<>::
operator=(initializer_list<>)): Add.
* include/bits/unordered_set.h (__unordered_set(initializer_list<>),
__unordered_set<>::operator=(initializer_list<>),
__unordered_multiset(initializer_list<>), __unordered_multiset<>::
operator=(initializer_list<>)): Likewise.
* include/bits/unordered_map.h (__unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Fix __n default to 0.
* include/bits/unordered_set.h (__unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
From-SVN: r163236
2010-08-14 03:00:23 +02:00
|
|
|
size_type __n = 0,
|
2009-10-03 04:17:41 +02:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
|
|
|
: _Base(__l, __n, __hf, __eql, __a) { }
|
|
|
|
|
|
|
|
unordered_map&
|
|
|
|
operator=(const unordered_map& __x)
|
|
|
|
{
|
|
|
|
*static_cast<_Base*>(this) = __x;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_map&
|
|
|
|
operator=(unordered_map&& __x)
|
|
|
|
{
|
2010-01-09 12:16:42 +01:00
|
|
|
// NB: DR 1204.
|
|
|
|
// NB: DR 675.
|
|
|
|
this->clear();
|
|
|
|
this->swap(__x);
|
2009-10-03 04:17:41 +02:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_map&
|
|
|
|
operator=(initializer_list<value_type> __l)
|
|
|
|
{
|
|
|
|
this->clear();
|
|
|
|
this->insert(__l);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2011-06-01 16:16:19 +02:00
|
|
|
~unordered_map() noexcept
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2010-01-03 15:50:09 +01:00
|
|
|
__profcxx_hashtable_destruct(this, _Base::bucket_count(),
|
|
|
|
_Base::size());
|
2009-10-03 04:17:41 +02:00
|
|
|
_M_profile_destruct();
|
|
|
|
}
|
|
|
|
|
|
|
|
_Base&
|
2011-05-26 17:35:02 +02:00
|
|
|
_M_base() noexcept { return *this; }
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
const _Base&
|
2011-05-26 17:35:02 +02:00
|
|
|
_M_base() const noexcept { return *this; }
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
void
|
2011-05-26 17:35:02 +02:00
|
|
|
clear() noexcept
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2010-01-03 15:50:09 +01:00
|
|
|
__profcxx_hashtable_destruct(this, _Base::bucket_count(),
|
|
|
|
_Base::size());
|
2009-10-03 04:17:41 +02:00
|
|
|
_M_profile_destruct();
|
|
|
|
_Base::clear();
|
|
|
|
}
|
|
|
|
|
2011-12-10 15:00:03 +01:00
|
|
|
template<typename... _Args>
|
|
|
|
std::pair<iterator, bool>
|
|
|
|
emplace(_Args&&... __args)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
std::pair<iterator, bool> __res
|
|
|
|
= _Base::emplace(std::forward<_Args>(__args)...);
|
|
|
|
_M_profile_resize(__old_size);
|
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename... _Args>
|
|
|
|
iterator
|
|
|
|
emplace_hint(const_iterator __it, _Args&&... __args)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
iterator __res
|
|
|
|
= _Base::emplace_hint(__it, std::forward<_Args>(__args)...);
|
|
|
|
_M_profile_resize(__old_size);
|
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
void
|
|
|
|
insert(std::initializer_list<value_type> __l)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::insert(__l);
|
2010-11-10 22:53:43 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
|
|
|
|
2010-01-03 15:50:09 +01:00
|
|
|
std::pair<iterator, bool>
|
2009-10-03 04:17:41 +02:00
|
|
|
insert(const value_type& __obj)
|
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-01-03 15:50:09 +01:00
|
|
|
std::pair<iterator, bool> __res = _Base::insert(__obj);
|
2010-11-10 22:53:43 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
return __res;
|
|
|
|
}
|
2010-01-03 15:50:09 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
iterator
|
|
|
|
insert(const_iterator __iter, const value_type& __v)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-02-10 17:09:42 +01:00
|
|
|
iterator __res = _Base::insert(__iter, __v);
|
2010-11-10 22:53:43 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2010-02-10 17:09:42 +01:00
|
|
|
return __res;
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
|
|
|
|
2010-10-28 18:01:05 +02:00
|
|
|
template<typename _Pair, typename = typename
|
2012-07-13 10:59:58 +02:00
|
|
|
std::enable_if<std::is_constructible<value_type,
|
|
|
|
_Pair&&>::value>::type>
|
2010-10-28 18:01:05 +02:00
|
|
|
std::pair<iterator, bool>
|
|
|
|
insert(_Pair&& __obj)
|
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-10-28 18:01:05 +02:00
|
|
|
std::pair<iterator, bool> __res
|
|
|
|
= _Base::insert(std::forward<_Pair>(__obj));
|
2010-11-10 22:53:43 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2010-10-28 18:01:05 +02:00
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _Pair, typename = typename
|
2012-07-13 10:59:58 +02:00
|
|
|
std::enable_if<std::is_constructible<value_type,
|
|
|
|
_Pair&&>::value>::type>
|
2010-10-28 18:01:05 +02:00
|
|
|
iterator
|
|
|
|
insert(const_iterator __iter, _Pair&& __v)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
iterator __res = _Base::insert(__iter, std::forward<_Pair>(__v));
|
2010-11-10 22:53:43 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2010-10-28 18:01:05 +02:00
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
template<typename _InputIter>
|
2010-02-10 17:09:42 +01:00
|
|
|
void
|
|
|
|
insert(_InputIter __first, _InputIter __last)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-05-05 21:53:11 +02:00
|
|
|
_Base::insert(__first, __last);
|
2010-11-10 22:53:43 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2010-02-10 17:09:42 +01:00
|
|
|
}
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
void
|
|
|
|
insert(const value_type* __first, const value_type* __last)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::insert(__first, __last);
|
2010-11-10 22:53:43 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
2010-11-07 19:56:56 +01:00
|
|
|
|
|
|
|
// operator[]
|
|
|
|
mapped_type&
|
|
|
|
operator[](const _Key& __k)
|
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-11-07 19:56:56 +01:00
|
|
|
mapped_type& __res = _M_base()[__k];
|
2010-11-10 22:53:43 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2010-11-07 19:56:56 +01:00
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
mapped_type&
|
2010-11-07 19:56:56 +01:00
|
|
|
operator[](_Key&& __k)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-11-07 19:56:56 +01:00
|
|
|
mapped_type& __res = _M_base()[std::move(__k)];
|
2010-11-10 22:53:43 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
return __res;
|
2010-11-07 19:56:56 +01:00
|
|
|
}
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
void
|
|
|
|
swap(unordered_map& __x)
|
2010-02-10 17:09:42 +01:00
|
|
|
{ _Base::swap(__x); }
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
void rehash(size_type __n)
|
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::rehash(__n);
|
|
|
|
_M_profile_resize(__old_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
2010-02-10 17:09:42 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
private:
|
2010-02-10 17:09:42 +01:00
|
|
|
void
|
2010-11-10 22:53:43 +01:00
|
|
|
_M_profile_resize(size_type __old_size)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2010-11-10 22:53:43 +01:00
|
|
|
size_type __new_size = _Base::bucket_count();
|
2011-12-10 15:00:03 +01:00
|
|
|
if (__old_size != __new_size)
|
2010-02-10 17:09:42 +01:00
|
|
|
__profcxx_hashtable_resize(this, __old_size, __new_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
2010-02-10 17:09:42 +01:00
|
|
|
|
|
|
|
void
|
|
|
|
_M_profile_destruct()
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __hops = 0, __lc = 0, __chain = 0;
|
|
|
|
iterator __it = this->begin();
|
|
|
|
while (__it != this->end())
|
2010-02-10 17:09:42 +01:00
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __bkt = this->bucket(__it->first);
|
re PR libstdc++/51608 ([C++11] Unordered containers end(size_type) isn't constant time)
2011-12-29 François Dumont <fdumont@gcc.gnu.org>
PR libstdc++/51608
* include/bits/hashtable_policy.h (_Equal_helper<>): New, change the
way the _Equal functor is used depending on whether hash code is
cached or not.
(_Ebo_helper<>): New helper type to introduce EBO when possible.
(_Hash_code_base): Use _Ebo_helper to limit memory footprint. Move
_Equal functor management...
(_Hashtable_base): ...here, new, use _Equal_helper.
(_Local_iterator_base<>, _Locale_iterator<>, _Locale_const_iterator<>):
New, use _Hash_code_base, implementation of...
* include/bits/hashtable.h (_Hashtable<>::local_iterator,
_Hashtable<>::const_local_iterator): ...those. Add static assertions
checking that some functors are empty depending on whether hash code
is cache or not.
(_Hashtable<>::_M_bucket_index): New overloads using current bucket
count, use through out the _Hastable<> implementation.
* include/bits/unordered_set.h (__unordered_set<>,
__unordered_multiset<>): Cache hash code iff hash functor is not
empty and not final.
* include/bits/unordered_map.h (__unordered_map<>,
__unordered_multimap<>): Likewise.
* include/debug/unordered_map
(unordered_map<>::_S_to_local, unordered_multimap<>::_S_to_local):
Adapt to match new local iterator implementation.
* include/debug/unordered_set (unordered_set<>::_S_to_local,
unordered_multiset<>::_S_to_local): Likewise.
* include/profile/unordered_map (unordered_map<>::_M_profile_destruct,
unordered_multimap<>::_M_profile_destruct): Enhance thanks to usage of
local iterators.
* include/profile/unordered_set (unordered_set<>::_M_profile_destruct,
unordered_multiset<>::_M_profile_destruct): Likewise.
* testsuite_files/23_containers/unordered_set/instantiation_neg.cc:
Fix error line.
* testsuite_files/23_containers/unordered_set/final_hash.cc: New.
* testsuite_files/23_containers/unordered_multiset/final_hash.cc: New.
* testsuite_files/23_containers/unordered_map/final_hash.cc: New.
* testsuite_files/23_containers/unordered_multimap/final_hash.cc: New.
From-SVN: r182727
2011-12-29 18:58:51 +01:00
|
|
|
auto __lit = this->begin(__bkt);
|
|
|
|
auto __lend = this->end(__bkt);
|
|
|
|
for (++__it, ++__lit; __lit != __lend; ++__it, ++__lit)
|
2011-12-10 15:00:03 +01:00
|
|
|
++__chain;
|
2010-02-10 17:09:42 +01:00
|
|
|
if (__chain)
|
|
|
|
{
|
|
|
|
++__chain;
|
2011-12-10 15:00:03 +01:00
|
|
|
__lc = __lc > __chain ? __lc : __chain;
|
2010-02-10 17:09:42 +01:00
|
|
|
__hops += __chain * (__chain - 1) / 2;
|
|
|
|
__chain = 0;
|
|
|
|
}
|
|
|
|
}
|
2011-12-10 15:00:03 +01:00
|
|
|
__profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
2011-12-10 15:00:03 +01:00
|
|
|
};
|
2010-02-10 17:09:42 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
template<typename _Key, typename _Tp, typename _Hash,
|
2010-02-10 17:09:42 +01:00
|
|
|
typename _Pred, typename _Alloc>
|
2009-10-03 04:17:41 +02:00
|
|
|
inline void
|
|
|
|
swap(unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
|
2010-02-10 17:09:42 +01:00
|
|
|
unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
|
2009-10-03 04:17:41 +02:00
|
|
|
{ __x.swap(__y); }
|
|
|
|
|
2010-03-26 03:19:10 +01:00
|
|
|
template<typename _Key, typename _Tp, typename _Hash,
|
|
|
|
typename _Pred, typename _Alloc>
|
|
|
|
inline bool
|
|
|
|
operator==(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
|
|
|
|
const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
|
2012-10-27 14:20:18 +02:00
|
|
|
{ return static_cast<const _GLIBCXX_STD_BASE&>(__x) == __y; }
|
2010-03-26 03:19:10 +01:00
|
|
|
|
|
|
|
template<typename _Key, typename _Tp, typename _Hash,
|
|
|
|
typename _Pred, typename _Alloc>
|
|
|
|
inline bool
|
|
|
|
operator!=(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
|
|
|
|
const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
|
|
|
|
{ return !(__x == __y); }
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
#undef _GLIBCXX_BASE
|
|
|
|
#undef _GLIBCXX_STD_BASE
|
|
|
|
#define _GLIBCXX_BASE unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
#define _GLIBCXX_STD_BASE _GLIBCXX_STD_C::_GLIBCXX_BASE
|
2009-10-03 04:17:41 +02:00
|
|
|
|
2009-11-17 21:45:32 +01:00
|
|
|
/// Class std::unordered_multimap wrapper with performance instrumentation.
|
2009-10-03 04:17:41 +02:00
|
|
|
template<typename _Key, typename _Tp,
|
|
|
|
typename _Hash = std::hash<_Key>,
|
|
|
|
typename _Pred = std::equal_to<_Key>,
|
|
|
|
typename _Alloc = std::allocator<_Key> >
|
|
|
|
class unordered_multimap
|
|
|
|
: public _GLIBCXX_STD_BASE
|
|
|
|
{
|
|
|
|
typedef typename _GLIBCXX_STD_BASE _Base;
|
|
|
|
|
|
|
|
public:
|
|
|
|
typedef typename _Base::size_type size_type;
|
|
|
|
typedef typename _Base::hasher hasher;
|
|
|
|
typedef typename _Base::key_equal key_equal;
|
|
|
|
typedef typename _Base::allocator_type allocator_type;
|
|
|
|
typedef typename _Base::key_type key_type;
|
|
|
|
typedef typename _Base::value_type value_type;
|
|
|
|
typedef typename _Base::difference_type difference_type;
|
|
|
|
typedef typename _Base::reference reference;
|
|
|
|
typedef typename _Base::const_reference const_reference;
|
|
|
|
|
|
|
|
typedef typename _Base::iterator iterator;
|
|
|
|
typedef typename _Base::const_iterator const_iterator;
|
|
|
|
|
|
|
|
explicit
|
|
|
|
unordered_multimap(size_type __n = 10,
|
hashtable.h (_Hashtable<>::operator=(const _Hashtable&)): Move inline.
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::operator=(const
_Hashtable&)): Move inline.
(operator=(_Hashtable&&)): Define.
* include/bits/unordered_map.h (unordered_map(unordered_map&&),
unordered_map(const unordered_map&), unordered_multimap
(unordered_multimap&&), unordered_multimap(const unordered_multimap&),
__unordered_map(__unordered_map&&), __unordered_map(const
__unordered_map&), __unordered_multimap(__unordered_multimap&&),
__unordered_multimap(const __unordered_multimap&)): Do not define,
leave implicit.
* include/bits/unordered_set.h (unordered_set(unordered_set&&),
unordered_set(const unordered_set&), unordered_multiset
(unordered_multiset&&), unordered_multiset(const unordered_multiset&),
__unordered_set(__unordered_set&&), __unordered_set(const
__unordered_set&), __unordered_multiset(__unordered_multiset&&),
__unordered_multiset(const __unordered_multiset&)): Likewise.
* include/bits/unordered_map.h (__unordered_map(initializer_list<>),
__unordered_map<>::operator=(initializer_list<>),
__unordered_multimap(initializer_list<>), __unordered_multimap<>::
operator=(initializer_list<>)): Add.
* include/bits/unordered_set.h (__unordered_set(initializer_list<>),
__unordered_set<>::operator=(initializer_list<>),
__unordered_multiset(initializer_list<>), __unordered_multiset<>::
operator=(initializer_list<>)): Likewise.
* include/bits/unordered_map.h (__unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Fix __n default to 0.
* include/bits/unordered_set.h (__unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
From-SVN: r163236
2010-08-14 03:00:23 +02:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
2009-10-03 04:17:41 +02:00
|
|
|
: _Base(__n, __hf, __eql, __a)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
template<typename _InputIterator>
|
|
|
|
unordered_multimap(_InputIterator __f, _InputIterator __l,
|
hashtable.h (_Hashtable<>::operator=(const _Hashtable&)): Move inline.
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::operator=(const
_Hashtable&)): Move inline.
(operator=(_Hashtable&&)): Define.
* include/bits/unordered_map.h (unordered_map(unordered_map&&),
unordered_map(const unordered_map&), unordered_multimap
(unordered_multimap&&), unordered_multimap(const unordered_multimap&),
__unordered_map(__unordered_map&&), __unordered_map(const
__unordered_map&), __unordered_multimap(__unordered_multimap&&),
__unordered_multimap(const __unordered_multimap&)): Do not define,
leave implicit.
* include/bits/unordered_set.h (unordered_set(unordered_set&&),
unordered_set(const unordered_set&), unordered_multiset
(unordered_multiset&&), unordered_multiset(const unordered_multiset&),
__unordered_set(__unordered_set&&), __unordered_set(const
__unordered_set&), __unordered_multiset(__unordered_multiset&&),
__unordered_multiset(const __unordered_multiset&)): Likewise.
* include/bits/unordered_map.h (__unordered_map(initializer_list<>),
__unordered_map<>::operator=(initializer_list<>),
__unordered_multimap(initializer_list<>), __unordered_multimap<>::
operator=(initializer_list<>)): Add.
* include/bits/unordered_set.h (__unordered_set(initializer_list<>),
__unordered_set<>::operator=(initializer_list<>),
__unordered_multiset(initializer_list<>), __unordered_multiset<>::
operator=(initializer_list<>)): Likewise.
* include/bits/unordered_map.h (__unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Fix __n default to 0.
* include/bits/unordered_set.h (__unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
From-SVN: r163236
2010-08-14 03:00:23 +02:00
|
|
|
size_type __n = 0,
|
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
2009-10-03 04:17:41 +02:00
|
|
|
: _Base(__f, __l, __n, __hf, __eql, __a)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
|
2011-11-09 09:23:30 +01:00
|
|
|
unordered_multimap(const unordered_multimap& __x)
|
|
|
|
: _Base(__x)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
unordered_multimap(const _Base& __x)
|
|
|
|
: _Base(__x)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multimap(unordered_multimap&& __x)
|
2010-08-05 09:34:08 +02:00
|
|
|
: _Base(std::move(__x))
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multimap(initializer_list<value_type> __l,
|
hashtable.h (_Hashtable<>::operator=(const _Hashtable&)): Move inline.
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::operator=(const
_Hashtable&)): Move inline.
(operator=(_Hashtable&&)): Define.
* include/bits/unordered_map.h (unordered_map(unordered_map&&),
unordered_map(const unordered_map&), unordered_multimap
(unordered_multimap&&), unordered_multimap(const unordered_multimap&),
__unordered_map(__unordered_map&&), __unordered_map(const
__unordered_map&), __unordered_multimap(__unordered_multimap&&),
__unordered_multimap(const __unordered_multimap&)): Do not define,
leave implicit.
* include/bits/unordered_set.h (unordered_set(unordered_set&&),
unordered_set(const unordered_set&), unordered_multiset
(unordered_multiset&&), unordered_multiset(const unordered_multiset&),
__unordered_set(__unordered_set&&), __unordered_set(const
__unordered_set&), __unordered_multiset(__unordered_multiset&&),
__unordered_multiset(const __unordered_multiset&)): Likewise.
* include/bits/unordered_map.h (__unordered_map(initializer_list<>),
__unordered_map<>::operator=(initializer_list<>),
__unordered_multimap(initializer_list<>), __unordered_multimap<>::
operator=(initializer_list<>)): Add.
* include/bits/unordered_set.h (__unordered_set(initializer_list<>),
__unordered_set<>::operator=(initializer_list<>),
__unordered_multiset(initializer_list<>), __unordered_multiset<>::
operator=(initializer_list<>)): Likewise.
* include/bits/unordered_map.h (__unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Fix __n default to 0.
* include/bits/unordered_set.h (__unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
From-SVN: r163236
2010-08-14 03:00:23 +02:00
|
|
|
size_type __n = 0,
|
2009-10-03 04:17:41 +02:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
|
|
|
: _Base(__l, __n, __hf, __eql, __a) { }
|
|
|
|
|
|
|
|
unordered_multimap&
|
|
|
|
operator=(const unordered_multimap& __x)
|
|
|
|
{
|
|
|
|
*static_cast<_Base*>(this) = __x;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multimap&
|
|
|
|
operator=(unordered_multimap&& __x)
|
|
|
|
{
|
2010-01-09 12:16:42 +01:00
|
|
|
// NB: DR 1204.
|
|
|
|
// NB: DR 675.
|
|
|
|
this->clear();
|
|
|
|
this->swap(__x);
|
2009-10-03 04:17:41 +02:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multimap&
|
|
|
|
operator=(initializer_list<value_type> __l)
|
|
|
|
{
|
|
|
|
this->clear();
|
|
|
|
this->insert(__l);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2011-06-01 16:16:19 +02:00
|
|
|
~unordered_multimap() noexcept
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2009-11-17 21:45:32 +01:00
|
|
|
__profcxx_hashtable_destruct(this, _Base::bucket_count(),
|
|
|
|
_Base::size());
|
2009-10-03 04:17:41 +02:00
|
|
|
_M_profile_destruct();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2011-05-26 17:35:02 +02:00
|
|
|
clear() noexcept
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2009-11-17 21:45:32 +01:00
|
|
|
__profcxx_hashtable_destruct(this, _Base::bucket_count(),
|
|
|
|
_Base::size());
|
2009-10-03 04:17:41 +02:00
|
|
|
_M_profile_destruct();
|
|
|
|
_Base::clear();
|
|
|
|
}
|
|
|
|
|
2011-12-10 15:00:03 +01:00
|
|
|
template<typename... _Args>
|
|
|
|
iterator
|
|
|
|
emplace(_Args&&... __args)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
iterator __res
|
|
|
|
= _Base::emplace(std::forward<_Args>(__args)...);
|
|
|
|
_M_profile_resize(__old_size);
|
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename... _Args>
|
|
|
|
iterator
|
|
|
|
emplace_hint(const_iterator __it, _Args&&... __args)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
iterator __res
|
|
|
|
= _Base::emplace_hint(__it, std::forward<_Args>(__args)...);
|
|
|
|
_M_profile_resize(__old_size);
|
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
void
|
|
|
|
insert(std::initializer_list<value_type> __l)
|
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
2009-10-03 04:17:41 +02:00
|
|
|
_Base::insert(__l);
|
2011-12-10 15:00:03 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
|
|
|
|
2010-01-03 15:50:09 +01:00
|
|
|
iterator
|
2009-10-03 04:17:41 +02:00
|
|
|
insert(const value_type& __obj)
|
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-01-03 15:50:09 +01:00
|
|
|
iterator __res = _Base::insert(__obj);
|
2011-12-10 15:00:03 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
return __res;
|
|
|
|
}
|
2010-01-03 15:50:09 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
iterator
|
|
|
|
insert(const_iterator __iter, const value_type& __v)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-10-28 18:01:05 +02:00
|
|
|
iterator __res = _Base::insert(__iter, __v);
|
2011-12-10 15:00:03 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2010-02-10 17:09:42 +01:00
|
|
|
return __res;
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
|
|
|
|
2010-10-28 18:01:05 +02:00
|
|
|
template<typename _Pair, typename = typename
|
2012-07-13 10:59:58 +02:00
|
|
|
std::enable_if<std::is_constructible<value_type,
|
|
|
|
_Pair&&>::value>::type>
|
2010-10-28 18:01:05 +02:00
|
|
|
iterator
|
|
|
|
insert(_Pair&& __obj)
|
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-10-28 18:01:05 +02:00
|
|
|
iterator __res = _Base::insert(std::forward<_Pair>(__obj));
|
2011-12-10 15:00:03 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2010-10-28 18:01:05 +02:00
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _Pair, typename = typename
|
2012-07-13 10:59:58 +02:00
|
|
|
std::enable_if<std::is_constructible<value_type,
|
|
|
|
_Pair&&>::value>::type>
|
2010-10-28 18:01:05 +02:00
|
|
|
iterator
|
|
|
|
insert(const_iterator __iter, _Pair&& __v)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
iterator __res = _Base::insert(__iter, std::forward<_Pair>(__v));
|
2011-12-10 15:00:03 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2010-10-28 18:01:05 +02:00
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
template<typename _InputIter>
|
2010-02-10 17:09:42 +01:00
|
|
|
void
|
|
|
|
insert(_InputIter __first, _InputIter __last)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-05-05 21:53:11 +02:00
|
|
|
_Base::insert(__first, __last);
|
2011-12-10 15:00:03 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2010-02-10 17:09:42 +01:00
|
|
|
}
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
void
|
|
|
|
insert(const value_type* __first, const value_type* __last)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::insert(__first, __last);
|
2011-12-10 15:00:03 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
swap(unordered_multimap& __x)
|
2010-02-10 17:09:42 +01:00
|
|
|
{ _Base::swap(__x); }
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
void rehash(size_type __n)
|
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
2009-10-03 04:17:41 +02:00
|
|
|
_Base::rehash(__n);
|
2011-12-10 15:00:03 +01:00
|
|
|
_M_profile_resize(__old_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
2010-02-10 17:09:42 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
private:
|
2010-02-10 17:09:42 +01:00
|
|
|
void
|
2011-12-10 15:00:03 +01:00
|
|
|
_M_profile_resize(size_type __old_size)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __new_size = _Base::bucket_count();
|
2009-10-03 04:17:41 +02:00
|
|
|
if (__old_size != __new_size)
|
|
|
|
__profcxx_hashtable_resize(this, __old_size, __new_size);
|
|
|
|
}
|
|
|
|
|
2010-02-10 17:09:42 +01:00
|
|
|
void
|
|
|
|
_M_profile_destruct()
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __hops = 0, __lc = 0, __chain = 0;
|
|
|
|
iterator __it = this->begin();
|
|
|
|
while (__it != this->end())
|
2010-02-10 17:09:42 +01:00
|
|
|
{
|
2011-12-10 15:00:03 +01:00
|
|
|
size_type __bkt = this->bucket(__it->first);
|
re PR libstdc++/51608 ([C++11] Unordered containers end(size_type) isn't constant time)
2011-12-29 François Dumont <fdumont@gcc.gnu.org>
PR libstdc++/51608
* include/bits/hashtable_policy.h (_Equal_helper<>): New, change the
way the _Equal functor is used depending on whether hash code is
cached or not.
(_Ebo_helper<>): New helper type to introduce EBO when possible.
(_Hash_code_base): Use _Ebo_helper to limit memory footprint. Move
_Equal functor management...
(_Hashtable_base): ...here, new, use _Equal_helper.
(_Local_iterator_base<>, _Locale_iterator<>, _Locale_const_iterator<>):
New, use _Hash_code_base, implementation of...
* include/bits/hashtable.h (_Hashtable<>::local_iterator,
_Hashtable<>::const_local_iterator): ...those. Add static assertions
checking that some functors are empty depending on whether hash code
is cache or not.
(_Hashtable<>::_M_bucket_index): New overloads using current bucket
count, use through out the _Hastable<> implementation.
* include/bits/unordered_set.h (__unordered_set<>,
__unordered_multiset<>): Cache hash code iff hash functor is not
empty and not final.
* include/bits/unordered_map.h (__unordered_map<>,
__unordered_multimap<>): Likewise.
* include/debug/unordered_map
(unordered_map<>::_S_to_local, unordered_multimap<>::_S_to_local):
Adapt to match new local iterator implementation.
* include/debug/unordered_set (unordered_set<>::_S_to_local,
unordered_multiset<>::_S_to_local): Likewise.
* include/profile/unordered_map (unordered_map<>::_M_profile_destruct,
unordered_multimap<>::_M_profile_destruct): Enhance thanks to usage of
local iterators.
* include/profile/unordered_set (unordered_set<>::_M_profile_destruct,
unordered_multiset<>::_M_profile_destruct): Likewise.
* testsuite_files/23_containers/unordered_set/instantiation_neg.cc:
Fix error line.
* testsuite_files/23_containers/unordered_set/final_hash.cc: New.
* testsuite_files/23_containers/unordered_multiset/final_hash.cc: New.
* testsuite_files/23_containers/unordered_map/final_hash.cc: New.
* testsuite_files/23_containers/unordered_multimap/final_hash.cc: New.
From-SVN: r182727
2011-12-29 18:58:51 +01:00
|
|
|
auto __lit = this->begin(__bkt);
|
|
|
|
auto __lend = this->end(__bkt);
|
|
|
|
for (++__it, ++__lit; __lit != __lend; ++__it, ++__lit)
|
2011-12-10 15:00:03 +01:00
|
|
|
++__chain;
|
2010-02-10 17:09:42 +01:00
|
|
|
if (__chain)
|
|
|
|
{
|
|
|
|
++__chain;
|
|
|
|
__lc = __lc > __chain ? __lc : __chain;
|
|
|
|
__hops += __chain * (__chain - 1) / 2;
|
|
|
|
__chain = 0;
|
|
|
|
}
|
|
|
|
}
|
2011-12-10 15:00:03 +01:00
|
|
|
__profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
2011-12-10 15:00:03 +01:00
|
|
|
};
|
2010-02-10 17:09:42 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
template<typename _Key, typename _Tp, typename _Hash,
|
2010-02-10 17:09:42 +01:00
|
|
|
typename _Pred, typename _Alloc>
|
2009-10-03 04:17:41 +02:00
|
|
|
inline void
|
|
|
|
swap(unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
|
2010-02-10 17:09:42 +01:00
|
|
|
unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
|
2009-10-03 04:17:41 +02:00
|
|
|
{ __x.swap(__y); }
|
|
|
|
|
2010-03-26 03:19:10 +01:00
|
|
|
template<typename _Key, typename _Tp, typename _Hash,
|
|
|
|
typename _Pred, typename _Alloc>
|
|
|
|
inline bool
|
|
|
|
operator==(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
|
|
|
|
const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
|
2012-10-27 14:20:18 +02:00
|
|
|
{ return static_cast<const _GLIBCXX_STD_BASE&>(__x) == __y; }
|
2010-03-26 03:19:10 +01:00
|
|
|
|
|
|
|
template<typename _Key, typename _Tp, typename _Hash,
|
|
|
|
typename _Pred, typename _Alloc>
|
|
|
|
inline bool
|
|
|
|
operator!=(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
|
|
|
|
const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
|
|
|
|
{ return !(__x == __y); }
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
} // namespace __profile
|
|
|
|
} // namespace std
|
|
|
|
|
|
|
|
#undef _GLIBCXX_BASE
|
|
|
|
#undef _GLIBCXX_STD_BASE
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#endif // C++11
|
2010-03-30 12:59:17 +02:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
#endif
|