diff options
| author | fdumont <fdumont@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-10-27 12:20:18 +0000 |
|---|---|---|
| committer | fdumont <fdumont@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-10-27 12:20:18 +0000 |
| commit | 2fd6d330ddb86189a2a33adb4554aed1de7041c6 (patch) | |
| tree | debbb2fe9eace0f2432c1f441c4d639bf4eba0d4 /libstdc++-v3/include/debug | |
| parent | 1a2798acf9209c4b0136a54fcea392db89111fc6 (diff) | |
| download | ppe42-gcc-2fd6d330ddb86189a2a33adb4554aed1de7041c6.tar.gz ppe42-gcc-2fd6d330ddb86189a2a33adb4554aed1de7041c6.zip | |
2012-10-27 François Dumont <fdumont@gcc.gnu.org>
* include/bits/unordered_map.h (unordered_map<>): Prefer
aggregation to inheritance with _Hashtable.
(unordered_multimap<>): Likewise.
* include/bits/unordered_set.h
(unordered_set<>(const unordered_set&)): Use default
implementation.
(unordered_set<>(unordered_set&&)): Likewise.
(unordered_set<>::operator=(const unordered_set&)): Likewise.
(unordered_set<>::operator=(unordered_set&&)): Likewise.
(unordered_multiset<>(const unordered_multiset&)): Likewise.
(unordered_multiset<>(unordered_multiset&&)): Likewise.
(unordered_multiset<>::operator=(const unordered_multiset&)):
Likewise.
(unordered_multiset<>::operator=(unordered_multiset&&)): Likewise.
* include/debug/unordered_map (operator==): Adapt.
* include/profile/unordered_map (operator==): Adapt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192876 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/debug')
| -rw-r--r-- | libstdc++-v3/include/debug/unordered_map | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/debug/unordered_map b/libstdc++-v3/include/debug/unordered_map index b03772d4cae..16cf1768e42 100644 --- a/libstdc++-v3/include/debug/unordered_map +++ b/libstdc++-v3/include/debug/unordered_map @@ -482,7 +482,7 @@ namespace __debug inline bool operator==(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x, const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y) - { return __x._M_equal(__y); } + { return __x._M_base() == __y._M_base(); } template<typename _Key, typename _Tp, typename _Hash, typename _Pred, typename _Alloc> @@ -929,7 +929,7 @@ namespace __debug inline bool operator==(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x, const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y) - { return __x._M_equal(__y); } + { return __x._M_base() == __y._M_base(); } template<typename _Key, typename _Tp, typename _Hash, typename _Pred, typename _Alloc> |
