From dc448fa03b361f130e7b4554d5e0e5d52e06c891 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Mon, 27 Jun 2016 20:41:59 +0000 Subject: [PATCH] re PR libstdc++/71640 (include/c++/7.0.0/bits/hashtable.h:293:7: error: too many template parameters in template redeclaration) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2016-06-27 François Dumont PR libstdc++/71640 * include/bits/hashtable.h: Remove _Unique_keya parameter in _Insert friend declaration. From-SVN: r237803 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/hashtable.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 87f65a3168a..c7e0b326ff8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2016-06-27 François Dumont + + PR libstdc++/71640 + * include/bits/hashtable.h: Remove _Unique_keya parameter in _Insert + friend declaration. + 2016-06-23 François Dumont * include/debug/array (array<>::swap): Fix noexcept qualificaton for diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 05f27b42423..6d7134a8a30 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -294,7 +294,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typename _ExtractKeya, typename _Equala, typename _H1a, typename _H2a, typename _Hasha, typename _RehashPolicya, typename _Traitsa, - bool _Constant_iteratorsa, bool _Unique_keysa> + bool _Constant_iteratorsa> friend struct __detail::_Insert; public: -- 2.30.2