diff options
| author | Michael Matz <matz@suse.de> | 2005-01-24 18:46:20 +0000 |
|---|---|---|
| committer | Michael Matz <matz@suse.de> | 2005-01-24 18:46:20 +0000 |
| commit | 4127a3e55ca99aff37f2bf236dd81d84230ab3ed (patch) | |
| tree | ddbdf550426e9d4960adc710851d2ebc5369a860 | |
| parent | aae65fae7bad8bcbd4c0471479eca7394a6796aa (diff) | |
Revert 2004-12-05.hammer-3_3-branch
* include/bits/stl_tree.h (_Rb_tree_rebalance,
_Rb_tree_rebalance_for_erase): Put back 'inline'.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/hammer-3_3-branch@94171 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog.hammer | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_tree.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog.hammer b/libstdc++-v3/ChangeLog.hammer index 99fe63a7abb..8b881c682a3 100644 --- a/libstdc++-v3/ChangeLog.hammer +++ b/libstdc++-v3/ChangeLog.hammer @@ -1,3 +1,9 @@ +2005-01-24 Michael Matz <matz@suse.de> + + Revert 2004-12-05. + * include/bits/stl_tree.h (_Rb_tree_rebalance, + _Rb_tree_rebalance_for_erase): Put back 'inline'. + 2005-01-12 Paolo Carlini <pcarlini@suse.de> * include/bits/stl_algobase.h (lexicographical_compare): diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index fa7e03a632f..f2378e1ac9b 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -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, |