diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-01-09 18:38:52 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-01-09 18:38:52 +0000 |
| commit | f0bc4aead81f19574ae543f3ce9e9849a2b6bec8 (patch) | |
| tree | c263060a71cfba60f6595a2ce5e81d11b50d2789 | |
| parent | b248fef88f39ff612263c471f514f84f0feaa017 (diff) | |
| download | gcc-f0bc4aead81f19574ae543f3ce9e9849a2b6bec8.zip gcc-f0bc4aead81f19574ae543f3ce9e9849a2b6bec8.tar.gz gcc-f0bc4aead81f19574ae543f3ce9e9849a2b6bec8.tar.bz2 | |
re PR libstdc++/59738 (r206444 caused FAIL: 23_containers/vector/52591.cc)
PR libstdc++/59738
* include/bits/stl_vector.h (vector<>::_M_move_assign): Restore
support for non-Movable types.
From-SVN: r206480
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_vector.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 965b091..78cce64 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2014-01-09 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/59738 + * include/bits/stl_vector.h (vector<>::_M_move_assign): Restore + support for non-Movable types. + 2014-01-08 François Dumont <fdumont@gcc.gnu.org> * include/bits/stl_vector.h (std::vector<>::_M_move_assign): Pass diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 3638a8c..2cedd39 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -1433,7 +1433,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER void _M_move_assign(vector&& __x, std::true_type) noexcept { - const vector __tmp(std::move(*this), get_allocator()); + vector __tmp(get_allocator()); + this->_M_impl._M_swap_data(__tmp._M_impl); this->_M_impl._M_swap_data(__x._M_impl); if (_Alloc_traits::_S_propagate_on_move_assign()) std::__alloc_on_move(_M_get_Tp_allocator(), |