OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
François Dumont 2014-03-23 20:19:11 +00:00
parent d570d678a4
commit f7279c1a01
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -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>
PR libstdc++/60623

15
libstdc++-v3/include/bits/hashtable.h
View File

@ -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)
{ }