From 68e601d879ea9295228f4111aaaa101607757da9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 27 Nov 2017 16:43:39 +0000 Subject: [PATCH] Fix std::unordered_map deduction guide 2017-11-27 Stephan Bergmann * include/bits/unordered_map.h (unordered_map): Fix deduction guide. * include/debug/unordered_map (unordered_map): Likewise. From-SVN: r255174 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/unordered_map.h | 2 +- libstdc++-v3/include/debug/unordered_map | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d098ccc7416..44641ebe559 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2017-11-27 Stephan Bergmann + + * include/bits/unordered_map.h (unordered_map): Fix deduction guide. + * include/debug/unordered_map (unordered_map): Likewise. + 2017-11-23 Jonathan Wakely * 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 cb5bcb89a16..27c89f172e1 100644 --- 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 = _RequireAllocator<_Allocator>> unordered_map(initializer_list>, _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 c5734304846..c68ccaa3372 100644 --- 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 = _RequireAllocator<_Allocator>> unordered_map(initializer_list>, _Allocator) -> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>; -- 2.30.2