diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-11-27 16:43:39 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-11-27 16:43:39 +0000 |
| commit | 68e601d879ea9295228f4111aaaa101607757da9 (patch) | |
| tree | 9526c723ee371e041edb8b425501975113472bdd | |
| parent | 42f7424573fbf889f9857ace32bf8bb364bb2146 (diff) | |
| download | gcc-68e601d879ea9295228f4111aaaa101607757da9.zip gcc-68e601d879ea9295228f4111aaaa101607757da9.tar.gz gcc-68e601d879ea9295228f4111aaaa101607757da9.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/unordered_map.h | 2 | ||||
| -rw-r--r-- | 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 d098ccc..44641eb 100644 --- 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 cb5bcb8..27c89f1 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 _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 c573430..c68ccaa 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 _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>; |