diff options
author | Markus Trippelsdorf <markus@trippelsdorf.de> | 2017-03-26 12:33:35 +0000 |
---|---|---|
committer | Markus Trippelsdorf <markus@trippelsdorf.de> | 2017-03-26 12:33:35 +0000 |
commit | 1cb7ac6ca1556d30b05ec3213a6e88d5e35a4172 (patch) | |
tree | e68368bd05421a37cf5e60172db915bc7e855eae /libstdc++-v3 | |
parent | 91868960f3a0c519c24e99b7788f784e48f956bb (diff) |
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@246483 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_tree.h | 1 |
2 files changed, 7 insertions, 0 deletions
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; |