This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Uglify _Rb_tree<>::destroy_node
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 01 Dec 2006 16:28:06 +0100
- Subject: [v3] Uglify _Rb_tree<>::destroy_node
Hi,
noticed while working on 29385 in mainline, tested x86-linux, committed
to 4_2-branch.
Paolo.
//////////////
2006-12-01 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_tree.h (_Rb_tree<>::destroy_node): Uglify.
(_M_erase, erase(iterator), erase(const_iterator)): Adjust.
Index: include/bits/stl_tree.h
===================================================================
--- include/bits/stl_tree.h (revision 119399)
+++ include/bits/stl_tree.h (working copy)
@@ -395,7 +395,7 @@
}
void
- destroy_node(_Link_type __p)
+ _M_destroy_node(_Link_type __p)
{
get_allocator().destroy(&__p->_M_value_field);
_M_put_node(__p);
@@ -1245,7 +1245,7 @@
static_cast<_Link_type>(_Rb_tree_rebalance_for_erase
(__position._M_node,
this->_M_impl._M_header));
- destroy_node(__y);
+ _M_destroy_node(__y);
--_M_impl._M_node_count;
}
@@ -1259,7 +1259,7 @@
static_cast<_Link_type>(_Rb_tree_rebalance_for_erase
(const_cast<_Base_ptr>(__position._M_node),
this->_M_impl._M_header));
- destroy_node(__y);
+ _M_destroy_node(__y);
--_M_impl._M_node_count;
}
@@ -1322,7 +1322,7 @@
{
_M_erase(_S_right(__x));
_Link_type __y = _S_left(__x);
- destroy_node(__x);
+ _M_destroy_node(__x);
__x = __y;
}
}