aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Dumont <fdumont@gcc.gnu.org>2016-06-27 20:41:59 +0000
committerFrançois Dumont <fdumont@gcc.gnu.org>2016-06-27 20:41:59 +0000
commitdc448fa03b361f130e7b4554d5e0e5d52e06c891 (patch)
treed032121e886222d5a3f1de731d3fb435041d0a3f
parentb65ffc79534154d83d1fb456ee7c1c306ce37899 (diff)
downloadgcc-dc448fa03b361f130e7b4554d5e0e5d52e06c891.zip
gcc-dc448fa03b361f130e7b4554d5e0e5d52e06c891.tar.gz
gcc-dc448fa03b361f130e7b4554d5e0e5d52e06c891.tar.bz2
re PR libstdc++/71640 (include/c++/7.0.0/bits/hashtable.h:293:7: error: too many template parameters in template redeclaration)
2016-06-27 François Dumont <fdumont@gcc.gnu.org> PR libstdc++/71640 * include/bits/hashtable.h: Remove _Unique_keya parameter in _Insert friend declaration. From-SVN: r237803
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/bits/hashtable.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 87f65a3..c7e0b32 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-27 François Dumont <fdumont@gcc.gnu.org>
+
+ PR libstdc++/71640
+ * include/bits/hashtable.h: Remove _Unique_keya parameter in _Insert
+ friend declaration.
+
2016-06-23 François Dumont <fdumont@gcc.gnu.org>
* 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 05f27b4..6d7134a 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: