aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Trippelsdorf <markus@trippelsdorf.de>2017-03-26 12:33:35 +0000
committerMarkus Trippelsdorf <trippels@gcc.gnu.org>2017-03-26 12:33:35 +0000
commit4f28d159c5718e23214ac1743d9b902ffc1e38d5 (patch)
treee68368bd05421a37cf5e60172db915bc7e855eae
parent353a1e29cd7a74dfee4a15b6edb13d564f139656 (diff)
downloadgcc-4f28d159c5718e23214ac1743d9b902ffc1e38d5.zip
gcc-4f28d159c5718e23214ac1743d9b902ffc1e38d5.tar.gz
gcc-4f28d159c5718e23214ac1743d9b902ffc1e38d5.tar.bz2
Fix PR80183 : _M_color not moved
PR libstdc++/80183 * include/bits/stl_tree.h: (_Rb_tree_header::_M_move_data(_Rb_tree_header&)): Also save _M_color. From-SVN: r246483
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/bits/stl_tree.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a3b6d6d..d04a1f5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-26 Markus Trippelsdorf <markus@trippelsdorf.de>
+
+ PR libstdc++/80183
+ * include/bits/stl_tree.h:
+ (_Rb_tree_header::_M_move_data(_Rb_tree_header&)): Also save _M_color.
+
2017-03-23 Jonathan Wakely <jwakely@redhat.com>
* testsuite/23_containers/array/tuple_interface/
diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h
index cbcf7f2..ce7ecda 100644
--- a/libstdc++-v3/include/bits/stl_tree.h
+++ b/libstdc++-v3/include/bits/stl_tree.h
@@ -192,6 +192,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void
_M_move_data(_Rb_tree_header& __from)
{
+ _M_header._M_color = __from._M_header._M_color;
_M_header._M_parent = __from._M_header._M_parent;
_M_header._M_left = __from._M_header._M_left;
_M_header._M_right = __from._M_header._M_right;