hashtable.h (_Hashtable(allocator_type)): Fix call to delegated constructor.
2014-03-23 François Dumont <fdumont@gcc.gnu.org> * 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
This commit is contained in:
parent
d570d678a4
commit
f7279c1a01
|
@ -1,3 +1,13 @@
|
||||||
|
2014-03-23 François Dumont <fdumont@gcc.gnu.org>
|
||||||
|
|
||||||
|
* 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 <danglin@gcc.gnu.org>
|
2014-03-23 John David Anglin <danglin@gcc.gnu.org>
|
||||||
|
|
||||||
PR libstdc++/60623
|
PR libstdc++/60623
|
||||||
|
|
|
@ -372,9 +372,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
// Use delegating constructors.
|
// Use delegating constructors.
|
||||||
explicit
|
explicit
|
||||||
_Hashtable(const allocator_type& __a)
|
_Hashtable(const allocator_type& __a)
|
||||||
: _Hashtable(10, _H1(), __detail::_Mod_range_hashing(),
|
: _Hashtable(10, _H1(), _H2(), _Hash(), key_equal(),
|
||||||
__detail::_Default_ranged_hash(), key_equal(),
|
__key_extract(), __a)
|
||||||
__key_extract(), __a)
|
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
explicit
|
explicit
|
||||||
|
@ -382,8 +381,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
const _H1& __hf = _H1(),
|
const _H1& __hf = _H1(),
|
||||||
const key_equal& __eql = key_equal(),
|
const key_equal& __eql = key_equal(),
|
||||||
const allocator_type& __a = allocator_type())
|
const allocator_type& __a = allocator_type())
|
||||||
: _Hashtable(__n, __hf, __detail::_Mod_range_hashing(),
|
: _Hashtable(__n, __hf, _H2(), _Hash(), __eql,
|
||||||
__detail::_Default_ranged_hash(), __eql,
|
|
||||||
__key_extract(), __a)
|
__key_extract(), __a)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
|
@ -393,8 +391,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
const _H1& __hf = _H1(),
|
const _H1& __hf = _H1(),
|
||||||
const key_equal& __eql = key_equal(),
|
const key_equal& __eql = key_equal(),
|
||||||
const allocator_type& __a = allocator_type())
|
const allocator_type& __a = allocator_type())
|
||||||
: _Hashtable(__f, __l, __n, __hf, __detail::_Mod_range_hashing(),
|
: _Hashtable(__f, __l, __n, __hf, _H2(), _Hash(), __eql,
|
||||||
__detail::_Default_ranged_hash(), __eql,
|
|
||||||
__key_extract(), __a)
|
__key_extract(), __a)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
|
@ -403,9 +400,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
const _H1& __hf = _H1(),
|
const _H1& __hf = _H1(),
|
||||||
const key_equal& __eql = key_equal(),
|
const key_equal& __eql = key_equal(),
|
||||||
const allocator_type& __a = allocator_type())
|
const allocator_type& __a = allocator_type())
|
||||||
: _Hashtable(__l.begin(), __l.end(), __n, __hf,
|
: _Hashtable(__l.begin(), __l.end(), __n, __hf, _H2(), _Hash(), __eql,
|
||||||
__detail::_Mod_range_hashing(),
|
|
||||||
__detail::_Default_ranged_hash(), __eql,
|
|
||||||
__key_extract(), __a)
|
__key_extract(), __a)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue