Skip to content

Commit 3d89c3a

Browse files
author
redi
committed
Fix std::unordered_map deduction guide
2017-11-27 Stephan Bergmann <[email protected]> * include/bits/unordered_map.h (unordered_map): Fix deduction guide. * include/debug/unordered_map (unordered_map): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@255174 138bc75d-0d04-0410-961f-82ee72b054a4
1 parent b77d2ec commit 3d89c3a

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

libstdc++-v3/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2017-11-27 Stephan Bergmann <[email protected]>
2+
3+
* include/bits/unordered_map.h (unordered_map): Fix deduction guide.
4+
* include/debug/unordered_map (unordered_map): Likewise.
5+
16
2017-11-23 Jonathan Wakely <[email protected]>
27

38
* libsupc++/new (launder): Add nodiscard attribute.

libstdc++-v3/include/bits/unordered_map.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
11931193
-> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
11941194

11951195
template<typename _Key, typename _Tp, typename _Allocator,
1196-
_RequireAllocator<_Allocator>>
1196+
typename = _RequireAllocator<_Allocator>>
11971197
unordered_map(initializer_list<pair<_Key, _Tp>>, _Allocator)
11981198
-> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
11991199

libstdc++-v3/include/debug/unordered_map

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ namespace __debug
679679
-> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
680680

681681
template<typename _Key, typename _Tp, typename _Allocator,
682-
_RequireAllocator<_Allocator>>
682+
typename = _RequireAllocator<_Allocator>>
683683
unordered_map(initializer_list<pair<_Key, _Tp>>, _Allocator)
684684
-> unordered_map<_Key, _Tp, hash<_Key>, equal_to<_Key>, _Allocator>;
685685

0 commit comments

Comments
 (0)