diff options
Diffstat (limited to 'libstdc++-v3/include/debug/unordered_set')
| -rw-r--r-- | libstdc++-v3/include/debug/unordered_set | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libstdc++-v3/include/debug/unordered_set b/libstdc++-v3/include/debug/unordered_set index 3bc3fab5610..a17efd0a5fe 100644 --- a/libstdc++-v3/include/debug/unordered_set +++ b/libstdc++-v3/include/debug/unordered_set @@ -142,10 +142,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(); @@ -593,10 +593,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(); |
