From f7279c1a01e6c8ca4146638eb1f8357e81992e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Dumont?= Date: Sun, 23 Mar 2014 20:19:11 +0000 Subject: [PATCH] hashtable.h (_Hashtable(allocator_type)): Fix call to delegated constructor. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2014-03-23 François Dumont * include/bits/hashtable.h (_Hashtable(allocator_type)): Fix call to delegated constructor. (_Hashtable(size_type, _H1, key_equal, allocator_type)): Likewise. (_Hashtable<_It>(_It, _It, size_type, _H1, key_equal, allocator_type)): Likewise. (_Hashtable( initializer_list, size_type, _H1, key_equal, allocator_type)): Likewise. From-SVN: r208775 --- libstdc++-v3/ChangeLog | 10 ++++++++++ libstdc++-v3/include/bits/hashtable.h | 15 +++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7fb95e32ac4..455c28df664 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2014-03-23 François Dumont + + * include/bits/hashtable.h (_Hashtable(allocator_type)): Fix call + to delegated constructor. + (_Hashtable(size_type, _H1, key_equal, allocator_type)): Likewise. + (_Hashtable<_It>(_It, _It, size_type, _H1, key_equal, allocator_type)): + Likewise. + (_Hashtable( + initializer_list, size_type, _H1, key_equal, allocator_type)): Likewise. + 2014-03-23 John David Anglin PR libstdc++/60623 diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 4297c5fc750..22e17d29d7b 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -372,9 +372,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Use delegating constructors. explicit _Hashtable(const allocator_type& __a) - : _Hashtable(10, _H1(), __detail::_Mod_range_hashing(), - __detail::_Default_ranged_hash(), key_equal(), - __key_extract(), __a) + : _Hashtable(10, _H1(), _H2(), _Hash(), key_equal(), + __key_extract(), __a) { } explicit @@ -382,8 +381,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _H1& __hf = _H1(), const key_equal& __eql = key_equal(), const allocator_type& __a = allocator_type()) - : _Hashtable(__n, __hf, __detail::_Mod_range_hashing(), - __detail::_Default_ranged_hash(), __eql, + : _Hashtable(__n, __hf, _H2(), _Hash(), __eql, __key_extract(), __a) { } @@ -393,8 +391,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _H1& __hf = _H1(), const key_equal& __eql = key_equal(), const allocator_type& __a = allocator_type()) - : _Hashtable(__f, __l, __n, __hf, __detail::_Mod_range_hashing(), - __detail::_Default_ranged_hash(), __eql, + : _Hashtable(__f, __l, __n, __hf, _H2(), _Hash(), __eql, __key_extract(), __a) { } @@ -403,9 +400,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _H1& __hf = _H1(), const key_equal& __eql = key_equal(), const allocator_type& __a = allocator_type()) - : _Hashtable(__l.begin(), __l.end(), __n, __hf, - __detail::_Mod_range_hashing(), - __detail::_Default_ranged_hash(), __eql, + : _Hashtable(__l.begin(), __l.end(), __n, __hf, _H2(), _Hash(), __eql, __key_extract(), __a) { }