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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0f33b7aa5ad5e05dba33bca471324e3ae7328ff3..2a8fb6c239fd445a139f0798dcbe723451739f94 100644 (file)
--- 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 c0052b39b04d83d4810a185c351a0d3325263df5..3a1c85da0bbd1a5e228aff88cc30c95ebbc695c1 100644 (file)
--- 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.