Fix std::unordered_map deduction guide

2017-11-27  Stephan Bergmann  <sbergman@redhat.com>

	* include/bits/unordered_map.h (unordered_map): Fix deduction guide.
	* include/debug/unordered_map (unordered_map): Likewise.

From-SVN: r255174

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d098ccc74165e589d9c368ed90390f36c7dbf79d..44641ebe5596cd2ca11feccfa73325123ec250d6 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-27  Stephan Bergmann  <sbergman@redhat.com>
+
+       * include/bits/unordered_map.h (unordered_map): Fix deduction guide.
+       * include/debug/unordered_map (unordered_map): Likewise.
+
 2017-11-23  Jonathan Wakely  <jwakely@redhat.com>
 
        * libsupc++/new (launder): Add nodiscard attribute.

diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h
index cb5bcb89a163d9ee4866df434fbfa77d1cb20e02..27c89f172e1f22301bd6031e3aa4941317db76be 100644 (file)
--- a/libstdc++-v3/include/bits/unordered_map.h
+++ b/libstdc++-v3/include/bits/unordered_map.h
@@ -1193,7 +1193,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
     -> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
 
   template<typename _Key, typename _Tp, typename _Allocator,
-          _RequireAllocator<_Allocator>>
+          typename = _RequireAllocator<_Allocator>>
     unordered_map(initializer_list<pair<_Key, _Tp>>, _Allocator)
     -> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
 

diff --git a/libstdc++-v3/include/debug/unordered_map b/libstdc++-v3/include/debug/unordered_map
index c5734304846438c3dbd6c44503468339c86cc82f..c68ccaa3372593cc633f8cac8df40dbd7317994f 100644 (file)
--- a/libstdc++-v3/include/debug/unordered_map
+++ b/libstdc++-v3/include/debug/unordered_map
@@ -679,7 +679,7 @@ namespace __debug
     -> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
 
   template<typename _Key, typename _Tp, typename _Allocator,
-          _RequireAllocator<_Allocator>>
+          typename = _RequireAllocator<_Allocator>>
     unordered_map(initializer_list<pair<_Key, _Tp>>, _Allocator)
     -> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;