qemu/gcc-stl-multiple-defs.diff

21 lines
631 B
Diff

--- libstdc++-v3/include/bits/stl_tree.h.orig 2005-01-20 11:11:09.000000000 +0000
+++ libstdc++-v3/include/bits/stl_tree.h 2005-01-20 11:05:06.000000000 +0000
@@ -302,7 +302,7 @@ namespace std
__x->_M_parent = __y;
}
- void
+ inline void
_Rb_tree_rebalance(_Rb_tree_node_base* __x, _Rb_tree_node_base*& __root)
{
__x->_M_color = _M_red;
@@ -357,7 +357,7 @@ namespace std
__root->_M_color = _M_black;
}
- _Rb_tree_node_base*
+ inline _Rb_tree_node_base*
_Rb_tree_rebalance_for_erase(_Rb_tree_node_base* __z,
_Rb_tree_node_base*& __root,
_Rb_tree_node_base*& __leftmost,