2010-02-10 17:09:42 +01:00
|
|
|
// unordered_map implementation -*- C++ -*-
|
|
|
|
|
2019-01-01 13:31:55 +01:00
|
|
|
// Copyright (C) 2010-2019 Free Software Foundation, Inc.
|
2010-02-10 17:09:42 +01: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
|
|
|
|
// Free Software Foundation; either version 3, or (at your option)
|
|
|
|
// any later version.
|
|
|
|
|
|
|
|
// 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.
|
|
|
|
|
|
|
|
// 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.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
/** @file bits/unordered_map.h
|
|
|
|
* This is an internal header file, included by other library headers.
|
2010-12-19 10:21:16 +01:00
|
|
|
* Do not attempt to use it directly. @headername{unordered_map}
|
2010-02-10 17:09:42 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _UNORDERED_MAP_H
|
|
|
|
#define _UNORDERED_MAP_H
|
|
|
|
|
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)
|
|
|
|
{
|
2017-07-23 10:41:35 +02:00
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
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
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
|
2010-02-10 17:09:42 +01:00
|
|
|
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
/// Base types for unordered_map.
|
|
|
|
template<bool _Cache>
|
|
|
|
using __umap_traits = __detail::_Hashtable_traits<_Cache, false, true>;
|
|
|
|
|
|
|
|
template<typename _Key,
|
|
|
|
typename _Tp,
|
|
|
|
typename _Hash = hash<_Key>,
|
|
|
|
typename _Pred = std::equal_to<_Key>,
|
|
|
|
typename _Alloc = std::allocator<std::pair<const _Key, _Tp> >,
|
|
|
|
typename _Tr = __umap_traits<__cache_default<_Key, _Hash>::value>>
|
|
|
|
using __umap_hashtable = _Hashtable<_Key, std::pair<const _Key, _Tp>,
|
2012-05-15 12:00:19 +02:00
|
|
|
_Alloc, __detail::_Select1st,
|
|
|
|
_Pred, _Hash,
|
|
|
|
__detail::_Mod_range_hashing,
|
|
|
|
__detail::_Default_ranged_hash,
|
|
|
|
__detail::_Prime_rehash_policy, _Tr>;
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
|
|
|
|
/// Base types for unordered_multimap.
|
|
|
|
template<bool _Cache>
|
|
|
|
using __ummap_traits = __detail::_Hashtable_traits<_Cache, false, false>;
|
|
|
|
|
|
|
|
template<typename _Key,
|
|
|
|
typename _Tp,
|
|
|
|
typename _Hash = hash<_Key>,
|
|
|
|
typename _Pred = std::equal_to<_Key>,
|
|
|
|
typename _Alloc = std::allocator<std::pair<const _Key, _Tp> >,
|
|
|
|
typename _Tr = __ummap_traits<__cache_default<_Key, _Hash>::value>>
|
|
|
|
using __ummap_hashtable = _Hashtable<_Key, std::pair<const _Key, _Tp>,
|
2012-05-15 12:00:19 +02:00
|
|
|
_Alloc, __detail::_Select1st,
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
_Pred, _Hash,
|
|
|
|
__detail::_Mod_range_hashing,
|
|
|
|
__detail::_Default_ranged_hash,
|
|
|
|
__detail::_Prime_rehash_policy, _Tr>;
|
2010-02-10 17:09:42 +01:00
|
|
|
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
|
|
|
|
class unordered_multimap;
|
|
|
|
|
2010-02-10 17:09:42 +01:00
|
|
|
/**
|
|
|
|
* @brief A standard container composed of unique keys (containing
|
|
|
|
* at most one of each key value) that associates values of another type
|
|
|
|
* with the keys.
|
|
|
|
*
|
|
|
|
* @ingroup unordered_associative_containers
|
|
|
|
*
|
2013-04-25 11:42:46 +02:00
|
|
|
* @tparam _Key Type of key objects.
|
|
|
|
* @tparam _Tp Type of mapped objects.
|
|
|
|
* @tparam _Hash Hashing function object type, defaults to hash<_Value>.
|
|
|
|
* @tparam _Pred Predicate function object type, defaults
|
|
|
|
* to equal_to<_Value>.
|
|
|
|
* @tparam _Alloc Allocator type, defaults to
|
|
|
|
* std::allocator<std::pair<const _Key, _Tp>>.
|
2010-02-10 17:09:42 +01:00
|
|
|
*
|
2012-05-03 00:25:28 +02:00
|
|
|
* Meets the requirements of a <a href="tables.html#65">container</a>, and
|
|
|
|
* <a href="tables.html#xx">unordered associative container</a>
|
|
|
|
*
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
* The resulting value type of the container is std::pair<const _Key, _Tp>.
|
|
|
|
*
|
|
|
|
* Base is _Hashtable, dispatched at compile time via template
|
|
|
|
* alias __umap_hashtable.
|
2010-02-10 17:09:42 +01:00
|
|
|
*/
|
2017-11-21 21:47:09 +01:00
|
|
|
template<typename _Key, typename _Tp,
|
|
|
|
typename _Hash = hash<_Key>,
|
|
|
|
typename _Pred = equal_to<_Key>,
|
|
|
|
typename _Alloc = allocator<std::pair<const _Key, _Tp>>>
|
2013-11-14 13:43:00 +01:00
|
|
|
class unordered_map
|
2010-02-10 17:09:42 +01:00
|
|
|
{
|
2012-10-27 14:20:18 +02:00
|
|
|
typedef __umap_hashtable<_Key, _Tp, _Hash, _Pred, _Alloc> _Hashtable;
|
|
|
|
_Hashtable _M_h;
|
2010-02-10 17:09:42 +01:00
|
|
|
|
|
|
|
public:
|
2012-10-27 14:20:18 +02:00
|
|
|
// typedefs:
|
|
|
|
//@{
|
|
|
|
/// Public typedefs.
|
|
|
|
typedef typename _Hashtable::key_type key_type;
|
|
|
|
typedef typename _Hashtable::value_type value_type;
|
|
|
|
typedef typename _Hashtable::mapped_type mapped_type;
|
|
|
|
typedef typename _Hashtable::hasher hasher;
|
|
|
|
typedef typename _Hashtable::key_equal key_equal;
|
|
|
|
typedef typename _Hashtable::allocator_type allocator_type;
|
|
|
|
//@}
|
2010-02-10 17:09:42 +01:00
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
//@{
|
|
|
|
/// Iterator-related typedefs.
|
2013-04-22 22:22:07 +02:00
|
|
|
typedef typename _Hashtable::pointer pointer;
|
|
|
|
typedef typename _Hashtable::const_pointer const_pointer;
|
|
|
|
typedef typename _Hashtable::reference reference;
|
|
|
|
typedef typename _Hashtable::const_reference const_reference;
|
2012-10-27 14:20:18 +02:00
|
|
|
typedef typename _Hashtable::iterator iterator;
|
|
|
|
typedef typename _Hashtable::const_iterator const_iterator;
|
|
|
|
typedef typename _Hashtable::local_iterator local_iterator;
|
|
|
|
typedef typename _Hashtable::const_local_iterator const_local_iterator;
|
|
|
|
typedef typename _Hashtable::size_type size_type;
|
|
|
|
typedef typename _Hashtable::difference_type difference_type;
|
|
|
|
//@}
|
|
|
|
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
#if __cplusplus > 201402L
|
|
|
|
using node_type = typename _Hashtable::node_type;
|
|
|
|
using insert_return_type = typename _Hashtable::insert_return_type;
|
|
|
|
#endif
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
//construct/destroy/copy
|
|
|
|
|
2014-09-06 09:38:48 +02:00
|
|
|
/// Default constructor.
|
|
|
|
unordered_map() = default;
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Default constructor creates no elements.
|
2014-09-06 09:38:48 +02:00
|
|
|
* @param __n Minimal initial number of buckets.
|
2012-10-27 14:20:18 +02:00
|
|
|
* @param __hf A hash functor.
|
|
|
|
* @param __eql A key equality functor.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*/
|
2010-02-10 17:09:42 +01:00
|
|
|
explicit
|
2014-09-06 09:38:48 +02:00
|
|
|
unordered_map(size_type __n,
|
2010-02-10 17:09:42 +01:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
2012-10-27 14:20:18 +02:00
|
|
|
: _M_h(__n, __hf, __eql, __a)
|
2010-02-10 17:09:42 +01:00
|
|
|
{ }
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Builds an %unordered_map from a range.
|
|
|
|
* @param __first An input iterator.
|
|
|
|
* @param __last An input iterator.
|
|
|
|
* @param __n Minimal initial number of buckets.
|
|
|
|
* @param __hf A hash functor.
|
|
|
|
* @param __eql A key equality functor.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*
|
|
|
|
* Create an %unordered_map consisting of copies of the elements from
|
|
|
|
* [__first,__last). This is linear in N (where N is
|
|
|
|
* distance(__first,__last)).
|
|
|
|
*/
|
2010-02-10 17:09:42 +01:00
|
|
|
template<typename _InputIterator>
|
2014-06-14 18:33:53 +02:00
|
|
|
unordered_map(_InputIterator __first, _InputIterator __last,
|
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,
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
2010-02-10 17:09:42 +01:00
|
|
|
const allocator_type& __a = allocator_type())
|
2014-06-14 18:33:53 +02:00
|
|
|
: _M_h(__first, __last, __n, __hf, __eql, __a)
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
{ }
|
2010-02-10 17:09:42 +01:00
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
/// Copy constructor.
|
|
|
|
unordered_map(const unordered_map&) = default;
|
|
|
|
|
2013-01-06 22:58:18 +01:00
|
|
|
/// Move constructor.
|
2012-10-27 14:20:18 +02:00
|
|
|
unordered_map(unordered_map&&) = default;
|
|
|
|
|
2013-04-22 22:22:07 +02:00
|
|
|
/**
|
|
|
|
* @brief Creates an %unordered_map with no elements.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*/
|
|
|
|
explicit
|
|
|
|
unordered_map(const allocator_type& __a)
|
|
|
|
: _M_h(__a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @brief Copy constructor with allocator argument.
|
|
|
|
* @param __uset Input %unordered_map to copy.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*/
|
|
|
|
unordered_map(const unordered_map& __umap,
|
|
|
|
const allocator_type& __a)
|
2015-05-17 22:14:53 +02:00
|
|
|
: _M_h(__umap._M_h, __a)
|
2013-04-22 22:22:07 +02:00
|
|
|
{ }
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @brief Move constructor with allocator argument.
|
|
|
|
* @param __uset Input %unordered_map to move.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*/
|
|
|
|
unordered_map(unordered_map&& __umap,
|
|
|
|
const allocator_type& __a)
|
2015-05-17 22:14:53 +02:00
|
|
|
: _M_h(std::move(__umap._M_h), __a)
|
2013-04-22 22:22:07 +02:00
|
|
|
{ }
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Builds an %unordered_map from an initializer_list.
|
|
|
|
* @param __l An initializer_list.
|
|
|
|
* @param __n Minimal initial number of buckets.
|
|
|
|
* @param __hf A hash functor.
|
|
|
|
* @param __eql A key equality functor.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*
|
|
|
|
* Create an %unordered_map consisting of copies of the elements in the
|
|
|
|
* list. This is linear in N (where N is @a __l.size()).
|
|
|
|
*/
|
2010-02-10 17:09:42 +01:00
|
|
|
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,
|
2010-02-10 17:09:42 +01:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
2015-05-17 22:14:53 +02:00
|
|
|
: _M_h(__l, __n, __hf, __eql, __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
unordered_map(size_type __n, const allocator_type& __a)
|
|
|
|
: unordered_map(__n, hasher(), key_equal(), __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
unordered_map(size_type __n, const hasher& __hf,
|
|
|
|
const allocator_type& __a)
|
|
|
|
: unordered_map(__n, __hf, key_equal(), __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
template<typename _InputIterator>
|
|
|
|
unordered_map(_InputIterator __first, _InputIterator __last,
|
|
|
|
size_type __n,
|
|
|
|
const allocator_type& __a)
|
|
|
|
: unordered_map(__first, __last, __n, hasher(), key_equal(), __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
template<typename _InputIterator>
|
|
|
|
unordered_map(_InputIterator __first, _InputIterator __last,
|
|
|
|
size_type __n, const hasher& __hf,
|
|
|
|
const allocator_type& __a)
|
|
|
|
: unordered_map(__first, __last, __n, __hf, key_equal(), __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
unordered_map(initializer_list<value_type> __l,
|
|
|
|
size_type __n,
|
|
|
|
const allocator_type& __a)
|
|
|
|
: unordered_map(__l, __n, hasher(), key_equal(), __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
unordered_map(initializer_list<value_type> __l,
|
|
|
|
size_type __n, const hasher& __hf,
|
|
|
|
const allocator_type& __a)
|
|
|
|
: unordered_map(__l, __n, __hf, key_equal(), __a)
|
2010-02-10 17:09:42 +01:00
|
|
|
{ }
|
2012-10-27 14:20:18 +02:00
|
|
|
|
|
|
|
/// Copy assignment operator.
|
|
|
|
unordered_map&
|
|
|
|
operator=(const unordered_map&) = default;
|
|
|
|
|
|
|
|
/// Move assignment operator.
|
|
|
|
unordered_map&
|
|
|
|
operator=(unordered_map&&) = default;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief %Unordered_map list assignment operator.
|
|
|
|
* @param __l An initializer_list.
|
|
|
|
*
|
|
|
|
* This function fills an %unordered_map with copies of the elements in
|
|
|
|
* the initializer list @a __l.
|
|
|
|
*
|
|
|
|
* Note that the assignment completely changes the %unordered_map and
|
|
|
|
* that the resulting %unordered_map's size is the same as the number
|
2016-07-14 12:02:10 +02:00
|
|
|
* of elements assigned.
|
2012-10-27 14:20:18 +02:00
|
|
|
*/
|
|
|
|
unordered_map&
|
|
|
|
operator=(initializer_list<value_type> __l)
|
|
|
|
{
|
|
|
|
_M_h = __l;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2016-07-14 12:02:10 +02:00
|
|
|
/// Returns the allocator object used by the %unordered_map.
|
2012-10-27 14:20:18 +02:00
|
|
|
allocator_type
|
|
|
|
get_allocator() const noexcept
|
|
|
|
{ return _M_h.get_allocator(); }
|
|
|
|
|
|
|
|
// size and capacity:
|
|
|
|
|
|
|
|
/// Returns true if the %unordered_map is empty.
|
2019-01-21 12:47:30 +01:00
|
|
|
_GLIBCXX_NODISCARD bool
|
2012-10-27 14:20:18 +02:00
|
|
|
empty() const noexcept
|
|
|
|
{ return _M_h.empty(); }
|
|
|
|
|
|
|
|
/// Returns the size of the %unordered_map.
|
|
|
|
size_type
|
|
|
|
size() const noexcept
|
|
|
|
{ return _M_h.size(); }
|
|
|
|
|
|
|
|
/// Returns the maximum size of the %unordered_map.
|
|
|
|
size_type
|
|
|
|
max_size() const noexcept
|
|
|
|
{ return _M_h.max_size(); }
|
|
|
|
|
|
|
|
// iterators.
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write iterator that points to the first element in the
|
|
|
|
* %unordered_map.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
begin() noexcept
|
|
|
|
{ return _M_h.begin(); }
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points to the first
|
|
|
|
* element in the %unordered_map.
|
|
|
|
*/
|
|
|
|
const_iterator
|
|
|
|
begin() const noexcept
|
|
|
|
{ return _M_h.begin(); }
|
|
|
|
|
|
|
|
const_iterator
|
|
|
|
cbegin() const noexcept
|
|
|
|
{ return _M_h.begin(); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write iterator that points one past the last element in
|
|
|
|
* the %unordered_map.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
end() noexcept
|
|
|
|
{ return _M_h.end(); }
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points one past the last
|
|
|
|
* element in the %unordered_map.
|
|
|
|
*/
|
|
|
|
const_iterator
|
|
|
|
end() const noexcept
|
|
|
|
{ return _M_h.end(); }
|
|
|
|
|
|
|
|
const_iterator
|
|
|
|
cend() const noexcept
|
|
|
|
{ return _M_h.end(); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
// modifiers.
|
|
|
|
|
|
|
|
/**
|
2015-05-17 22:14:53 +02:00
|
|
|
* @brief Attempts to build and insert a std::pair into the
|
|
|
|
* %unordered_map.
|
2012-10-27 14:20:18 +02:00
|
|
|
*
|
|
|
|
* @param __args Arguments used to generate a new pair instance (see
|
|
|
|
* std::piecewise_contruct for passing arguments to each
|
|
|
|
* part of the pair constructor).
|
|
|
|
*
|
|
|
|
* @return A pair, of which the first element is an iterator that points
|
|
|
|
* to the possibly inserted pair, and the second is a bool that
|
|
|
|
* is true if the pair was actually inserted.
|
|
|
|
*
|
|
|
|
* This function attempts to build and insert a (key, value) %pair into
|
|
|
|
* the %unordered_map.
|
|
|
|
* An %unordered_map relies on unique keys and thus a %pair is only
|
|
|
|
* inserted if its first element (the key) is not already present in the
|
|
|
|
* %unordered_map.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
template<typename... _Args>
|
|
|
|
std::pair<iterator, bool>
|
|
|
|
emplace(_Args&&... __args)
|
|
|
|
{ return _M_h.emplace(std::forward<_Args>(__args)...); }
|
|
|
|
|
|
|
|
/**
|
2015-05-17 22:14:53 +02:00
|
|
|
* @brief Attempts to build and insert a std::pair into the
|
|
|
|
* %unordered_map.
|
2012-10-27 14:20:18 +02:00
|
|
|
*
|
|
|
|
* @param __pos An iterator that serves as a hint as to where the pair
|
|
|
|
* should be inserted.
|
|
|
|
* @param __args Arguments used to generate a new pair instance (see
|
|
|
|
* std::piecewise_contruct for passing arguments to each
|
|
|
|
* part of the pair constructor).
|
|
|
|
* @return An iterator that points to the element with key of the
|
|
|
|
* std::pair built from @a __args (may or may not be that
|
|
|
|
* std::pair).
|
|
|
|
*
|
|
|
|
* This function is not concerned about whether the insertion took place,
|
|
|
|
* and thus does not return a boolean like the single-argument emplace()
|
|
|
|
* does.
|
|
|
|
* Note that the first parameter is only a hint and can potentially
|
|
|
|
* improve the performance of the insertion process. A bad hint would
|
|
|
|
* cause no gains in efficiency.
|
|
|
|
*
|
|
|
|
* See
|
2014-06-14 22:22:10 +02:00
|
|
|
* https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
|
2012-10-27 14:20:18 +02:00
|
|
|
* for more on @a hinting.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
template<typename... _Args>
|
|
|
|
iterator
|
|
|
|
emplace_hint(const_iterator __pos, _Args&&... __args)
|
|
|
|
{ return _M_h.emplace_hint(__pos, std::forward<_Args>(__args)...); }
|
|
|
|
|
2015-08-09 00:57:13 +02:00
|
|
|
#if __cplusplus > 201402L
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
/// Extract a node.
|
|
|
|
node_type
|
|
|
|
extract(const_iterator __pos)
|
2016-09-26 12:17:48 +02:00
|
|
|
{
|
|
|
|
__glibcxx_assert(__pos != end());
|
|
|
|
return _M_h.extract(__pos);
|
|
|
|
}
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
|
|
|
|
/// Extract a node.
|
|
|
|
node_type
|
|
|
|
extract(const key_type& __key)
|
|
|
|
{ return _M_h.extract(__key); }
|
|
|
|
|
|
|
|
/// Re-insert an extracted node.
|
|
|
|
insert_return_type
|
|
|
|
insert(node_type&& __nh)
|
|
|
|
{ return _M_h._M_reinsert_node(std::move(__nh)); }
|
|
|
|
|
|
|
|
/// Re-insert an extracted node.
|
|
|
|
iterator
|
|
|
|
insert(const_iterator, node_type&& __nh)
|
|
|
|
{ return _M_h._M_reinsert_node(std::move(__nh)).position; }
|
|
|
|
|
2015-08-13 15:57:41 +02:00
|
|
|
#define __cpp_lib_unordered_map_try_emplace 201411
|
2015-08-09 00:57:13 +02:00
|
|
|
/**
|
|
|
|
* @brief Attempts to build and insert a std::pair into the
|
|
|
|
* %unordered_map.
|
|
|
|
*
|
|
|
|
* @param __k Key to use for finding a possibly existing pair in
|
|
|
|
* the unordered_map.
|
|
|
|
* @param __args Arguments used to generate the .second for a
|
|
|
|
* new pair instance.
|
|
|
|
*
|
|
|
|
* @return A pair, of which the first element is an iterator that points
|
|
|
|
* to the possibly inserted pair, and the second is a bool that
|
|
|
|
* is true if the pair was actually inserted.
|
|
|
|
*
|
|
|
|
* This function attempts to build and insert a (key, value) %pair into
|
|
|
|
* the %unordered_map.
|
|
|
|
* An %unordered_map relies on unique keys and thus a %pair is only
|
|
|
|
* inserted if its first element (the key) is not already present in the
|
|
|
|
* %unordered_map.
|
|
|
|
* If a %pair is not inserted, this function has no effect.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
template <typename... _Args>
|
|
|
|
pair<iterator, bool>
|
|
|
|
try_emplace(const key_type& __k, _Args&&... __args)
|
|
|
|
{
|
|
|
|
iterator __i = find(__k);
|
|
|
|
if (__i == end())
|
|
|
|
{
|
|
|
|
__i = emplace(std::piecewise_construct,
|
|
|
|
std::forward_as_tuple(__k),
|
|
|
|
std::forward_as_tuple(
|
|
|
|
std::forward<_Args>(__args)...))
|
|
|
|
.first;
|
|
|
|
return {__i, true};
|
|
|
|
}
|
|
|
|
return {__i, false};
|
|
|
|
}
|
|
|
|
|
|
|
|
// move-capable overload
|
|
|
|
template <typename... _Args>
|
|
|
|
pair<iterator, bool>
|
|
|
|
try_emplace(key_type&& __k, _Args&&... __args)
|
|
|
|
{
|
|
|
|
iterator __i = find(__k);
|
|
|
|
if (__i == end())
|
|
|
|
{
|
|
|
|
__i = emplace(std::piecewise_construct,
|
|
|
|
std::forward_as_tuple(std::move(__k)),
|
|
|
|
std::forward_as_tuple(
|
|
|
|
std::forward<_Args>(__args)...))
|
|
|
|
.first;
|
|
|
|
return {__i, true};
|
|
|
|
}
|
|
|
|
return {__i, false};
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Attempts to build and insert a std::pair into the
|
|
|
|
* %unordered_map.
|
|
|
|
*
|
|
|
|
* @param __hint An iterator that serves as a hint as to where the pair
|
|
|
|
* should be inserted.
|
|
|
|
* @param __k Key to use for finding a possibly existing pair in
|
|
|
|
* the unordered_map.
|
|
|
|
* @param __args Arguments used to generate the .second for a
|
|
|
|
* new pair instance.
|
|
|
|
* @return An iterator that points to the element with key of the
|
|
|
|
* std::pair built from @a __args (may or may not be that
|
|
|
|
* std::pair).
|
|
|
|
*
|
|
|
|
* This function is not concerned about whether the insertion took place,
|
|
|
|
* and thus does not return a boolean like the single-argument emplace()
|
|
|
|
* does. However, if insertion did not take place,
|
|
|
|
* this function has no effect.
|
|
|
|
* Note that the first parameter is only a hint and can potentially
|
|
|
|
* improve the performance of the insertion process. A bad hint would
|
|
|
|
* cause no gains in efficiency.
|
|
|
|
*
|
|
|
|
* See
|
|
|
|
* https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
|
|
|
|
* for more on @a hinting.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
template <typename... _Args>
|
|
|
|
iterator
|
|
|
|
try_emplace(const_iterator __hint, const key_type& __k,
|
|
|
|
_Args&&... __args)
|
|
|
|
{
|
|
|
|
iterator __i = find(__k);
|
|
|
|
if (__i == end())
|
|
|
|
__i = emplace_hint(__hint, std::piecewise_construct,
|
|
|
|
std::forward_as_tuple(__k),
|
|
|
|
std::forward_as_tuple(
|
|
|
|
std::forward<_Args>(__args)...));
|
|
|
|
return __i;
|
|
|
|
}
|
|
|
|
|
|
|
|
// move-capable overload
|
|
|
|
template <typename... _Args>
|
|
|
|
iterator
|
|
|
|
try_emplace(const_iterator __hint, key_type&& __k, _Args&&... __args)
|
|
|
|
{
|
|
|
|
iterator __i = find(__k);
|
|
|
|
if (__i == end())
|
|
|
|
__i = emplace_hint(__hint, std::piecewise_construct,
|
|
|
|
std::forward_as_tuple(std::move(__k)),
|
|
|
|
std::forward_as_tuple(
|
|
|
|
std::forward<_Args>(__args)...));
|
|
|
|
return __i;
|
|
|
|
}
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
#endif // C++17
|
2015-08-09 00:57:13 +02:00
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Attempts to insert a std::pair into the %unordered_map.
|
|
|
|
|
|
|
|
* @param __x Pair to be inserted (see std::make_pair for easy
|
|
|
|
* creation of pairs).
|
|
|
|
*
|
|
|
|
* @return A pair, of which the first element is an iterator that
|
|
|
|
* points to the possibly inserted pair, and the second is
|
|
|
|
* a bool that is true if the pair was actually inserted.
|
|
|
|
*
|
|
|
|
* This function attempts to insert a (key, value) %pair into the
|
|
|
|
* %unordered_map. An %unordered_map relies on unique keys and thus a
|
|
|
|
* %pair is only inserted if its first element (the key) is not already
|
|
|
|
* present in the %unordered_map.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
std::pair<iterator, bool>
|
|
|
|
insert(const value_type& __x)
|
|
|
|
{ return _M_h.insert(__x); }
|
|
|
|
|
2017-10-13 14:39:32 +02:00
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 2354. Unnecessary copying when inserting into maps with braced-init
|
|
|
|
std::pair<iterator, bool>
|
|
|
|
insert(value_type&& __x)
|
|
|
|
{ return _M_h.insert(std::move(__x)); }
|
|
|
|
|
2018-09-03 16:25:12 +02:00
|
|
|
template<typename _Pair>
|
|
|
|
__enable_if_t<is_constructible<value_type, _Pair&&>::value,
|
|
|
|
pair<iterator, bool>>
|
2012-10-27 14:20:18 +02:00
|
|
|
insert(_Pair&& __x)
|
2018-09-03 16:25:12 +02:00
|
|
|
{ return _M_h.emplace(std::forward<_Pair>(__x)); }
|
2012-10-27 14:20:18 +02:00
|
|
|
//@}
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Attempts to insert a std::pair into the %unordered_map.
|
|
|
|
* @param __hint An iterator that serves as a hint as to where the
|
|
|
|
* pair should be inserted.
|
|
|
|
* @param __x Pair to be inserted (see std::make_pair for easy creation
|
|
|
|
* of pairs).
|
|
|
|
* @return An iterator that points to the element with key of
|
|
|
|
* @a __x (may or may not be the %pair passed in).
|
|
|
|
*
|
|
|
|
* This function is not concerned about whether the insertion took place,
|
|
|
|
* and thus does not return a boolean like the single-argument insert()
|
|
|
|
* does. Note that the first parameter is only a hint and can
|
|
|
|
* potentially improve the performance of the insertion process. A bad
|
|
|
|
* hint would cause no gains in efficiency.
|
|
|
|
*
|
|
|
|
* See
|
2014-06-14 22:22:10 +02:00
|
|
|
* https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
|
2012-10-27 14:20:18 +02:00
|
|
|
* for more on @a hinting.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
insert(const_iterator __hint, const value_type& __x)
|
|
|
|
{ return _M_h.insert(__hint, __x); }
|
|
|
|
|
2017-10-13 14:39:32 +02:00
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 2354. Unnecessary copying when inserting into maps with braced-init
|
|
|
|
iterator
|
|
|
|
insert(const_iterator __hint, value_type&& __x)
|
|
|
|
{ return _M_h.insert(__hint, std::move(__x)); }
|
|
|
|
|
2018-09-03 16:25:12 +02:00
|
|
|
template<typename _Pair>
|
|
|
|
__enable_if_t<is_constructible<value_type, _Pair&&>::value, iterator>
|
2012-10-27 14:20:18 +02:00
|
|
|
insert(const_iterator __hint, _Pair&& __x)
|
2018-09-03 16:25:12 +02:00
|
|
|
{ return _M_h.emplace_hint(__hint, std::forward<_Pair>(__x)); }
|
2012-10-27 14:20:18 +02:00
|
|
|
//@}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief A template function that attempts to insert a range of
|
|
|
|
* elements.
|
|
|
|
* @param __first Iterator pointing to the start of the range to be
|
|
|
|
* inserted.
|
|
|
|
* @param __last Iterator pointing to the end of the range.
|
|
|
|
*
|
|
|
|
* Complexity similar to that of the range constructor.
|
|
|
|
*/
|
|
|
|
template<typename _InputIterator>
|
|
|
|
void
|
|
|
|
insert(_InputIterator __first, _InputIterator __last)
|
|
|
|
{ _M_h.insert(__first, __last); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Attempts to insert a list of elements into the %unordered_map.
|
|
|
|
* @param __l A std::initializer_list<value_type> of elements
|
|
|
|
* to be inserted.
|
|
|
|
*
|
|
|
|
* Complexity similar to that of the range constructor.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
insert(initializer_list<value_type> __l)
|
|
|
|
{ _M_h.insert(__l); }
|
|
|
|
|
2015-08-09 00:57:13 +02:00
|
|
|
|
|
|
|
#if __cplusplus > 201402L
|
2015-08-13 15:57:41 +02:00
|
|
|
#define __cpp_lib_unordered_map_insertion 201411
|
2015-08-09 00:57:13 +02:00
|
|
|
/**
|
|
|
|
* @brief Attempts to insert a std::pair into the %unordered_map.
|
|
|
|
* @param __k Key to use for finding a possibly existing pair in
|
|
|
|
* the map.
|
|
|
|
* @param __obj Argument used to generate the .second for a pair
|
|
|
|
* instance.
|
|
|
|
*
|
|
|
|
* @return A pair, of which the first element is an iterator that
|
|
|
|
* points to the possibly inserted pair, and the second is
|
|
|
|
* a bool that is true if the pair was actually inserted.
|
|
|
|
*
|
|
|
|
* This function attempts to insert a (key, value) %pair into the
|
|
|
|
* %unordered_map. An %unordered_map relies on unique keys and thus a
|
|
|
|
* %pair is only inserted if its first element (the key) is not already
|
|
|
|
* present in the %unordered_map.
|
|
|
|
* If the %pair was already in the %unordered_map, the .second of
|
|
|
|
* the %pair is assigned from __obj.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
template <typename _Obj>
|
|
|
|
pair<iterator, bool>
|
|
|
|
insert_or_assign(const key_type& __k, _Obj&& __obj)
|
|
|
|
{
|
|
|
|
iterator __i = find(__k);
|
|
|
|
if (__i == end())
|
|
|
|
{
|
|
|
|
__i = emplace(std::piecewise_construct,
|
|
|
|
std::forward_as_tuple(__k),
|
|
|
|
std::forward_as_tuple(std::forward<_Obj>(__obj)))
|
|
|
|
.first;
|
|
|
|
return {__i, true};
|
|
|
|
}
|
|
|
|
(*__i).second = std::forward<_Obj>(__obj);
|
|
|
|
return {__i, false};
|
|
|
|
}
|
|
|
|
|
|
|
|
// move-capable overload
|
|
|
|
template <typename _Obj>
|
|
|
|
pair<iterator, bool>
|
|
|
|
insert_or_assign(key_type&& __k, _Obj&& __obj)
|
|
|
|
{
|
|
|
|
iterator __i = find(__k);
|
|
|
|
if (__i == end())
|
|
|
|
{
|
|
|
|
__i = emplace(std::piecewise_construct,
|
|
|
|
std::forward_as_tuple(std::move(__k)),
|
|
|
|
std::forward_as_tuple(std::forward<_Obj>(__obj)))
|
|
|
|
.first;
|
|
|
|
return {__i, true};
|
|
|
|
}
|
|
|
|
(*__i).second = std::forward<_Obj>(__obj);
|
|
|
|
return {__i, false};
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Attempts to insert a std::pair into the %unordered_map.
|
|
|
|
* @param __hint An iterator that serves as a hint as to where the
|
|
|
|
* pair should be inserted.
|
|
|
|
* @param __k Key to use for finding a possibly existing pair in
|
|
|
|
* the unordered_map.
|
|
|
|
* @param __obj Argument used to generate the .second for a pair
|
|
|
|
* instance.
|
|
|
|
* @return An iterator that points to the element with key of
|
|
|
|
* @a __x (may or may not be the %pair passed in).
|
|
|
|
*
|
|
|
|
* This function is not concerned about whether the insertion took place,
|
|
|
|
* and thus does not return a boolean like the single-argument insert()
|
|
|
|
* does.
|
|
|
|
* If the %pair was already in the %unordered map, the .second of
|
|
|
|
* the %pair is assigned from __obj.
|
|
|
|
* Note that the first parameter is only a hint and can
|
|
|
|
* potentially improve the performance of the insertion process. A bad
|
|
|
|
* hint would cause no gains in efficiency.
|
|
|
|
*
|
|
|
|
* See
|
|
|
|
* https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
|
|
|
|
* for more on @a hinting.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
template <typename _Obj>
|
|
|
|
iterator
|
|
|
|
insert_or_assign(const_iterator __hint, const key_type& __k,
|
|
|
|
_Obj&& __obj)
|
|
|
|
{
|
|
|
|
iterator __i = find(__k);
|
|
|
|
if (__i == end())
|
|
|
|
{
|
|
|
|
return emplace_hint(__hint, std::piecewise_construct,
|
|
|
|
std::forward_as_tuple(__k),
|
|
|
|
std::forward_as_tuple(
|
|
|
|
std::forward<_Obj>(__obj)));
|
|
|
|
}
|
|
|
|
(*__i).second = std::forward<_Obj>(__obj);
|
|
|
|
return __i;
|
|
|
|
}
|
|
|
|
|
|
|
|
// move-capable overload
|
|
|
|
template <typename _Obj>
|
|
|
|
iterator
|
|
|
|
insert_or_assign(const_iterator __hint, key_type&& __k, _Obj&& __obj)
|
|
|
|
{
|
|
|
|
iterator __i = find(__k);
|
|
|
|
if (__i == end())
|
|
|
|
{
|
|
|
|
return emplace_hint(__hint, std::piecewise_construct,
|
|
|
|
std::forward_as_tuple(std::move(__k)),
|
|
|
|
std::forward_as_tuple(
|
|
|
|
std::forward<_Obj>(__obj)));
|
|
|
|
}
|
|
|
|
(*__i).second = std::forward<_Obj>(__obj);
|
|
|
|
return __i;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Erases an element from an %unordered_map.
|
|
|
|
* @param __position An iterator pointing to the element to be erased.
|
|
|
|
* @return An iterator pointing to the element immediately following
|
|
|
|
* @a __position prior to the element being erased. If no such
|
|
|
|
* element exists, end() is returned.
|
|
|
|
*
|
|
|
|
* This function erases an element, pointed to by the given iterator,
|
|
|
|
* from an %unordered_map.
|
|
|
|
* Note that this function only erases the element, and that if the
|
|
|
|
* element is itself a pointer, the pointed-to memory is not touched in
|
|
|
|
* any way. Managing the pointer is the user's responsibility.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
erase(const_iterator __position)
|
|
|
|
{ return _M_h.erase(__position); }
|
|
|
|
|
|
|
|
// LWG 2059.
|
|
|
|
iterator
|
2014-06-14 18:33:53 +02:00
|
|
|
erase(iterator __position)
|
|
|
|
{ return _M_h.erase(__position); }
|
2012-10-27 14:20:18 +02:00
|
|
|
//@}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Erases elements according to the provided key.
|
|
|
|
* @param __x Key of element to be erased.
|
|
|
|
* @return The number of elements erased.
|
|
|
|
*
|
|
|
|
* This function erases all the elements located by the given key from
|
|
|
|
* an %unordered_map. For an %unordered_map the result of this function
|
|
|
|
* can only be 0 (not present) or 1 (present).
|
|
|
|
* Note that this function only erases the element, and that if the
|
|
|
|
* element is itself a pointer, the pointed-to memory is not touched in
|
|
|
|
* any way. Managing the pointer is the user's responsibility.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
erase(const key_type& __x)
|
|
|
|
{ return _M_h.erase(__x); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Erases a [__first,__last) range of elements from an
|
|
|
|
* %unordered_map.
|
|
|
|
* @param __first Iterator pointing to the start of the range to be
|
|
|
|
* erased.
|
|
|
|
* @param __last Iterator pointing to the end of the range to
|
|
|
|
* be erased.
|
|
|
|
* @return The iterator @a __last.
|
|
|
|
*
|
|
|
|
* This function erases a sequence of elements from an %unordered_map.
|
|
|
|
* Note that this function only erases the elements, and that if
|
|
|
|
* the element is itself a pointer, the pointed-to memory is not touched
|
|
|
|
* in any way. Managing the pointer is the user's responsibility.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
erase(const_iterator __first, const_iterator __last)
|
|
|
|
{ return _M_h.erase(__first, __last); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Erases all elements in an %unordered_map.
|
|
|
|
* Note that this function only erases the elements, and that if the
|
|
|
|
* elements themselves are pointers, the pointed-to memory is not touched
|
|
|
|
* in any way. Managing the pointer is the user's responsibility.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
clear() noexcept
|
|
|
|
{ _M_h.clear(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Swaps data with another %unordered_map.
|
|
|
|
* @param __x An %unordered_map of the same element and allocator
|
|
|
|
* types.
|
|
|
|
*
|
2015-05-17 22:14:53 +02:00
|
|
|
* This exchanges the elements between two %unordered_map in constant
|
|
|
|
* time.
|
2012-10-27 14:20:18 +02:00
|
|
|
* Note that the global std::swap() function is specialized such that
|
|
|
|
* std::swap(m1,m2) will feed to this function.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
swap(unordered_map& __x)
|
2013-04-22 22:22:07 +02:00
|
|
|
noexcept( noexcept(_M_h.swap(__x._M_h)) )
|
2012-10-27 14:20:18 +02:00
|
|
|
{ _M_h.swap(__x._M_h); }
|
|
|
|
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
#if __cplusplus > 201402L
|
|
|
|
template<typename, typename, typename>
|
2018-03-20 22:45:14 +01:00
|
|
|
friend class std::_Hash_merge_helper;
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
|
|
|
|
template<typename _H2, typename _P2>
|
|
|
|
void
|
|
|
|
merge(unordered_map<_Key, _Tp, _H2, _P2, _Alloc>& __source)
|
|
|
|
{
|
|
|
|
using _Merge_helper = _Hash_merge_helper<unordered_map, _H2, _P2>;
|
|
|
|
_M_h._M_merge_unique(_Merge_helper::_S_get_table(__source));
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _H2, typename _P2>
|
|
|
|
void
|
|
|
|
merge(unordered_map<_Key, _Tp, _H2, _P2, _Alloc>&& __source)
|
|
|
|
{ merge(__source); }
|
|
|
|
|
|
|
|
template<typename _H2, typename _P2>
|
|
|
|
void
|
|
|
|
merge(unordered_multimap<_Key, _Tp, _H2, _P2, _Alloc>& __source)
|
|
|
|
{
|
|
|
|
using _Merge_helper = _Hash_merge_helper<unordered_map, _H2, _P2>;
|
|
|
|
_M_h._M_merge_unique(_Merge_helper::_S_get_table(__source));
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _H2, typename _P2>
|
|
|
|
void
|
|
|
|
merge(unordered_multimap<_Key, _Tp, _H2, _P2, _Alloc>&& __source)
|
|
|
|
{ merge(__source); }
|
|
|
|
#endif // C++17
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
// observers.
|
|
|
|
|
|
|
|
/// Returns the hash functor object with which the %unordered_map was
|
|
|
|
/// constructed.
|
|
|
|
hasher
|
|
|
|
hash_function() const
|
|
|
|
{ return _M_h.hash_function(); }
|
|
|
|
|
|
|
|
/// Returns the key comparison object with which the %unordered_map was
|
|
|
|
/// constructed.
|
|
|
|
key_equal
|
|
|
|
key_eq() const
|
|
|
|
{ return _M_h.key_eq(); }
|
|
|
|
|
|
|
|
// lookup.
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Tries to locate an element in an %unordered_map.
|
|
|
|
* @param __x Key to be located.
|
|
|
|
* @return Iterator pointing to sought-after element, or end() if not
|
|
|
|
* found.
|
|
|
|
*
|
|
|
|
* This function takes a key and tries to locate the element with which
|
|
|
|
* the key matches. If successful the function returns an iterator
|
|
|
|
* pointing to the sought after element. If unsuccessful it returns the
|
|
|
|
* past-the-end ( @c end() ) iterator.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
find(const key_type& __x)
|
|
|
|
{ return _M_h.find(__x); }
|
|
|
|
|
|
|
|
const_iterator
|
|
|
|
find(const key_type& __x) const
|
|
|
|
{ return _M_h.find(__x); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Finds the number of elements.
|
|
|
|
* @param __x Key to count.
|
|
|
|
* @return Number of elements with specified key.
|
|
|
|
*
|
|
|
|
* This function only makes sense for %unordered_multimap; for
|
|
|
|
* %unordered_map the result will either be 0 (not present) or 1
|
|
|
|
* (present).
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
count(const key_type& __x) const
|
|
|
|
{ return _M_h.count(__x); }
|
|
|
|
|
2018-07-04 20:16:26 +02:00
|
|
|
#if __cplusplus > 201703L
|
|
|
|
/**
|
|
|
|
* @brief Finds whether an element with the given key exists.
|
|
|
|
* @param __x Key of elements to be located.
|
|
|
|
* @return True if there is any element with the specified key.
|
|
|
|
*/
|
|
|
|
bool
|
|
|
|
contains(const key_type& __x) const
|
|
|
|
{ return _M_h.find(__x) != _M_h.end(); }
|
|
|
|
#endif
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Finds a subsequence matching given key.
|
|
|
|
* @param __x Key to be located.
|
|
|
|
* @return Pair of iterators that possibly points to the subsequence
|
|
|
|
* matching given key.
|
|
|
|
*
|
|
|
|
* This function probably only makes sense for %unordered_multimap.
|
|
|
|
*/
|
|
|
|
std::pair<iterator, iterator>
|
|
|
|
equal_range(const key_type& __x)
|
|
|
|
{ return _M_h.equal_range(__x); }
|
|
|
|
|
|
|
|
std::pair<const_iterator, const_iterator>
|
|
|
|
equal_range(const key_type& __x) const
|
|
|
|
{ return _M_h.equal_range(__x); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Subscript ( @c [] ) access to %unordered_map data.
|
|
|
|
* @param __k The key for which data should be retrieved.
|
|
|
|
* @return A reference to the data of the (key,data) %pair.
|
|
|
|
*
|
|
|
|
* Allows for easy lookup with the subscript ( @c [] )operator. Returns
|
|
|
|
* data associated with the key specified in subscript. If the key does
|
|
|
|
* not exist, a pair with that key is created using default values, which
|
|
|
|
* is then returned.
|
|
|
|
*
|
|
|
|
* Lookup requires constant time.
|
|
|
|
*/
|
|
|
|
mapped_type&
|
|
|
|
operator[](const key_type& __k)
|
|
|
|
{ return _M_h[__k]; }
|
|
|
|
|
|
|
|
mapped_type&
|
|
|
|
operator[](key_type&& __k)
|
|
|
|
{ return _M_h[std::move(__k)]; }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Access to %unordered_map data.
|
|
|
|
* @param __k The key for which data should be retrieved.
|
|
|
|
* @return A reference to the data whose key is equal to @a __k, if
|
|
|
|
* such a data is present in the %unordered_map.
|
|
|
|
* @throw std::out_of_range If no such data is present.
|
|
|
|
*/
|
|
|
|
mapped_type&
|
|
|
|
at(const key_type& __k)
|
|
|
|
{ return _M_h.at(__k); }
|
|
|
|
|
|
|
|
const mapped_type&
|
|
|
|
at(const key_type& __k) const
|
|
|
|
{ return _M_h.at(__k); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
// bucket interface.
|
|
|
|
|
|
|
|
/// Returns the number of buckets of the %unordered_map.
|
|
|
|
size_type
|
|
|
|
bucket_count() const noexcept
|
|
|
|
{ return _M_h.bucket_count(); }
|
|
|
|
|
|
|
|
/// Returns the maximum number of buckets of the %unordered_map.
|
|
|
|
size_type
|
|
|
|
max_bucket_count() const noexcept
|
|
|
|
{ return _M_h.max_bucket_count(); }
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @brief Returns the number of elements in a given bucket.
|
|
|
|
* @param __n A bucket index.
|
|
|
|
* @return The number of elements in the bucket.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
bucket_size(size_type __n) const
|
|
|
|
{ return _M_h.bucket_size(__n); }
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @brief Returns the bucket index of a given element.
|
|
|
|
* @param __key A key instance.
|
|
|
|
* @return The key bucket index.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
bucket(const key_type& __key) const
|
|
|
|
{ return _M_h.bucket(__key); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Returns a read/write iterator pointing to the first bucket
|
|
|
|
* element.
|
|
|
|
* @param __n The bucket index.
|
|
|
|
* @return A read/write local iterator.
|
|
|
|
*/
|
|
|
|
local_iterator
|
|
|
|
begin(size_type __n)
|
|
|
|
{ return _M_h.begin(__n); }
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Returns a read-only (constant) iterator pointing to the first
|
|
|
|
* bucket element.
|
|
|
|
* @param __n The bucket index.
|
|
|
|
* @return A read-only local iterator.
|
|
|
|
*/
|
|
|
|
const_local_iterator
|
|
|
|
begin(size_type __n) const
|
|
|
|
{ return _M_h.begin(__n); }
|
|
|
|
|
|
|
|
const_local_iterator
|
|
|
|
cbegin(size_type __n) const
|
|
|
|
{ return _M_h.cbegin(__n); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Returns a read/write iterator pointing to one past the last
|
|
|
|
* bucket elements.
|
|
|
|
* @param __n The bucket index.
|
|
|
|
* @return A read/write local iterator.
|
|
|
|
*/
|
|
|
|
local_iterator
|
|
|
|
end(size_type __n)
|
|
|
|
{ return _M_h.end(__n); }
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Returns a read-only (constant) iterator pointing to one past
|
|
|
|
* the last bucket elements.
|
|
|
|
* @param __n The bucket index.
|
|
|
|
* @return A read-only local iterator.
|
|
|
|
*/
|
|
|
|
const_local_iterator
|
|
|
|
end(size_type __n) const
|
|
|
|
{ return _M_h.end(__n); }
|
|
|
|
|
|
|
|
const_local_iterator
|
|
|
|
cend(size_type __n) const
|
|
|
|
{ return _M_h.cend(__n); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
// hash policy.
|
|
|
|
|
|
|
|
/// Returns the average number of elements per bucket.
|
|
|
|
float
|
|
|
|
load_factor() const noexcept
|
|
|
|
{ return _M_h.load_factor(); }
|
|
|
|
|
|
|
|
/// Returns a positive number that the %unordered_map tries to keep the
|
|
|
|
/// load factor less than or equal to.
|
|
|
|
float
|
|
|
|
max_load_factor() const noexcept
|
|
|
|
{ return _M_h.max_load_factor(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Change the %unordered_map maximum load factor.
|
|
|
|
* @param __z The new maximum load factor.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
max_load_factor(float __z)
|
|
|
|
{ _M_h.max_load_factor(__z); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief May rehash the %unordered_map.
|
|
|
|
* @param __n The new number of buckets.
|
|
|
|
*
|
|
|
|
* Rehash will occur only if the new number of buckets respect the
|
|
|
|
* %unordered_map maximum load factor.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
rehash(size_type __n)
|
|
|
|
{ _M_h.rehash(__n); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Prepare the %unordered_map for a specified number of
|
|
|
|
* elements.
|
|
|
|
* @param __n Number of elements required.
|
|
|
|
*
|
|
|
|
* Same as rehash(ceil(n / max_load_factor())).
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
reserve(size_type __n)
|
|
|
|
{ _M_h.reserve(__n); }
|
|
|
|
|
|
|
|
template<typename _Key1, typename _Tp1, typename _Hash1, typename _Pred1,
|
|
|
|
typename _Alloc1>
|
|
|
|
friend bool
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
operator==(const unordered_map<_Key1, _Tp1, _Hash1, _Pred1, _Alloc1>&,
|
|
|
|
const unordered_map<_Key1, _Tp1, _Hash1, _Pred1, _Alloc1>&);
|
2010-02-10 17:09:42 +01:00
|
|
|
};
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
|
2017-10-26 18:42:31 +02:00
|
|
|
#if __cpp_deduction_guides >= 201606
|
|
|
|
|
|
|
|
template<typename _InputIterator,
|
|
|
|
typename _Hash = hash<__iter_key_t<_InputIterator>>,
|
|
|
|
typename _Pred = equal_to<__iter_key_t<_InputIterator>>,
|
|
|
|
typename _Allocator = allocator<__iter_to_alloc_t<_InputIterator>>,
|
|
|
|
typename = _RequireInputIter<_InputIterator>,
|
2019-02-27 00:12:44 +01:00
|
|
|
typename = _RequireNotAllocatorOrIntegral<_Hash>,
|
|
|
|
typename = _RequireNotAllocator<_Pred>,
|
2017-10-26 18:42:31 +02:00
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_map(_InputIterator, _InputIterator,
|
|
|
|
typename unordered_map<int, int>::size_type = {},
|
|
|
|
_Hash = _Hash(), _Pred = _Pred(), _Allocator = _Allocator())
|
|
|
|
-> unordered_map<__iter_key_t<_InputIterator>,
|
|
|
|
__iter_val_t<_InputIterator>,
|
|
|
|
_Hash, _Pred, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _Key, typename _Tp, typename _Hash = hash<_Key>,
|
|
|
|
typename _Pred = equal_to<_Key>,
|
|
|
|
typename _Allocator = allocator<pair<const _Key, _Tp>>,
|
2019-02-27 00:12:44 +01:00
|
|
|
typename = _RequireNotAllocatorOrIntegral<_Hash>,
|
|
|
|
typename = _RequireNotAllocator<_Pred>,
|
2017-10-26 18:42:31 +02:00
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_map(initializer_list<pair<_Key, _Tp>>,
|
|
|
|
typename unordered_map<int, int>::size_type = {},
|
|
|
|
_Hash = _Hash(), _Pred = _Pred(), _Allocator = _Allocator())
|
|
|
|
-> unordered_map<_Key, _Tp, _Hash, _Pred, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _InputIterator, typename _Allocator,
|
|
|
|
typename = _RequireInputIter<_InputIterator>,
|
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_map(_InputIterator, _InputIterator,
|
|
|
|
typename unordered_map<int, int>::size_type, _Allocator)
|
|
|
|
-> unordered_map<__iter_key_t<_InputIterator>,
|
|
|
|
__iter_val_t<_InputIterator>,
|
|
|
|
hash<__iter_key_t<_InputIterator>>,
|
|
|
|
equal_to<__iter_key_t<_InputIterator>>,
|
|
|
|
_Allocator>;
|
|
|
|
|
|
|
|
template<typename _InputIterator, typename _Allocator,
|
|
|
|
typename = _RequireInputIter<_InputIterator>,
|
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_map(_InputIterator, _InputIterator, _Allocator)
|
|
|
|
-> unordered_map<__iter_key_t<_InputIterator>,
|
|
|
|
__iter_val_t<_InputIterator>,
|
|
|
|
hash<__iter_key_t<_InputIterator>>,
|
|
|
|
equal_to<__iter_key_t<_InputIterator>>,
|
|
|
|
_Allocator>;
|
|
|
|
|
|
|
|
template<typename _InputIterator, typename _Hash, typename _Allocator,
|
|
|
|
typename = _RequireInputIter<_InputIterator>,
|
2019-02-27 00:12:44 +01:00
|
|
|
typename = _RequireNotAllocatorOrIntegral<_Hash>,
|
2017-10-26 18:42:31 +02:00
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_map(_InputIterator, _InputIterator,
|
|
|
|
typename unordered_map<int, int>::size_type,
|
|
|
|
_Hash, _Allocator)
|
|
|
|
-> unordered_map<__iter_key_t<_InputIterator>,
|
|
|
|
__iter_val_t<_InputIterator>, _Hash,
|
|
|
|
equal_to<__iter_key_t<_InputIterator>>, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _Key, typename _Tp, typename _Allocator,
|
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_map(initializer_list<pair<_Key, _Tp>>,
|
|
|
|
typename unordered_map<int, int>::size_type,
|
|
|
|
_Allocator)
|
|
|
|
-> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _Key, typename _Tp, typename _Allocator,
|
2017-11-27 17:43:39 +01:00
|
|
|
typename = _RequireAllocator<_Allocator>>
|
2017-10-26 18:42:31 +02:00
|
|
|
unordered_map(initializer_list<pair<_Key, _Tp>>, _Allocator)
|
|
|
|
-> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _Key, typename _Tp, typename _Hash, typename _Allocator,
|
2019-02-27 00:12:44 +01:00
|
|
|
typename = _RequireNotAllocatorOrIntegral<_Hash>,
|
2017-10-26 18:42:31 +02:00
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_map(initializer_list<pair<_Key, _Tp>>,
|
|
|
|
typename unordered_map<int, int>::size_type,
|
|
|
|
_Hash, _Allocator)
|
|
|
|
-> unordered_map<_Key, _Tp, _Hash, equal_to<_Key>, _Allocator>;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2010-02-10 17:09:42 +01:00
|
|
|
/**
|
|
|
|
* @brief A standard container composed of equivalent keys
|
|
|
|
* (possibly containing multiple of each key value) that associates
|
|
|
|
* values of another type with the keys.
|
|
|
|
*
|
|
|
|
* @ingroup unordered_associative_containers
|
|
|
|
*
|
2013-04-25 11:42:46 +02:00
|
|
|
* @tparam _Key Type of key objects.
|
|
|
|
* @tparam _Tp Type of mapped objects.
|
|
|
|
* @tparam _Hash Hashing function object type, defaults to hash<_Value>.
|
|
|
|
* @tparam _Pred Predicate function object type, defaults
|
|
|
|
* to equal_to<_Value>.
|
|
|
|
* @tparam _Alloc Allocator type, defaults to
|
|
|
|
* std::allocator<std::pair<const _Key, _Tp>>.
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
*
|
2012-05-03 00:25:28 +02:00
|
|
|
* Meets the requirements of a <a href="tables.html#65">container</a>, and
|
|
|
|
* <a href="tables.html#xx">unordered associative container</a>
|
|
|
|
*
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
* The resulting value type of the container is std::pair<const _Key, _Tp>.
|
2010-02-10 17:09:42 +01:00
|
|
|
*
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
* Base is _Hashtable, dispatched at compile time via template
|
|
|
|
* alias __ummap_hashtable.
|
2010-02-10 17:09:42 +01:00
|
|
|
*/
|
2017-11-21 21:47:09 +01:00
|
|
|
template<typename _Key, typename _Tp,
|
|
|
|
typename _Hash = hash<_Key>,
|
|
|
|
typename _Pred = equal_to<_Key>,
|
|
|
|
typename _Alloc = allocator<std::pair<const _Key, _Tp>>>
|
2013-11-14 13:43:00 +01:00
|
|
|
class unordered_multimap
|
2010-02-10 17:09:42 +01:00
|
|
|
{
|
2012-10-27 14:20:18 +02:00
|
|
|
typedef __ummap_hashtable<_Key, _Tp, _Hash, _Pred, _Alloc> _Hashtable;
|
|
|
|
_Hashtable _M_h;
|
2010-02-10 17:09:42 +01:00
|
|
|
|
|
|
|
public:
|
2012-10-27 14:20:18 +02:00
|
|
|
// typedefs:
|
|
|
|
//@{
|
|
|
|
/// Public typedefs.
|
|
|
|
typedef typename _Hashtable::key_type key_type;
|
|
|
|
typedef typename _Hashtable::value_type value_type;
|
|
|
|
typedef typename _Hashtable::mapped_type mapped_type;
|
|
|
|
typedef typename _Hashtable::hasher hasher;
|
|
|
|
typedef typename _Hashtable::key_equal key_equal;
|
|
|
|
typedef typename _Hashtable::allocator_type allocator_type;
|
|
|
|
//@}
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/// Iterator-related typedefs.
|
2013-04-22 22:22:07 +02:00
|
|
|
typedef typename _Hashtable::pointer pointer;
|
|
|
|
typedef typename _Hashtable::const_pointer const_pointer;
|
|
|
|
typedef typename _Hashtable::reference reference;
|
|
|
|
typedef typename _Hashtable::const_reference const_reference;
|
2012-10-27 14:20:18 +02:00
|
|
|
typedef typename _Hashtable::iterator iterator;
|
|
|
|
typedef typename _Hashtable::const_iterator const_iterator;
|
|
|
|
typedef typename _Hashtable::local_iterator local_iterator;
|
|
|
|
typedef typename _Hashtable::const_local_iterator const_local_iterator;
|
|
|
|
typedef typename _Hashtable::size_type size_type;
|
|
|
|
typedef typename _Hashtable::difference_type difference_type;
|
|
|
|
//@}
|
|
|
|
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
#if __cplusplus > 201402L
|
|
|
|
using node_type = typename _Hashtable::node_type;
|
|
|
|
#endif
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
//construct/destroy/copy
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
|
2014-09-06 09:38:48 +02:00
|
|
|
/// Default constructor.
|
|
|
|
unordered_multimap() = default;
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Default constructor creates no elements.
|
2014-09-06 09:38:48 +02:00
|
|
|
* @param __n Mnimal initial number of buckets.
|
2012-10-27 14:20:18 +02:00
|
|
|
* @param __hf A hash functor.
|
|
|
|
* @param __eql A key equality functor.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*/
|
2010-02-10 17:09:42 +01:00
|
|
|
explicit
|
2014-09-06 09:38:48 +02:00
|
|
|
unordered_multimap(size_type __n,
|
2010-02-10 17:09:42 +01:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
2012-10-27 14:20:18 +02:00
|
|
|
: _M_h(__n, __hf, __eql, __a)
|
2010-02-10 17:09:42 +01:00
|
|
|
{ }
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Builds an %unordered_multimap from a range.
|
2014-06-14 18:33:53 +02:00
|
|
|
* @param __first An input iterator.
|
2012-10-27 14:20:18 +02:00
|
|
|
* @param __last An input iterator.
|
2014-06-14 18:33:53 +02:00
|
|
|
* @param __n Minimal initial number of buckets.
|
|
|
|
* @param __hf A hash functor.
|
|
|
|
* @param __eql A key equality functor.
|
|
|
|
* @param __a An allocator object.
|
2012-10-27 14:20:18 +02:00
|
|
|
*
|
|
|
|
* Create an %unordered_multimap consisting of copies of the elements
|
|
|
|
* from [__first,__last). This is linear in N (where N is
|
|
|
|
* distance(__first,__last)).
|
|
|
|
*/
|
2010-02-10 17:09:42 +01:00
|
|
|
template<typename _InputIterator>
|
2014-06-14 18:33:53 +02:00
|
|
|
unordered_multimap(_InputIterator __first, _InputIterator __last,
|
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,
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
2010-02-10 17:09:42 +01:00
|
|
|
const allocator_type& __a = allocator_type())
|
2014-06-14 18:33:53 +02:00
|
|
|
: _M_h(__first, __last, __n, __hf, __eql, __a)
|
unordered_map.h (__unordered_map): Remove.
2012-04-12 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/unordered_map.h (__unordered_map): Remove.
(__unordered_multimap): Remove.
Add aliases for __umap_traits, __umap_hashtable, __ummap_traits,
__ummap_hashtable.
(unordered_map): Derive from __umap_hashtable.
(unordered_multimap): Derive from __ummap_hashtable.
* include/bits/unordered_set.h (__unordered_set): Remove.
(__unordered_multiset): Remove.
Add aliases for __uset_traits, __uset_hashtable, __umset_traits,
__umset_hashtable.
(unordered_set): Derive from __uset_hashtable.
(unordered_multiset): Derive from __umset_hashtable.
* include/bits/hashtable.h (__cache_default): New, consolidated
cache defaults for _Hashtable. Adjust comments for doxygen.
(_Hashtable): Consolidate bool template parameters into new,
_Traits class. Inherited base classes synthesize _Hashtable in
CRTP via original 10 parameters. Prefer using declarations to
typedefs, add __node_type, __bucket_type, etc. Push many nested
types down hierarchy to _Hashtable_base. Add constructors
necessary for top-level unordered_containers. Consolidate insert
member functions and logic in new base class, __detail::_Insert
and __detail::_Insert_base.
(_Hashtable::operator=(initializer_list)): Add.
* include/bits/hashtable_policy.h: Convert to doxygen markup.
(_Hashtable_traits) New. Consolidate bool template parameters here.
(_Insert, _Insert_base): New, consolidated insert member functions.
(_Map_base, _Equality, _Rehash_base): Adjust template parameters,
use base types.
(_Hashtable_base): Move type declarations useful to other base
classes into this class.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc:
Adjust traits, line numbers.
From-SVN: r186403
2012-04-13 02:33:10 +02:00
|
|
|
{ }
|
2010-02-10 17:09:42 +01:00
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
/// Copy constructor.
|
|
|
|
unordered_multimap(const unordered_multimap&) = default;
|
|
|
|
|
2013-01-06 22:58:18 +01:00
|
|
|
/// Move constructor.
|
2012-10-27 14:20:18 +02:00
|
|
|
unordered_multimap(unordered_multimap&&) = default;
|
|
|
|
|
2013-04-22 22:22:07 +02:00
|
|
|
/**
|
|
|
|
* @brief Creates an %unordered_multimap with no elements.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*/
|
|
|
|
explicit
|
|
|
|
unordered_multimap(const allocator_type& __a)
|
2015-05-17 22:14:53 +02:00
|
|
|
: _M_h(__a)
|
2013-04-22 22:22:07 +02:00
|
|
|
{ }
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @brief Copy constructor with allocator argument.
|
|
|
|
* @param __uset Input %unordered_multimap to copy.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*/
|
|
|
|
unordered_multimap(const unordered_multimap& __ummap,
|
|
|
|
const allocator_type& __a)
|
2015-05-17 22:14:53 +02:00
|
|
|
: _M_h(__ummap._M_h, __a)
|
2013-04-22 22:22:07 +02:00
|
|
|
{ }
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @brief Move constructor with allocator argument.
|
|
|
|
* @param __uset Input %unordered_multimap to move.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*/
|
|
|
|
unordered_multimap(unordered_multimap&& __ummap,
|
|
|
|
const allocator_type& __a)
|
2015-05-17 22:14:53 +02:00
|
|
|
: _M_h(std::move(__ummap._M_h), __a)
|
2013-04-22 22:22:07 +02:00
|
|
|
{ }
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
/**
|
|
|
|
* @brief Builds an %unordered_multimap from an initializer_list.
|
|
|
|
* @param __l An initializer_list.
|
|
|
|
* @param __n Minimal initial number of buckets.
|
|
|
|
* @param __hf A hash functor.
|
|
|
|
* @param __eql A key equality functor.
|
|
|
|
* @param __a An allocator object.
|
|
|
|
*
|
|
|
|
* Create an %unordered_multimap consisting of copies of the elements in
|
|
|
|
* the list. This is linear in N (where N is @a __l.size()).
|
|
|
|
*/
|
2010-02-10 17:09:42 +01:00
|
|
|
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,
|
2010-02-10 17:09:42 +01:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
2015-05-17 22:14:53 +02:00
|
|
|
: _M_h(__l, __n, __hf, __eql, __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
unordered_multimap(size_type __n, const allocator_type& __a)
|
|
|
|
: unordered_multimap(__n, hasher(), key_equal(), __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
unordered_multimap(size_type __n, const hasher& __hf,
|
|
|
|
const allocator_type& __a)
|
|
|
|
: unordered_multimap(__n, __hf, key_equal(), __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
template<typename _InputIterator>
|
|
|
|
unordered_multimap(_InputIterator __first, _InputIterator __last,
|
|
|
|
size_type __n,
|
|
|
|
const allocator_type& __a)
|
|
|
|
: unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
template<typename _InputIterator>
|
|
|
|
unordered_multimap(_InputIterator __first, _InputIterator __last,
|
|
|
|
size_type __n, const hasher& __hf,
|
|
|
|
const allocator_type& __a)
|
|
|
|
: unordered_multimap(__first, __last, __n, __hf, key_equal(), __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
unordered_multimap(initializer_list<value_type> __l,
|
|
|
|
size_type __n,
|
|
|
|
const allocator_type& __a)
|
|
|
|
: unordered_multimap(__l, __n, hasher(), key_equal(), __a)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
unordered_multimap(initializer_list<value_type> __l,
|
|
|
|
size_type __n, const hasher& __hf,
|
|
|
|
const allocator_type& __a)
|
|
|
|
: unordered_multimap(__l, __n, __hf, key_equal(), __a)
|
2010-02-10 17:09:42 +01:00
|
|
|
{ }
|
2012-10-27 14:20:18 +02:00
|
|
|
|
|
|
|
/// Copy assignment operator.
|
|
|
|
unordered_multimap&
|
|
|
|
operator=(const unordered_multimap&) = default;
|
|
|
|
|
|
|
|
/// Move assignment operator.
|
|
|
|
unordered_multimap&
|
|
|
|
operator=(unordered_multimap&&) = default;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief %Unordered_multimap list assignment operator.
|
|
|
|
* @param __l An initializer_list.
|
|
|
|
*
|
2016-07-14 12:02:10 +02:00
|
|
|
* This function fills an %unordered_multimap with copies of the
|
|
|
|
* elements in the initializer list @a __l.
|
2012-10-27 14:20:18 +02:00
|
|
|
*
|
|
|
|
* Note that the assignment completely changes the %unordered_multimap
|
|
|
|
* and that the resulting %unordered_multimap's size is the same as the
|
2016-07-14 12:02:10 +02:00
|
|
|
* number of elements assigned.
|
2012-10-27 14:20:18 +02:00
|
|
|
*/
|
|
|
|
unordered_multimap&
|
|
|
|
operator=(initializer_list<value_type> __l)
|
|
|
|
{
|
|
|
|
_M_h = __l;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2016-07-14 12:02:10 +02:00
|
|
|
/// Returns the allocator object used by the %unordered_multimap.
|
2012-10-27 14:20:18 +02:00
|
|
|
allocator_type
|
|
|
|
get_allocator() const noexcept
|
|
|
|
{ return _M_h.get_allocator(); }
|
|
|
|
|
|
|
|
// size and capacity:
|
|
|
|
|
|
|
|
/// Returns true if the %unordered_multimap is empty.
|
2019-01-21 12:47:30 +01:00
|
|
|
_GLIBCXX_NODISCARD bool
|
2012-10-27 14:20:18 +02:00
|
|
|
empty() const noexcept
|
|
|
|
{ return _M_h.empty(); }
|
|
|
|
|
|
|
|
/// Returns the size of the %unordered_multimap.
|
|
|
|
size_type
|
|
|
|
size() const noexcept
|
|
|
|
{ return _M_h.size(); }
|
|
|
|
|
|
|
|
/// Returns the maximum size of the %unordered_multimap.
|
|
|
|
size_type
|
|
|
|
max_size() const noexcept
|
|
|
|
{ return _M_h.max_size(); }
|
|
|
|
|
|
|
|
// iterators.
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write iterator that points to the first element in the
|
|
|
|
* %unordered_multimap.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
begin() noexcept
|
|
|
|
{ return _M_h.begin(); }
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points to the first
|
|
|
|
* element in the %unordered_multimap.
|
|
|
|
*/
|
|
|
|
const_iterator
|
|
|
|
begin() const noexcept
|
|
|
|
{ return _M_h.begin(); }
|
|
|
|
|
|
|
|
const_iterator
|
|
|
|
cbegin() const noexcept
|
|
|
|
{ return _M_h.begin(); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a read/write iterator that points one past the last element in
|
|
|
|
* the %unordered_multimap.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
end() noexcept
|
|
|
|
{ return _M_h.end(); }
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* Returns a read-only (constant) iterator that points one past the last
|
|
|
|
* element in the %unordered_multimap.
|
|
|
|
*/
|
|
|
|
const_iterator
|
|
|
|
end() const noexcept
|
|
|
|
{ return _M_h.end(); }
|
|
|
|
|
|
|
|
const_iterator
|
|
|
|
cend() const noexcept
|
|
|
|
{ return _M_h.end(); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
// modifiers.
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Attempts to build and insert a std::pair into the
|
|
|
|
* %unordered_multimap.
|
|
|
|
*
|
|
|
|
* @param __args Arguments used to generate a new pair instance (see
|
|
|
|
* std::piecewise_contruct for passing arguments to each
|
|
|
|
* part of the pair constructor).
|
|
|
|
*
|
|
|
|
* @return An iterator that points to the inserted pair.
|
|
|
|
*
|
|
|
|
* This function attempts to build and insert a (key, value) %pair into
|
|
|
|
* the %unordered_multimap.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
template<typename... _Args>
|
|
|
|
iterator
|
|
|
|
emplace(_Args&&... __args)
|
|
|
|
{ return _M_h.emplace(std::forward<_Args>(__args)...); }
|
|
|
|
|
|
|
|
/**
|
2015-05-17 22:14:53 +02:00
|
|
|
* @brief Attempts to build and insert a std::pair into the
|
|
|
|
* %unordered_multimap.
|
2012-10-27 14:20:18 +02:00
|
|
|
*
|
|
|
|
* @param __pos An iterator that serves as a hint as to where the pair
|
|
|
|
* should be inserted.
|
|
|
|
* @param __args Arguments used to generate a new pair instance (see
|
|
|
|
* std::piecewise_contruct for passing arguments to each
|
|
|
|
* part of the pair constructor).
|
|
|
|
* @return An iterator that points to the element with key of the
|
|
|
|
* std::pair built from @a __args.
|
|
|
|
*
|
|
|
|
* Note that the first parameter is only a hint and can potentially
|
|
|
|
* improve the performance of the insertion process. A bad hint would
|
|
|
|
* cause no gains in efficiency.
|
|
|
|
*
|
|
|
|
* See
|
2014-06-14 22:22:10 +02:00
|
|
|
* https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
|
2012-10-27 14:20:18 +02:00
|
|
|
* for more on @a hinting.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
template<typename... _Args>
|
|
|
|
iterator
|
|
|
|
emplace_hint(const_iterator __pos, _Args&&... __args)
|
|
|
|
{ return _M_h.emplace_hint(__pos, std::forward<_Args>(__args)...); }
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Inserts a std::pair into the %unordered_multimap.
|
|
|
|
* @param __x Pair to be inserted (see std::make_pair for easy
|
|
|
|
* creation of pairs).
|
|
|
|
*
|
|
|
|
* @return An iterator that points to the inserted pair.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
insert(const value_type& __x)
|
|
|
|
{ return _M_h.insert(__x); }
|
|
|
|
|
2017-10-13 14:39:32 +02:00
|
|
|
iterator
|
|
|
|
insert(value_type&& __x)
|
|
|
|
{ return _M_h.insert(std::move(__x)); }
|
|
|
|
|
2018-09-03 16:25:12 +02:00
|
|
|
template<typename _Pair>
|
|
|
|
__enable_if_t<is_constructible<value_type, _Pair&&>::value, iterator>
|
2012-10-27 14:20:18 +02:00
|
|
|
insert(_Pair&& __x)
|
2018-09-03 16:25:12 +02:00
|
|
|
{ return _M_h.emplace(std::forward<_Pair>(__x)); }
|
2012-10-27 14:20:18 +02:00
|
|
|
//@}
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Inserts a std::pair into the %unordered_multimap.
|
|
|
|
* @param __hint An iterator that serves as a hint as to where the
|
|
|
|
* pair should be inserted.
|
|
|
|
* @param __x Pair to be inserted (see std::make_pair for easy creation
|
|
|
|
* of pairs).
|
|
|
|
* @return An iterator that points to the element with key of
|
|
|
|
* @a __x (may or may not be the %pair passed in).
|
|
|
|
*
|
|
|
|
* Note that the first parameter is only a hint and can potentially
|
|
|
|
* improve the performance of the insertion process. A bad hint would
|
|
|
|
* cause no gains in efficiency.
|
|
|
|
*
|
|
|
|
* See
|
2014-06-14 22:22:10 +02:00
|
|
|
* https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
|
2012-10-27 14:20:18 +02:00
|
|
|
* for more on @a hinting.
|
|
|
|
*
|
|
|
|
* Insertion requires amortized constant time.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
insert(const_iterator __hint, const value_type& __x)
|
|
|
|
{ return _M_h.insert(__hint, __x); }
|
|
|
|
|
2017-10-13 14:39:32 +02:00
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 2354. Unnecessary copying when inserting into maps with braced-init
|
|
|
|
iterator
|
|
|
|
insert(const_iterator __hint, value_type&& __x)
|
|
|
|
{ return _M_h.insert(__hint, std::move(__x)); }
|
|
|
|
|
2018-09-03 16:25:12 +02:00
|
|
|
template<typename _Pair>
|
|
|
|
__enable_if_t<is_constructible<value_type, _Pair&&>::value, iterator>
|
2012-10-27 14:20:18 +02:00
|
|
|
insert(const_iterator __hint, _Pair&& __x)
|
2018-09-03 16:25:12 +02:00
|
|
|
{ return _M_h.emplace_hint(__hint, std::forward<_Pair>(__x)); }
|
2012-10-27 14:20:18 +02:00
|
|
|
//@}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief A template function that attempts to insert a range of
|
|
|
|
* elements.
|
|
|
|
* @param __first Iterator pointing to the start of the range to be
|
|
|
|
* inserted.
|
|
|
|
* @param __last Iterator pointing to the end of the range.
|
|
|
|
*
|
|
|
|
* Complexity similar to that of the range constructor.
|
|
|
|
*/
|
|
|
|
template<typename _InputIterator>
|
|
|
|
void
|
|
|
|
insert(_InputIterator __first, _InputIterator __last)
|
|
|
|
{ _M_h.insert(__first, __last); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Attempts to insert a list of elements into the
|
|
|
|
* %unordered_multimap.
|
|
|
|
* @param __l A std::initializer_list<value_type> of elements
|
|
|
|
* to be inserted.
|
|
|
|
*
|
|
|
|
* Complexity similar to that of the range constructor.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
insert(initializer_list<value_type> __l)
|
|
|
|
{ _M_h.insert(__l); }
|
|
|
|
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
#if __cplusplus > 201402L
|
|
|
|
/// Extract a node.
|
|
|
|
node_type
|
|
|
|
extract(const_iterator __pos)
|
2016-09-26 12:17:48 +02:00
|
|
|
{
|
|
|
|
__glibcxx_assert(__pos != end());
|
|
|
|
return _M_h.extract(__pos);
|
|
|
|
}
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
|
|
|
|
/// Extract a node.
|
|
|
|
node_type
|
|
|
|
extract(const key_type& __key)
|
|
|
|
{ return _M_h.extract(__key); }
|
|
|
|
|
|
|
|
/// Re-insert an extracted node.
|
|
|
|
iterator
|
|
|
|
insert(node_type&& __nh)
|
|
|
|
{ return _M_h._M_reinsert_node_multi(cend(), std::move(__nh)); }
|
|
|
|
|
|
|
|
/// Re-insert an extracted node.
|
|
|
|
iterator
|
|
|
|
insert(const_iterator __hint, node_type&& __nh)
|
|
|
|
{ return _M_h._M_reinsert_node_multi(__hint, std::move(__nh)); }
|
|
|
|
#endif // C++17
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Erases an element from an %unordered_multimap.
|
|
|
|
* @param __position An iterator pointing to the element to be erased.
|
|
|
|
* @return An iterator pointing to the element immediately following
|
|
|
|
* @a __position prior to the element being erased. If no such
|
|
|
|
* element exists, end() is returned.
|
|
|
|
*
|
|
|
|
* This function erases an element, pointed to by the given iterator,
|
|
|
|
* from an %unordered_multimap.
|
|
|
|
* Note that this function only erases the element, and that if the
|
|
|
|
* element is itself a pointer, the pointed-to memory is not touched in
|
|
|
|
* any way. Managing the pointer is the user's responsibility.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
erase(const_iterator __position)
|
|
|
|
{ return _M_h.erase(__position); }
|
|
|
|
|
|
|
|
// LWG 2059.
|
|
|
|
iterator
|
2014-06-14 18:33:53 +02:00
|
|
|
erase(iterator __position)
|
|
|
|
{ return _M_h.erase(__position); }
|
2012-10-27 14:20:18 +02:00
|
|
|
//@}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Erases elements according to the provided key.
|
|
|
|
* @param __x Key of elements to be erased.
|
|
|
|
* @return The number of elements erased.
|
|
|
|
*
|
|
|
|
* This function erases all the elements located by the given key from
|
|
|
|
* an %unordered_multimap.
|
|
|
|
* Note that this function only erases the element, and that if the
|
|
|
|
* element is itself a pointer, the pointed-to memory is not touched in
|
|
|
|
* any way. Managing the pointer is the user's responsibility.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
erase(const key_type& __x)
|
|
|
|
{ return _M_h.erase(__x); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Erases a [__first,__last) range of elements from an
|
|
|
|
* %unordered_multimap.
|
|
|
|
* @param __first Iterator pointing to the start of the range to be
|
|
|
|
* erased.
|
|
|
|
* @param __last Iterator pointing to the end of the range to
|
|
|
|
* be erased.
|
|
|
|
* @return The iterator @a __last.
|
|
|
|
*
|
|
|
|
* This function erases a sequence of elements from an
|
|
|
|
* %unordered_multimap.
|
|
|
|
* Note that this function only erases the elements, and that if
|
|
|
|
* the element is itself a pointer, the pointed-to memory is not touched
|
|
|
|
* in any way. Managing the pointer is the user's responsibility.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
erase(const_iterator __first, const_iterator __last)
|
|
|
|
{ return _M_h.erase(__first, __last); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Erases all elements in an %unordered_multimap.
|
|
|
|
* Note that this function only erases the elements, and that if the
|
|
|
|
* elements themselves are pointers, the pointed-to memory is not touched
|
|
|
|
* in any way. Managing the pointer is the user's responsibility.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
clear() noexcept
|
|
|
|
{ _M_h.clear(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Swaps data with another %unordered_multimap.
|
|
|
|
* @param __x An %unordered_multimap of the same element and allocator
|
|
|
|
* types.
|
|
|
|
*
|
|
|
|
* This exchanges the elements between two %unordered_multimap in
|
|
|
|
* constant time.
|
|
|
|
* Note that the global std::swap() function is specialized such that
|
|
|
|
* std::swap(m1,m2) will feed to this function.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
swap(unordered_multimap& __x)
|
2013-04-22 22:22:07 +02:00
|
|
|
noexcept( noexcept(_M_h.swap(__x._M_h)) )
|
2012-10-27 14:20:18 +02:00
|
|
|
{ _M_h.swap(__x._M_h); }
|
|
|
|
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
#if __cplusplus > 201402L
|
|
|
|
template<typename, typename, typename>
|
2018-03-20 22:45:14 +01:00
|
|
|
friend class std::_Hash_merge_helper;
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
|
|
|
|
template<typename _H2, typename _P2>
|
|
|
|
void
|
|
|
|
merge(unordered_multimap<_Key, _Tp, _H2, _P2, _Alloc>& __source)
|
|
|
|
{
|
|
|
|
using _Merge_helper
|
|
|
|
= _Hash_merge_helper<unordered_multimap, _H2, _P2>;
|
|
|
|
_M_h._M_merge_multi(_Merge_helper::_S_get_table(__source));
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _H2, typename _P2>
|
|
|
|
void
|
|
|
|
merge(unordered_multimap<_Key, _Tp, _H2, _P2, _Alloc>&& __source)
|
|
|
|
{ merge(__source); }
|
|
|
|
|
|
|
|
template<typename _H2, typename _P2>
|
|
|
|
void
|
|
|
|
merge(unordered_map<_Key, _Tp, _H2, _P2, _Alloc>& __source)
|
|
|
|
{
|
|
|
|
using _Merge_helper
|
|
|
|
= _Hash_merge_helper<unordered_multimap, _H2, _P2>;
|
|
|
|
_M_h._M_merge_multi(_Merge_helper::_S_get_table(__source));
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _H2, typename _P2>
|
|
|
|
void
|
|
|
|
merge(unordered_map<_Key, _Tp, _H2, _P2, _Alloc>&& __source)
|
|
|
|
{ merge(__source); }
|
|
|
|
#endif // C++17
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
// observers.
|
|
|
|
|
|
|
|
/// Returns the hash functor object with which the %unordered_multimap
|
|
|
|
/// was constructed.
|
|
|
|
hasher
|
|
|
|
hash_function() const
|
|
|
|
{ return _M_h.hash_function(); }
|
|
|
|
|
|
|
|
/// Returns the key comparison object with which the %unordered_multimap
|
|
|
|
/// was constructed.
|
|
|
|
key_equal
|
|
|
|
key_eq() const
|
|
|
|
{ return _M_h.key_eq(); }
|
|
|
|
|
|
|
|
// lookup.
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Tries to locate an element in an %unordered_multimap.
|
|
|
|
* @param __x Key to be located.
|
|
|
|
* @return Iterator pointing to sought-after element, or end() if not
|
|
|
|
* found.
|
|
|
|
*
|
|
|
|
* This function takes a key and tries to locate the element with which
|
|
|
|
* the key matches. If successful the function returns an iterator
|
|
|
|
* pointing to the sought after element. If unsuccessful it returns the
|
|
|
|
* past-the-end ( @c end() ) iterator.
|
|
|
|
*/
|
|
|
|
iterator
|
|
|
|
find(const key_type& __x)
|
|
|
|
{ return _M_h.find(__x); }
|
|
|
|
|
|
|
|
const_iterator
|
|
|
|
find(const key_type& __x) const
|
|
|
|
{ return _M_h.find(__x); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Finds the number of elements.
|
|
|
|
* @param __x Key to count.
|
|
|
|
* @return Number of elements with specified key.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
count(const key_type& __x) const
|
|
|
|
{ return _M_h.count(__x); }
|
|
|
|
|
2018-07-04 20:16:26 +02:00
|
|
|
#if __cplusplus > 201703L
|
|
|
|
/**
|
|
|
|
* @brief Finds whether an element with the given key exists.
|
|
|
|
* @param __x Key of elements to be located.
|
|
|
|
* @return True if there is any element with the specified key.
|
|
|
|
*/
|
|
|
|
bool
|
|
|
|
contains(const key_type& __x) const
|
|
|
|
{ return _M_h.find(__x) != _M_h.end(); }
|
|
|
|
#endif
|
|
|
|
|
2012-10-27 14:20:18 +02:00
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Finds a subsequence matching given key.
|
|
|
|
* @param __x Key to be located.
|
|
|
|
* @return Pair of iterators that possibly points to the subsequence
|
|
|
|
* matching given key.
|
|
|
|
*/
|
|
|
|
std::pair<iterator, iterator>
|
|
|
|
equal_range(const key_type& __x)
|
|
|
|
{ return _M_h.equal_range(__x); }
|
|
|
|
|
|
|
|
std::pair<const_iterator, const_iterator>
|
|
|
|
equal_range(const key_type& __x) const
|
|
|
|
{ return _M_h.equal_range(__x); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
// bucket interface.
|
|
|
|
|
|
|
|
/// Returns the number of buckets of the %unordered_multimap.
|
|
|
|
size_type
|
|
|
|
bucket_count() const noexcept
|
|
|
|
{ return _M_h.bucket_count(); }
|
|
|
|
|
|
|
|
/// Returns the maximum number of buckets of the %unordered_multimap.
|
|
|
|
size_type
|
|
|
|
max_bucket_count() const noexcept
|
|
|
|
{ return _M_h.max_bucket_count(); }
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @brief Returns the number of elements in a given bucket.
|
|
|
|
* @param __n A bucket index.
|
|
|
|
* @return The number of elements in the bucket.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
bucket_size(size_type __n) const
|
|
|
|
{ return _M_h.bucket_size(__n); }
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @brief Returns the bucket index of a given element.
|
|
|
|
* @param __key A key instance.
|
|
|
|
* @return The key bucket index.
|
|
|
|
*/
|
|
|
|
size_type
|
|
|
|
bucket(const key_type& __key) const
|
|
|
|
{ return _M_h.bucket(__key); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Returns a read/write iterator pointing to the first bucket
|
|
|
|
* element.
|
|
|
|
* @param __n The bucket index.
|
|
|
|
* @return A read/write local iterator.
|
|
|
|
*/
|
|
|
|
local_iterator
|
|
|
|
begin(size_type __n)
|
|
|
|
{ return _M_h.begin(__n); }
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Returns a read-only (constant) iterator pointing to the first
|
|
|
|
* bucket element.
|
|
|
|
* @param __n The bucket index.
|
|
|
|
* @return A read-only local iterator.
|
|
|
|
*/
|
|
|
|
const_local_iterator
|
|
|
|
begin(size_type __n) const
|
|
|
|
{ return _M_h.begin(__n); }
|
|
|
|
|
|
|
|
const_local_iterator
|
|
|
|
cbegin(size_type __n) const
|
|
|
|
{ return _M_h.cbegin(__n); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Returns a read/write iterator pointing to one past the last
|
|
|
|
* bucket elements.
|
|
|
|
* @param __n The bucket index.
|
|
|
|
* @return A read/write local iterator.
|
|
|
|
*/
|
|
|
|
local_iterator
|
|
|
|
end(size_type __n)
|
|
|
|
{ return _M_h.end(__n); }
|
|
|
|
|
|
|
|
//@{
|
|
|
|
/**
|
|
|
|
* @brief Returns a read-only (constant) iterator pointing to one past
|
|
|
|
* the last bucket elements.
|
|
|
|
* @param __n The bucket index.
|
|
|
|
* @return A read-only local iterator.
|
|
|
|
*/
|
|
|
|
const_local_iterator
|
|
|
|
end(size_type __n) const
|
|
|
|
{ return _M_h.end(__n); }
|
|
|
|
|
|
|
|
const_local_iterator
|
|
|
|
cend(size_type __n) const
|
|
|
|
{ return _M_h.cend(__n); }
|
|
|
|
//@}
|
|
|
|
|
|
|
|
// hash policy.
|
|
|
|
|
|
|
|
/// Returns the average number of elements per bucket.
|
|
|
|
float
|
|
|
|
load_factor() const noexcept
|
|
|
|
{ return _M_h.load_factor(); }
|
|
|
|
|
|
|
|
/// Returns a positive number that the %unordered_multimap tries to keep
|
|
|
|
/// the load factor less than or equal to.
|
|
|
|
float
|
|
|
|
max_load_factor() const noexcept
|
|
|
|
{ return _M_h.max_load_factor(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Change the %unordered_multimap maximum load factor.
|
|
|
|
* @param __z The new maximum load factor.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
max_load_factor(float __z)
|
|
|
|
{ _M_h.max_load_factor(__z); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief May rehash the %unordered_multimap.
|
|
|
|
* @param __n The new number of buckets.
|
|
|
|
*
|
|
|
|
* Rehash will occur only if the new number of buckets respect the
|
|
|
|
* %unordered_multimap maximum load factor.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
rehash(size_type __n)
|
|
|
|
{ _M_h.rehash(__n); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Prepare the %unordered_multimap for a specified number of
|
|
|
|
* elements.
|
|
|
|
* @param __n Number of elements required.
|
|
|
|
*
|
|
|
|
* Same as rehash(ceil(n / max_load_factor())).
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
reserve(size_type __n)
|
|
|
|
{ _M_h.reserve(__n); }
|
|
|
|
|
|
|
|
template<typename _Key1, typename _Tp1, typename _Hash1, typename _Pred1,
|
|
|
|
typename _Alloc1>
|
|
|
|
friend bool
|
|
|
|
operator==(const unordered_multimap<_Key1, _Tp1,
|
|
|
|
_Hash1, _Pred1, _Alloc1>&,
|
|
|
|
const unordered_multimap<_Key1, _Tp1,
|
|
|
|
_Hash1, _Pred1, _Alloc1>&);
|
2010-02-10 17:09:42 +01:00
|
|
|
};
|
|
|
|
|
2017-10-26 18:42:31 +02:00
|
|
|
#if __cpp_deduction_guides >= 201606
|
|
|
|
|
|
|
|
template<typename _InputIterator,
|
|
|
|
typename _Hash = hash<__iter_key_t<_InputIterator>>,
|
|
|
|
typename _Pred = equal_to<__iter_key_t<_InputIterator>>,
|
|
|
|
typename _Allocator = allocator<__iter_to_alloc_t<_InputIterator>>,
|
|
|
|
typename = _RequireInputIter<_InputIterator>,
|
2019-02-27 00:12:44 +01:00
|
|
|
typename = _RequireNotAllocatorOrIntegral<_Hash>,
|
|
|
|
typename = _RequireNotAllocator<_Pred>,
|
2017-10-26 18:42:31 +02:00
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_multimap(_InputIterator, _InputIterator,
|
|
|
|
unordered_multimap<int, int>::size_type = {},
|
|
|
|
_Hash = _Hash(), _Pred = _Pred(),
|
|
|
|
_Allocator = _Allocator())
|
|
|
|
-> unordered_multimap<__iter_key_t<_InputIterator>,
|
|
|
|
__iter_val_t<_InputIterator>, _Hash, _Pred,
|
|
|
|
_Allocator>;
|
|
|
|
|
|
|
|
template<typename _Key, typename _Tp, typename _Hash = hash<_Key>,
|
|
|
|
typename _Pred = equal_to<_Key>,
|
|
|
|
typename _Allocator = allocator<pair<const _Key, _Tp>>,
|
2019-02-27 00:12:44 +01:00
|
|
|
typename = _RequireNotAllocatorOrIntegral<_Hash>,
|
|
|
|
typename = _RequireNotAllocator<_Pred>,
|
2017-10-26 18:42:31 +02:00
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_multimap(initializer_list<pair<_Key, _Tp>>,
|
|
|
|
unordered_multimap<int, int>::size_type = {},
|
|
|
|
_Hash = _Hash(), _Pred = _Pred(),
|
|
|
|
_Allocator = _Allocator())
|
|
|
|
-> unordered_multimap<_Key, _Tp, _Hash, _Pred, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _InputIterator, typename _Allocator,
|
|
|
|
typename = _RequireInputIter<_InputIterator>,
|
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_multimap(_InputIterator, _InputIterator,
|
|
|
|
unordered_multimap<int, int>::size_type, _Allocator)
|
|
|
|
-> unordered_multimap<__iter_key_t<_InputIterator>,
|
|
|
|
__iter_val_t<_InputIterator>,
|
|
|
|
hash<__iter_key_t<_InputIterator>>,
|
|
|
|
equal_to<__iter_key_t<_InputIterator>>, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _InputIterator, typename _Allocator,
|
|
|
|
typename = _RequireInputIter<_InputIterator>,
|
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_multimap(_InputIterator, _InputIterator, _Allocator)
|
|
|
|
-> unordered_multimap<__iter_key_t<_InputIterator>,
|
|
|
|
__iter_val_t<_InputIterator>,
|
|
|
|
hash<__iter_key_t<_InputIterator>>,
|
|
|
|
equal_to<__iter_key_t<_InputIterator>>, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _InputIterator, typename _Hash, typename _Allocator,
|
|
|
|
typename = _RequireInputIter<_InputIterator>,
|
2019-02-27 00:12:44 +01:00
|
|
|
typename = _RequireNotAllocatorOrIntegral<_Hash>,
|
2017-10-26 18:42:31 +02:00
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_multimap(_InputIterator, _InputIterator,
|
|
|
|
unordered_multimap<int, int>::size_type, _Hash,
|
|
|
|
_Allocator)
|
|
|
|
-> unordered_multimap<__iter_key_t<_InputIterator>,
|
|
|
|
__iter_val_t<_InputIterator>, _Hash,
|
|
|
|
equal_to<__iter_key_t<_InputIterator>>, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _Key, typename _Tp, typename _Allocator,
|
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_multimap(initializer_list<pair<_Key, _Tp>>,
|
|
|
|
unordered_multimap<int, int>::size_type,
|
|
|
|
_Allocator)
|
|
|
|
-> unordered_multimap<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _Key, typename _Tp, typename _Allocator,
|
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_multimap(initializer_list<pair<_Key, _Tp>>, _Allocator)
|
|
|
|
-> unordered_multimap<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
|
|
|
|
|
|
|
|
template<typename _Key, typename _Tp, typename _Hash, typename _Allocator,
|
2019-02-27 00:12:44 +01:00
|
|
|
typename = _RequireNotAllocatorOrIntegral<_Hash>,
|
2017-10-26 18:42:31 +02:00
|
|
|
typename = _RequireAllocator<_Allocator>>
|
|
|
|
unordered_multimap(initializer_list<pair<_Key, _Tp>>,
|
|
|
|
unordered_multimap<int, int>::size_type,
|
|
|
|
_Hash, _Allocator)
|
|
|
|
-> unordered_multimap<_Key, _Tp, _Hash, equal_to<_Key>, _Allocator>;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2010-02-10 17:09:42 +01:00
|
|
|
template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
|
|
|
|
inline void
|
|
|
|
swap(unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
|
|
|
|
unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
|
Implement N4258 (Cleaning-up noexcept in the Library rev 3)
* doc/xml/manual/intro.xml: Document LWG 2108 status.
* include/bits/alloc_traits.h (allocator_traits::is_always_equal):
Define.
* include/bits/allocator.h (allocator::is_always_equal): Likewise.
* include/bits/forward_list.h
(forward_list::operator=(forward_list&&)): Use __bool_constant.
(forward_list::swap(forward_list&)): Add noexcept.
* include/bits/hashtable.h (_Hashtable::operator=(_Hashtable&&)):
Likewise.
(_Hashtable::swap(_Hashtable&)): Likewise.
* include/bits/stl_deque.h (_Deque_base::_Deque_base(_Deque_base&&)):
Use _Alloc_traits::is_always_equal.
(deque::operator=(deque&&)): Likewise.
(deque::_M_move_assign1(deque&&, false_type)): Add comment and use
__bool_constant.
(swap(deque&, deque&)): Add noexcept.
* include/bits/stl_list.h (list::operator=(list&&)): Use
__bool_constant.
(swap(list&, list&)): Add noexcept.
* include/bits/stl_map.h (map::swap(map&)): Include _Compare in
noexcept.
(swap(map&, map&)): Add noexcept.
* include/bits/stl_multimap.h (multimap::swap(multimap&)): Include
_Compare in noexcept.
(swap(multimap&, multimap&)): Add noexcept.
* include/bits/stl_multiset.h (multiset::swap(multiset&)): Include
_Compare in noexcept.
(swap(multiset&, multiset&)): Add noexcept.
* include/bits/stl_set.h (set::swap(set&)): Include _Compare in
noexcept.
(swap(set&, set&)): Add noexcept.
* include/bits/stl_tree.h (_Rb_tree::operator=(_Rb_tree&&)): Include
_Compare in noexcept.
(_Rb_tree::_Rb_tree(_Rb_tree&&, _Node_alloc_type&&)): Use
is_always_equal.
* include/bits/stl_vector.h (vector::operator=(vector&&)): Use
__bool_constant.
(swap(vector&, vector&)): Add noexcept.
* include/bits/unordered_map.h (swap(unordered_map&, unordered_map&),
swap(unordered_multimap& unordered_multimap&)): Add noexcept.
* include/bits/unordered_set.h (swap(unordered_set&, unordered_set&),
swap(unordered_multiset& unordered_multiset&)): Add noexcept.
* include/ext/alloc_traits.h (__allocator_always_compares_equal):
Remove.
(__alloc_traits::_S_always_equal()): Use is_always_equal instead of
__allocator_always_compares_equal.
* include/ext/array_allocator.h (array_allocator::is_always_equal):
Define.
* include/std/scoped_allocator (__any_of, __propagate_on_copy,
__propagate_on_move, __propagate_on_swap): Remove.
(scoped_allocator_adaptor::propagate_on_container_copy_assignment,
scoped_allocator_adaptor::propagate_on_container_move_assignment,
scoped_allocator_adaptor::propagate_on_container_swap): Define with
__and_ instead of __any_of.
(scoped_allocator_adaptor::is_always_equal): Define.
* testsuite/20_util/allocator_traits/members/is_always_equal.cc: New.
* testsuite/20_util/scoped_allocator/propagation.cc: Make traits
derive from true_type or false_type.
* testsuite/23_containers/deque/allocator/move_assign-2.cc: Add
is_always_equal member and remove the trait specialization.
* testsuite/23_containers/vector/52591.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r225081
2015-06-26 22:10:24 +02:00
|
|
|
noexcept(noexcept(__x.swap(__y)))
|
2010-02-10 17:09:42 +01:00
|
|
|
{ __x.swap(__y); }
|
|
|
|
|
|
|
|
template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
|
|
|
|
inline void
|
|
|
|
swap(unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
|
|
|
|
unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
|
Implement N4258 (Cleaning-up noexcept in the Library rev 3)
* doc/xml/manual/intro.xml: Document LWG 2108 status.
* include/bits/alloc_traits.h (allocator_traits::is_always_equal):
Define.
* include/bits/allocator.h (allocator::is_always_equal): Likewise.
* include/bits/forward_list.h
(forward_list::operator=(forward_list&&)): Use __bool_constant.
(forward_list::swap(forward_list&)): Add noexcept.
* include/bits/hashtable.h (_Hashtable::operator=(_Hashtable&&)):
Likewise.
(_Hashtable::swap(_Hashtable&)): Likewise.
* include/bits/stl_deque.h (_Deque_base::_Deque_base(_Deque_base&&)):
Use _Alloc_traits::is_always_equal.
(deque::operator=(deque&&)): Likewise.
(deque::_M_move_assign1(deque&&, false_type)): Add comment and use
__bool_constant.
(swap(deque&, deque&)): Add noexcept.
* include/bits/stl_list.h (list::operator=(list&&)): Use
__bool_constant.
(swap(list&, list&)): Add noexcept.
* include/bits/stl_map.h (map::swap(map&)): Include _Compare in
noexcept.
(swap(map&, map&)): Add noexcept.
* include/bits/stl_multimap.h (multimap::swap(multimap&)): Include
_Compare in noexcept.
(swap(multimap&, multimap&)): Add noexcept.
* include/bits/stl_multiset.h (multiset::swap(multiset&)): Include
_Compare in noexcept.
(swap(multiset&, multiset&)): Add noexcept.
* include/bits/stl_set.h (set::swap(set&)): Include _Compare in
noexcept.
(swap(set&, set&)): Add noexcept.
* include/bits/stl_tree.h (_Rb_tree::operator=(_Rb_tree&&)): Include
_Compare in noexcept.
(_Rb_tree::_Rb_tree(_Rb_tree&&, _Node_alloc_type&&)): Use
is_always_equal.
* include/bits/stl_vector.h (vector::operator=(vector&&)): Use
__bool_constant.
(swap(vector&, vector&)): Add noexcept.
* include/bits/unordered_map.h (swap(unordered_map&, unordered_map&),
swap(unordered_multimap& unordered_multimap&)): Add noexcept.
* include/bits/unordered_set.h (swap(unordered_set&, unordered_set&),
swap(unordered_multiset& unordered_multiset&)): Add noexcept.
* include/ext/alloc_traits.h (__allocator_always_compares_equal):
Remove.
(__alloc_traits::_S_always_equal()): Use is_always_equal instead of
__allocator_always_compares_equal.
* include/ext/array_allocator.h (array_allocator::is_always_equal):
Define.
* include/std/scoped_allocator (__any_of, __propagate_on_copy,
__propagate_on_move, __propagate_on_swap): Remove.
(scoped_allocator_adaptor::propagate_on_container_copy_assignment,
scoped_allocator_adaptor::propagate_on_container_move_assignment,
scoped_allocator_adaptor::propagate_on_container_swap): Define with
__and_ instead of __any_of.
(scoped_allocator_adaptor::is_always_equal): Define.
* testsuite/20_util/allocator_traits/members/is_always_equal.cc: New.
* testsuite/20_util/scoped_allocator/propagation.cc: Make traits
derive from true_type or false_type.
* testsuite/23_containers/deque/allocator/move_assign-2.cc: Add
is_always_equal member and remove the trait specialization.
* testsuite/23_containers/vector/52591.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Adjust dg-error line number.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
From-SVN: r225081
2015-06-26 22:10:24 +02:00
|
|
|
noexcept(noexcept(__x.swap(__y)))
|
2010-02-10 17:09:42 +01:00
|
|
|
{ __x.swap(__y); }
|
|
|
|
|
2010-03-26 03:19:10 +01:00
|
|
|
template<class _Key, class _Tp, class _Hash, class _Pred, class _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 __x._M_h._M_equal(__y._M_h); }
|
2010-03-26 03:19:10 +01:00
|
|
|
|
|
|
|
template<class _Key, class _Tp, class _Hash, class _Pred, class _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); }
|
|
|
|
|
|
|
|
template<class _Key, class _Tp, class _Hash, class _Pred, class _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 __x._M_h._M_equal(__y._M_h); }
|
2010-03-26 03:19:10 +01:00
|
|
|
|
|
|
|
template<class _Key, class _Tp, class _Hash, class _Pred, class _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); }
|
|
|
|
|
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
|
|
|
_GLIBCXX_END_NAMESPACE_CONTAINER
|
Implement C++17 node extraction and insertion (P0083R5)
* doc/xml/manual/status_cxx2017.xml: Document status.
* doc/html/*: Regenerate.
* include/Makefile.am: Add bits/node_handle.h and reorder.
* include/Makefile.in: Regenerate.
* include/bits/hashtable.h (_Hashtable::node_type)
(_Hashtable::insert_return_type, _Hashtable::_M_reinsert_node)
(_Hashtable::_M_reinsert_node_multi, _Hashtable::extract)
(_Hashtable::_M_merge_unique, _Hashtable::_M_merge_multi): Define.
(_Hash_merge_helper): Define primary template.
* include/bits/node_handle.h: New header.
* include/bits/stl_map.h (map): Declare _Rb_tree_merge_helper as
friend.
(map::node_type, map::insert_return_type, map::extract, map::merge)
(map::insert(node_type&&), map::insert(const_iterator, node_type&&)):
Define new members.
(_Rb_tree_merge_helper): Specialize for map.
* include/bits/stl_multimap.h (multimap): Declare _Rb_tree_merge_helper
as friend.
(multimap::node_type, multimap::extract, multimap::merge)
(multimap::insert(node_type&&))
(multimap::insert(const_iterator, node_type&&)): Define.
(_Rb_tree_merge_helper): Specialize for multimap.
* include/bits/stl_multiset.h (multiset): Declare _Rb_tree_merge_helper
as friend.
(multiset::node_type, multiset::extract, multiset::merge)
(multiset::insert(node_type&&))
(multiset::insert(const_iterator, node_type&&)): Define.
* include/bits/stl_set.h (set): Declare _Rb_tree_merge_helper as
friend.
(set::node_type, set::insert_return_type, set::extract, set::merge)
(set::insert(node_type&&), set::insert(const_iterator, node_type&&)):
Define.
(_Rb_tree_merge_helper): Specialize for set.
* include/bits/stl_tree.h (_Rb_tree): Declare _Rb_tree<> as friend.
(_Rb_tree::node_type, _Rb_tree::insert_return_type)
(_Rb_tree::_M_reinsert_node_unique, _Rb_tree::_M_reinsert_node_equal)
(_Rb_tree::_M_reinsert_node_hint_unique)
(_Rb_tree::_M_reinsert_node_hint_equal, _Rb_tree::extract)
(_Rb_tree::_M_merge_unique, _Rb_tree::_M_merge_equal): Define.
(_Rb_tree_merge_helper): Specialize for multiset.
* include/bits/unordered_map.h (unordered_map): Declare
unordered_map<> and unordered_multimap<> as friends.
(unordered_map::node_type, unordered_map::insert_return_type)
(unordered_map::extract, unordered_map::merge)
(unordered_map::insert(node_type&&))
(unordered_map::insert(const_iterator, node_type&&))
(unordered_multimap): Declare _Hash_merge_helper as friend.
(unordered_multimap::node_type, unordered_multimap::extract)
(unordered_multimap::merge, unordered_multimap::insert(node_type&&))
(unordered_multimap::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered maps and multimaps.
* include/bits/unordered_set.h (unordered_set, unordered_multiset):
Declare _Hash_merge_helper as friend.
(unordered_set::node_type, unordered_set::insert_return_type)
(unordered_set::extract, unordered_set::merge)
(unordered_set::insert(node_type&&))
(unordered_set::insert(const_iterator, node_type&&)): Define.
(unordered_multiset::node_type, unordered_multiset::extract)
(unordered_multiset::merge, unordered_multiset::insert(node_type&&))
(unordered_multiset::insert(const_iterator, node_type&&)): Define.
(_Hash_merge_helper): Specialize for unordered sets and multisets.
* include/debug/map.h (map): Add using declarations or forwarding
functions for new members.
* include/debug/map.h (multimap): Likewise.
* include/debug/map.h (multiset): Likewise.
* include/debug/map.h (set): Likewise.
* include/debug/unordered_map (unordered_map, unordered_multimap):
Likewise.
* include/debug/unordered_set( unordered_set, unordered_multiset):
Likewise.
* python/libstdcxx/v6/printers.py (get_value_from_aligned_membuf): New
helper function.
(get_value_from_list_node, get_value_from_Rb_tree_node): Use helper.
(StdNodeHandlePrinter): Define printer for node handles.
(build_libstdcxx_dictionary): Register StdNodeHandlePrinter.
* testsuite/23_containers/map/modifiers/extract.cc: New.
* testsuite/23_containers/map/modifiers/merge.cc: New.
* testsuite/23_containers/multimap/modifiers/extract.cc: New.
* testsuite/23_containers/multimap/modifiers/merge.cc: New.
* testsuite/23_containers/multiset/modifiers/extract.cc: New.
* testsuite/23_containers/multiset/modifiers/merge.cc: New.
* testsuite/23_containers/set/modifiers/extract.cc: New.
* testsuite/23_containers/set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_map/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_map/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multimap/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multimap/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_multiset/modifiers/extract.cc:
New.
* testsuite/23_containers/unordered_multiset/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/modifiers/extract.cc: New.
* testsuite/23_containers/unordered_set/modifiers/merge.cc: New.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error lineno.
* testsuite/libstdc++-prettyprinters/cxx17.cc: Test node handles.
From-SVN: r240363
2016-09-22 15:58:49 +02:00
|
|
|
|
|
|
|
#if __cplusplus > 201402L
|
|
|
|
// Allow std::unordered_map access to internals of compatible maps.
|
|
|
|
template<typename _Key, typename _Val, typename _Hash1, typename _Eq1,
|
|
|
|
typename _Alloc, typename _Hash2, typename _Eq2>
|
|
|
|
struct _Hash_merge_helper<
|
|
|
|
_GLIBCXX_STD_C::unordered_map<_Key, _Val, _Hash1, _Eq1, _Alloc>,
|
|
|
|
_Hash2, _Eq2>
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
template<typename... _Tp>
|
|
|
|
using unordered_map = _GLIBCXX_STD_C::unordered_map<_Tp...>;
|
|
|
|
template<typename... _Tp>
|
|
|
|
using unordered_multimap = _GLIBCXX_STD_C::unordered_multimap<_Tp...>;
|
|
|
|
|
|
|
|
friend unordered_map<_Key, _Val, _Hash1, _Eq1, _Alloc>;
|
|
|
|
|
|
|
|
static auto&
|
|
|
|
_S_get_table(unordered_map<_Key, _Val, _Hash2, _Eq2, _Alloc>& __map)
|
|
|
|
{ return __map._M_h; }
|
|
|
|
|
|
|
|
static auto&
|
|
|
|
_S_get_table(unordered_multimap<_Key, _Val, _Hash2, _Eq2, _Alloc>& __map)
|
|
|
|
{ return __map._M_h; }
|
|
|
|
};
|
|
|
|
|
|
|
|
// Allow std::unordered_multimap access to internals of compatible maps.
|
|
|
|
template<typename _Key, typename _Val, typename _Hash1, typename _Eq1,
|
|
|
|
typename _Alloc, typename _Hash2, typename _Eq2>
|
|
|
|
struct _Hash_merge_helper<
|
|
|
|
_GLIBCXX_STD_C::unordered_multimap<_Key, _Val, _Hash1, _Eq1, _Alloc>,
|
|
|
|
_Hash2, _Eq2>
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
template<typename... _Tp>
|
|
|
|
using unordered_map = _GLIBCXX_STD_C::unordered_map<_Tp...>;
|
|
|
|
template<typename... _Tp>
|
|
|
|
using unordered_multimap = _GLIBCXX_STD_C::unordered_multimap<_Tp...>;
|
|
|
|
|
|
|
|
friend unordered_multimap<_Key, _Val, _Hash1, _Eq1, _Alloc>;
|
|
|
|
|
|
|
|
static auto&
|
|
|
|
_S_get_table(unordered_map<_Key, _Val, _Hash2, _Eq2, _Alloc>& __map)
|
|
|
|
{ return __map._M_h; }
|
|
|
|
|
|
|
|
static auto&
|
|
|
|
_S_get_table(unordered_multimap<_Key, _Val, _Hash2, _Eq2, _Alloc>& __map)
|
|
|
|
{ return __map._M_h; }
|
|
|
|
};
|
|
|
|
#endif // C++17
|
|
|
|
|
2017-07-23 10:41:35 +02:00
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
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
|
2010-02-10 17:09:42 +01:00
|
|
|
|
|
|
|
#endif /* _UNORDERED_MAP_H */
|