diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-03-11 17:16:41 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-03-11 17:16:41 +0000 |
| commit | 7d61d9f4be283f4859a1318a65ee8ca42e9b9937 (patch) | |
| tree | 9e67aadd8ae99dd805ab22ac1fd6321478b06f8a /libstdc++-v3/include/debug/multiset.h | |
| parent | 6b4a1bd636a63c13a8762074c2a811c24594d2b7 (diff) | |
PR libstdc++/60499
* include/debug/forward_list (forward_list::operator=(forward_list&&)):
Uglify name.
* include/debug/map (map::operator=(map&&)): Likewise.
* include/debug/multimap (multimap::operator=(multimap&&)): Likewise.
* include/debug/multiset (multiset::operator=(multiset&&)): Likewise.
* include/debug/set (set::operator=(set&&)): Likewise.
* include/debug/unordered_map
(unordered_map::operator=(unordered_map&&)): Likewise.
(unordered_multimap::operator=(unordered_multimap&&)): Likewise.
* include/debug/unordered_set
(unordered_set::operator=(unordered_set&&)): Likewise.
(unordered_multiset::operator=(unordered_multiset&&)): Likewise.
* include/debug/vector (vector::operator=(vector&&)): Likewise.
* testsuite/23_containers/forward_list/debug/60499.cc: New
* testsuite/23_containers/map/debug/60499.cc: New
* testsuite/23_containers/multimap/debug/60499.cc: New
* testsuite/23_containers/multiset/debug/60499.cc: New
* testsuite/23_containers/set/debug/60499.cc: New
* testsuite/23_containers/unordered_map/debug/60499.cc: New
* testsuite/23_containers/unordered_multimap/debug/60499.cc: New
* testsuite/23_containers/unordered_multiset/debug/60499.cc: New
* testsuite/23_containers/unordered_set/debug/60499.cc: New
* testsuite/23_containers/vector/debug/60499.cc: New
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208490 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/debug/multiset.h')
| -rw-r--r-- | libstdc++-v3/include/debug/multiset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/debug/multiset.h b/libstdc++-v3/include/debug/multiset.h index bd555b3c290..ae62bf87214 100644 --- a/libstdc++-v3/include/debug/multiset.h +++ b/libstdc++-v3/include/debug/multiset.h @@ -149,10 +149,10 @@ namespace __debug noexcept(_Alloc_traits::_S_nothrow_move()) { __glibcxx_check_self_move_assign(__x); - bool xfer_memory = _Alloc_traits::_S_propagate_on_move_assign() + bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign() || __x.get_allocator() == this->get_allocator(); _M_base() = std::move(__x._M_base()); - if (xfer_memory) + if (__xfer_memory) this->_M_swap(__x); else this->_M_invalidate_all(); |