summaryrefslogtreecommitdiff
path: root/ace/RB_Tree.h
diff options
context:
space:
mode:
Diffstat (limited to 'ace/RB_Tree.h')
-rw-r--r--ace/RB_Tree.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index 12e127f7a00..22a2a4ef3d6 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -348,13 +348,6 @@ public:
/// Return reverse iterator positioned at first node in tree.
ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rend (void);
- /// Recursively tests the invariant red-black properties at each
- /// node of the tree. Returns 0 if invariant holds, else -1.
- /// This method is computationally expensive, and should only be
- /// called for testing purposes, and not in code that depends on the
- /// algorithmic complexity bounds provided by the other methods.
- int test_invariant (void);
-
// = DEPRECATED methods.
// Please migrate your code to use the new methods instead
@@ -394,6 +387,10 @@ public:
/// @deprecated
void clear (void);
+ /// Recursively tests the invariant red-black properties at each
+ /// node of the tree. Returns 0 if invariant holds, else -1.
+ int test_invariant (void);
+
protected:
// = Protected methods. These should only be called with locks held.
@@ -442,8 +439,8 @@ protected:
* RIGHT if the node is to the right of the node to be inserted,
* or EXACT if an exactly matching node already exists.
*/
- ACE_RB_Tree_Node<EXT_ID, INT_ID> *find_node (const EXT_ID &k,
- ACE_RB_Tree_Base::RB_SearchResult &result);
+ ACE_RB_Tree_Node<EXT_ID, INT_ID> *
+ find_node (const EXT_ID &k, RB_SearchResult &result);
/// Rebalance the tree after insertion of a node.
void RB_rebalance (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x);