From e55b80f5f41b471d59b8f2c9e04c09bc22771541 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Sun, 17 May 2015 20:14:53 +0000 Subject: [PATCH] unordered_map.h (unordered_map, [...]): Add missing constructors. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2015-05-17 François Dumont * include/bits/unordered_map.h (unordered_map, unordered_multimap): Add missing constructors. * include/bits/unordered_set.h (unordered_set, unordered_multiset): Likewise. * include/debug/unordered_map (unordered_map, unordered_multimap): Add missing constructors. * include/debug/unordered_set (unordered_set, unordered_multiset): Likewise. * include/profile/unordered_map (unordered_map, unordered_multimap): Add missing constructors. * include/profile/unordered_set (unordered_set, unordered_multiset): Likewise. * testsuite/23_containers/unordered_map/cons/66055.cc: Add constructor invocations. * testsuite/23_containers/unordered_multimap/cons/66055.cc: Likewise. * testsuite/23_containers/unordered_multiset/cons/66055.cc: Likewise. * testsuite/23_containers/unordered_set/cons/66055.cc: Likewise. From-SVN: r223273 --- libstdc++-v3/ChangeLog | 20 ++++ libstdc++-v3/include/bits/unordered_map.h | 117 +++++++++++++++------ libstdc++-v3/include/bits/unordered_set.h | 114 ++++++++++++++------ libstdc++-v3/include/debug/unordered_map | 73 +++++++++++++ libstdc++-v3/include/debug/unordered_set | 70 ++++++++++++ libstdc++-v3/include/profile/unordered_map | 70 ++++++++++++ libstdc++-v3/include/profile/unordered_set | 70 ++++++++++++ 7 files changed, 470 insertions(+), 64 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0f1089c6d2b..c8f14d00469 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,23 @@ +2015-05-17 François Dumont + + * include/bits/unordered_map.h (unordered_map, unordered_multimap): Add + missing constructors. + * include/bits/unordered_set.h (unordered_set, unordered_multiset): + Likewise. + * include/debug/unordered_map (unordered_map, unordered_multimap): Add + missing constructors. + * include/debug/unordered_set (unordered_set, unordered_multiset): + Likewise. + * include/profile/unordered_map (unordered_map, unordered_multimap): Add + missing constructors. + * include/profile/unordered_set (unordered_set, unordered_multiset): + Likewise. + * testsuite/23_containers/unordered_map/cons/66055.cc: Add constructor + invocations. + * testsuite/23_containers/unordered_multimap/cons/66055.cc: Likewise. + * testsuite/23_containers/unordered_multiset/cons/66055.cc: Likewise. + * testsuite/23_containers/unordered_set/cons/66055.cc: Likewise. + 2015-05-15 Jonathan Wakely * src/filesystem/ops.cc (stat_type): Define alias for struct stat and diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h index 069b85922ea..3c434abb6aa 100644 --- a/libstdc++-v3/include/bits/unordered_map.h +++ b/libstdc++-v3/include/bits/unordered_map.h @@ -146,17 +146,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _M_h(__n, __hf, __eql, __a) { } - unordered_map(size_type __n, const allocator_type& __a) - : _M_h(__n, hasher(), key_equal(), __a) - { } - - explicit - unordered_map(size_type __n, - const hasher& __hf, - const allocator_type& __a) - : _M_h(__n, __hf, key_equal(), __a) - { } - /** * @brief Builds an %unordered_map from a range. * @param __first An input iterator. @@ -201,7 +190,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ unordered_map(const unordered_map& __umap, const allocator_type& __a) - : _M_h(__umap._M_h, __a) + : _M_h(__umap._M_h, __a) { } /* @@ -211,7 +200,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ unordered_map(unordered_map&& __umap, const allocator_type& __a) - : _M_h(std::move(__umap._M_h), __a) + : _M_h(std::move(__umap._M_h), __a) { } /** @@ -230,7 +219,42 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER const hasher& __hf = hasher(), const key_equal& __eql = key_equal(), const allocator_type& __a = allocator_type()) - : _M_h(__l, __n, __hf, __eql, __a) + : _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 + unordered_map(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_map(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + 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 __l, + size_type __n, + const allocator_type& __a) + : unordered_map(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_map(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_map(__l, __n, __hf, key_equal(), __a) { } /// Copy assignment operator. @@ -331,7 +355,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER // modifiers. /** - * @brief Attempts to build and insert a std::pair into the %unordered_map. + * @brief Attempts to build and insert a std::pair into the + * %unordered_map. * * @param __args Arguments used to generate a new pair instance (see * std::piecewise_contruct for passing arguments to each @@ -355,7 +380,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { return _M_h.emplace(std::forward<_Args>(__args)...); } /** - * @brief Attempts to build and insert a std::pair into the %unordered_map. + * @brief Attempts to build and insert a std::pair into the + * %unordered_map. * * @param __pos An iterator that serves as a hint as to where the pair * should be inserted. @@ -546,7 +572,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @param __x An %unordered_map of the same element and allocator * types. * - * This exchanges the elements between two %unordered_map in constant time. + * This exchanges the elements between two %unordered_map in constant + * time. * Note that the global std::swap() function is specialized such that * std::swap(m1,m2) will feed to this function. */ @@ -872,16 +899,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _M_h(__n, __hf, __eql, __a) { } - unordered_multimap(size_type __n, const allocator_type& __a) - : _M_h(__n, hasher(), key_equal(), __a) - { } - - unordered_multimap(size_type __n, - const hasher& __hf, - const allocator_type& __a) - : _M_h(__n, __hf, key_equal(), __a) - { } - /** * @brief Builds an %unordered_multimap from a range. * @param __first An input iterator. @@ -916,7 +933,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ explicit unordered_multimap(const allocator_type& __a) - : _M_h(__a) + : _M_h(__a) { } /* @@ -926,7 +943,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ unordered_multimap(const unordered_multimap& __ummap, const allocator_type& __a) - : _M_h(__ummap._M_h, __a) + : _M_h(__ummap._M_h, __a) { } /* @@ -936,7 +953,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ unordered_multimap(unordered_multimap&& __ummap, const allocator_type& __a) - : _M_h(std::move(__ummap._M_h), __a) + : _M_h(std::move(__ummap._M_h), __a) { } /** @@ -955,7 +972,42 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER const hasher& __hf = hasher(), const key_equal& __eql = key_equal(), const allocator_type& __a = allocator_type()) - : _M_h(__l, __n, __hf, __eql, __a) + : _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 + unordered_multimap(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + 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 __l, + size_type __n, + const allocator_type& __a) + : unordered_multimap(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_multimap(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multimap(__l, __n, __hf, key_equal(), __a) { } /// Copy assignment operator. @@ -1076,7 +1128,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { return _M_h.emplace(std::forward<_Args>(__args)...); } /** - * @brief Attempts to build and insert a std::pair into the %unordered_multimap. + * @brief Attempts to build and insert a std::pair into the + * %unordered_multimap. * * @param __pos An iterator that serves as a hint as to where the pair * should be inserted. diff --git a/libstdc++-v3/include/bits/unordered_set.h b/libstdc++-v3/include/bits/unordered_set.h index c91eab8e113..664d97ef27a 100644 --- a/libstdc++-v3/include/bits/unordered_set.h +++ b/libstdc++-v3/include/bits/unordered_set.h @@ -140,16 +140,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _M_h(__n, __hf, __eql, __a) { } - unordered_set(size_type __n, const allocator_type& __a) - : _M_h(__n, hasher(), key_equal(), __a) - { } - - unordered_set(size_type __n, - const hasher& __hf, - const allocator_type& __a) - : unordered_set(__n, __hf, key_equal(), __a) - { } - /** * @brief Builds an %unordered_set from a range. * @param __first An input iterator. @@ -184,7 +174,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ explicit unordered_set(const allocator_type& __a) - : _M_h(__a) + : _M_h(__a) { } /* @@ -194,7 +184,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ unordered_set(const unordered_set& __uset, const allocator_type& __a) - : _M_h(__uset._M_h, __a) + : _M_h(__uset._M_h, __a) { } /* @@ -204,7 +194,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ unordered_set(unordered_set&& __uset, const allocator_type& __a) - : _M_h(std::move(__uset._M_h), __a) + : _M_h(std::move(__uset._M_h), __a) { } /** @@ -223,7 +213,42 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER const hasher& __hf = hasher(), const key_equal& __eql = key_equal(), const allocator_type& __a = allocator_type()) - : _M_h(__l, __n, __hf, __eql, __a) + : _M_h(__l, __n, __hf, __eql, __a) + { } + + unordered_set(size_type __n, const allocator_type& __a) + : unordered_set(__n, hasher(), key_equal(), __a) + { } + + unordered_set(size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_set(__n, __hf, key_equal(), __a) + { } + + template + unordered_set(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_set(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + unordered_set(_InputIterator __first, _InputIterator __last, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_set(__first, __last, __n, __hf, key_equal(), __a) + { } + + unordered_set(initializer_list __l, + size_type __n, + const allocator_type& __a) + : unordered_set(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_set(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_set(__l, __n, __hf, key_equal(), __a) { } /// Copy assignment operator. @@ -712,8 +737,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER template friend bool - operator==(const unordered_set<_Value1, _Hash1, _Pred1, _Alloc1>&, - const unordered_set<_Value1, _Hash1, _Pred1, _Alloc1>&); + operator==(const unordered_set<_Value1, _Hash1, _Pred1, _Alloc1>&, + const unordered_set<_Value1, _Hash1, _Pred1, _Alloc1>&); }; /** @@ -789,16 +814,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER : _M_h(__n, __hf, __eql, __a) { } - unordered_multiset(size_type __n, const allocator_type& __a) - : _M_h(__n, hasher(), key_equal(), __a) - { } - - unordered_multiset(size_type __n, - const hasher& __hf, - const allocator_type& __a) - : _M_h(__n, __hf, key_equal(), __a) - { } - /** * @brief Builds an %unordered_multiset from a range. * @param __first An input iterator. @@ -843,7 +858,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER const hasher& __hf = hasher(), const key_equal& __eql = key_equal(), const allocator_type& __a = allocator_type()) - : _M_h(__l, __n, __hf, __eql, __a) + : _M_h(__l, __n, __hf, __eql, __a) { } /// Copy assignment operator. @@ -860,7 +875,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ explicit unordered_multiset(const allocator_type& __a) - : _M_h(__a) + : _M_h(__a) { } /* @@ -870,7 +885,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ unordered_multiset(const unordered_multiset& __umset, const allocator_type& __a) - : _M_h(__umset._M_h, __a) + : _M_h(__umset._M_h, __a) { } /* @@ -880,7 +895,42 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER */ unordered_multiset(unordered_multiset&& __umset, const allocator_type& __a) - : _M_h(std::move(__umset._M_h), __a) + : _M_h(std::move(__umset._M_h), __a) + { } + + unordered_multiset(size_type __n, const allocator_type& __a) + : unordered_multiset(__n, hasher(), key_equal(), __a) + { } + + unordered_multiset(size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multiset(__n, __hf, key_equal(), __a) + { } + + template + unordered_multiset(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + unordered_multiset(_InputIterator __first, _InputIterator __last, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multiset(__first, __last, __n, __hf, key_equal(), __a) + { } + + unordered_multiset(initializer_list __l, + size_type __n, + const allocator_type& __a) + : unordered_multiset(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_multiset(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multiset(__l, __n, __hf, key_equal(), __a) { } /** @@ -891,8 +941,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * in the initializer list @a __l. * * Note that the assignment completely changes the %unordered_multiset - * and that the resulting %unordered_set's size is the same as the number - * of elements assigned. Old data may be lost. + * and that the resulting %unordered_multiset's size is the same as the + * number of elements assigned. Old data may be lost. */ unordered_multiset& operator=(initializer_list __l) diff --git a/libstdc++-v3/include/debug/unordered_map b/libstdc++-v3/include/debug/unordered_map index a6bf9a68c14..3f46641d678 100644 --- a/libstdc++-v3/include/debug/unordered_map +++ b/libstdc++-v3/include/debug/unordered_map @@ -129,6 +129,44 @@ namespace __debug const allocator_type& __a = allocator_type()) : _Base(__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 + unordered_map(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_map(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + 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 __l, + size_type __n, + const allocator_type& __a) + : unordered_map(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_map(initializer_list __l, + size_type __n, + const hasher& __hf, + const allocator_type& __a) + : unordered_map(__l, __n, __hf, key_equal(), __a) + { } + ~unordered_map() = default; unordered_map& @@ -544,6 +582,41 @@ namespace __debug const allocator_type& __a = allocator_type()) : _Base(__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 + unordered_multimap(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + 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 __l, + size_type __n, + const allocator_type& __a) + : unordered_multimap(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_multimap(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multimap(__l, __n, __hf, key_equal(), __a) + { } + ~unordered_multimap() = default; unordered_multimap& diff --git a/libstdc++-v3/include/debug/unordered_set b/libstdc++-v3/include/debug/unordered_set index afa0a3d465d..10a9c270ed0 100644 --- a/libstdc++-v3/include/debug/unordered_set +++ b/libstdc++-v3/include/debug/unordered_set @@ -129,6 +129,41 @@ namespace __debug const allocator_type& __a = allocator_type()) : _Base(__l, __n, __hf, __eql, __a) { } + unordered_set(size_type __n, const allocator_type& __a) + : unordered_set(__n, hasher(), key_equal(), __a) + { } + + unordered_set(size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_set(__n, __hf, key_equal(), __a) + { } + + template + unordered_set(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_set(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + unordered_set(_InputIterator __first, _InputIterator __last, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_set(__first, __last, __n, __hf, key_equal(), __a) + { } + + unordered_set(initializer_list __l, + size_type __n, + const allocator_type& __a) + : unordered_set(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_set(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_set(__l, __n, __hf, key_equal(), __a) + { } + ~unordered_set() = default; unordered_set& @@ -540,6 +575,41 @@ namespace __debug const allocator_type& __a = allocator_type()) : _Base(__l, __n, __hf, __eql, __a) { } + unordered_multiset(size_type __n, const allocator_type& __a) + : unordered_multiset(__n, hasher(), key_equal(), __a) + { } + + unordered_multiset(size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multiset(__n, __hf, key_equal(), __a) + { } + + template + unordered_multiset(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + unordered_multiset(_InputIterator __first, _InputIterator __last, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multiset(__first, __last, __n, __hf, key_equal(), __a) + { } + + unordered_multiset(initializer_list __l, + size_type __n, + const allocator_type& __a) + : unordered_multiset(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_multiset(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multiset(__l, __n, __hf, key_equal(), __a) + { } + ~unordered_multiset() = default; unordered_multiset& diff --git a/libstdc++-v3/include/profile/unordered_map b/libstdc++-v3/include/profile/unordered_map index fdb4550cdc9..480fabad172 100644 --- a/libstdc++-v3/include/profile/unordered_map +++ b/libstdc++-v3/include/profile/unordered_map @@ -119,6 +119,41 @@ namespace __profile const allocator_type& __a = allocator_type()) : _Base(__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 + unordered_map(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_map(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + 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 __l, + size_type __n, + const allocator_type& __a) + : unordered_map(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_map(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_map(__l, __n, __hf, key_equal(), __a) + { } + unordered_map& operator=(const unordered_map&) = default; @@ -361,6 +396,41 @@ namespace __profile const allocator_type& __a = allocator_type()) : _Base(__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 + unordered_multimap(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + 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 __l, + size_type __n, + const allocator_type& __a) + : unordered_multimap(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_multimap(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multimap(__l, __n, __hf, key_equal(), __a) + { } + unordered_multimap& operator=(const unordered_multimap&) = default; diff --git a/libstdc++-v3/include/profile/unordered_set b/libstdc++-v3/include/profile/unordered_set index e1eb1a17d31..15950b9f471 100644 --- a/libstdc++-v3/include/profile/unordered_set +++ b/libstdc++-v3/include/profile/unordered_set @@ -125,6 +125,41 @@ namespace __profile : _Base(__l, __n, __hf, __eql, __a) { } + unordered_set(size_type __n, const allocator_type& __a) + : unordered_set(__n, hasher(), key_equal(), __a) + { } + + unordered_set(size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_set(__n, __hf, key_equal(), __a) + { } + + template + unordered_set(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_set(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + unordered_set(_InputIterator __first, _InputIterator __last, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_set(__first, __last, __n, __hf, key_equal(), __a) + { } + + unordered_set(initializer_list __l, + size_type __n, + const allocator_type& __a) + : unordered_set(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_set(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_set(__l, __n, __hf, key_equal(), __a) + { } + unordered_set& operator=(const unordered_set&) = default; @@ -346,6 +381,41 @@ namespace __profile : _Base(__l, __n, __hf, __eql, __a) { } + unordered_multiset(size_type __n, const allocator_type& __a) + : unordered_multiset(__n, hasher(), key_equal(), __a) + { } + + unordered_multiset(size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multiset(__n, __hf, key_equal(), __a) + { } + + template + unordered_multiset(_InputIterator __first, _InputIterator __last, + size_type __n, + const allocator_type& __a) + : unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a) + { } + + template + unordered_multiset(_InputIterator __first, _InputIterator __last, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multiset(__first, __last, __n, __hf, key_equal(), __a) + { } + + unordered_multiset(initializer_list __l, + size_type __n, + const allocator_type& __a) + : unordered_multiset(__l, __n, hasher(), key_equal(), __a) + { } + + unordered_multiset(initializer_list __l, + size_type __n, const hasher& __hf, + const allocator_type& __a) + : unordered_multiset(__l, __n, __hf, key_equal(), __a) + { } + unordered_multiset& operator=(const unordered_multiset&) = default; -- 2.30.2