This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Trivial clean-up patch for stl_tree


Hello,

Here's a trivial clean-up patch for stl_tree. I noticed a few months ago but, well, this is clearly not urgent for anyone...

I was also thinking of contributing other patches for stl_tree.h to factorize some of the code, unless there is any objection or perhaps this is not the right time for such patches which may well change the ABI? - How's that for a run-on sentence ;-)

Cheers,

Gawain

Index: include/bits/stl_tree.h
===================================================================
--- include/bits/stl_tree.h	(revision 115685)
+++ include/bits/stl_tree.h	(working copy)
@@ -306,14 +306,6 @@
     { return __x._M_node != __y._M_node; }
 
   void
-  _Rb_tree_rotate_left(_Rb_tree_node_base* const __x,
-                       _Rb_tree_node_base*& __root);
-
-  void
-  _Rb_tree_rotate_right(_Rb_tree_node_base* const __x,
-                        _Rb_tree_node_base*& __root);
-
-  void
   _Rb_tree_insert_and_rebalance(const bool __insert_left,
                                 _Rb_tree_node_base* __x,
                                 _Rb_tree_node_base* __p,
Index: src/tree.cc
===================================================================
--- src/tree.cc	(revision 115685)
+++ src/tree.cc	(working copy)
@@ -120,7 +120,7 @@
     return _Rb_tree_decrement(const_cast<_Rb_tree_node_base*>(__x));
   }
 
-  void 
+  static void 
   _Rb_tree_rotate_left(_Rb_tree_node_base* const __x, 
 		       _Rb_tree_node_base*& __root)
   {
@@ -141,7 +141,7 @@
     __x->_M_parent = __y;
   }
 
-  void 
+  static void 
   _Rb_tree_rotate_right(_Rb_tree_node_base* const __x, 
 			_Rb_tree_node_base*& __root)
   {

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]