diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-11-11 10:41:46 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-11-11 10:41:46 +0000 |
| commit | e9c51193eaa1ccb0fd3dd1b66629e2001f3bdb35 (patch) | |
| tree | 11d56d0164801ae0b216bb12b45f676397cbd285 | |
| parent | 33c430b50424ec31c83603616fc94671fc7ffac2 (diff) | |
| download | gcc-e9c51193eaa1ccb0fd3dd1b66629e2001f3bdb35.zip gcc-e9c51193eaa1ccb0fd3dd1b66629e2001f3bdb35.tar.gz gcc-e9c51193eaa1ccb0fd3dd1b66629e2001f3bdb35.tar.bz2 | |
re PR libstdc++/63811 (r217322 breaks bootstrap)
PR libstdc++/63811
* include/bits/stl_deque.h (_Deque_base::_M_move_impl()): Avoid using
badname.
From-SVN: r217343
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_deque.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0f33b7a..2a8fb6c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2014-11-11 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/63811 + * include/bits/stl_deque.h (_Deque_base::_M_move_impl()): Avoid using + badname. + 2014-11-10 Jonathan Wakely <jwakely@redhat.com> * include/bits/stl_deque.h (_Deque_base::_Deque_base(_Deque_base&&)): diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index c0052b3..3a1c85d 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -642,7 +642,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER // Create a copy of the current allocator. _Tp_alloc_type __alloc{_M_get_Tp_allocator()}; // Put that copy in a moved-from state. - _Tp_alloc_type __unused __attribute((__unused__)) {std::move(__alloc)}; + _Tp_alloc_type __sink __attribute((__unused__)) {std::move(__alloc)}; // Create an empty map that allocates using the moved-from allocator. _Deque_base __empty{__alloc}; // Now safe to modify current allocator and perform non-throwing swaps. |