From: Markus Trippelsdorf <markus@trippelsdorf.de>
Date: Sun, 26 Mar 2017 12:33:35 +0000 (+0000)
Subject: Fix PR80183 : _M_color not moved
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4f28d159c5718e23214ac1743d9b902ffc1e38d5;p=gcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a3b6d6d74f0..d04a1f56fac 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 cbcf7f2606f..ce7ecdaa87a 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;