summaryrefslogtreecommitdiff
path: root/ace/RB_Tree.cpp
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-04-23 04:43:59 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-04-23 04:43:59 +0000
commita7c03cabf931b077d70c6f80ec02c7728a429f49 (patch)
tree61d38d262d43ac77fc2ad94c9e7e850cd5607622 /ace/RB_Tree.cpp
parent2aa7b10780ad7c670f588dce4ec341351a0646aa (diff)
downloadATCD-a7c03cabf931b077d70c6f80ec02c7728a429f49.tar.gz
ChangeLogTag:Sat Apr 22 20:53:11 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'ace/RB_Tree.cpp')
-rw-r--r--ace/RB_Tree.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 96a895de393..7a95a277662 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -58,7 +58,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (ACE_Allocator
"ACE_RB_Tree (ACE_Allocator *alloc)");
if (this->open (alloc) == -1)
ACE_ERROR ((LM_ERROR,
- ASYS_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n")));
+ ACE_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n")));
}
// Copy constructor.
@@ -138,14 +138,14 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre
if (! x)
ACE_ERROR ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("\nerror: x is a null pointer in ")
- ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("\nerror: x is a null pointer in ")
+ ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
else if (! (x->left()))
ACE_ERROR ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("\nerror: x->left () is a null pointer in ")
- ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("\nerror: x->left () is a null pointer in ")
+ ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
else
{
ACE_RB_Tree_Node<EXT_ID, INT_ID> * y;
@@ -177,14 +177,14 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree
if (! x)
ACE_ERROR ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("\nerror: x is a null pointer in ")
- ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("\nerror: x is a null pointer in ")
+ ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
else if (! (x->right()))
ACE_ERROR ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("\nerror: x->right () is a null pointer ")
- ASYS_TEXT ("in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("\nerror: x->right () is a null pointer ")
+ ACE_TEXT ("in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
else
{
ACE_RB_Tree_Node<EXT_ID, INT_ID> * y;
@@ -383,9 +383,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_N
{
// If we got here, something is drastically wrong!
ACE_ERROR ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("\nerror: parent's parent is null in ")
- ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n")));
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("\nerror: parent's parent is null in ")
+ ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n")));
return;
}
@@ -581,9 +581,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
if (current->right ())
// If there is already a right subtree, complain.
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("\nright subtree already present in ")
- ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("\nright subtree already present in ")
+ ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
0);
else
{
@@ -613,9 +613,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
if (current->left ())
// If there is already a left subtree, complain.
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("\nleft subtree already present in ")
- ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("\nleft subtree already present in ")
+ ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
0);
else
{
@@ -692,9 +692,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
{
// If there is already a right subtree, complain.
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("\nright subtree already present in ")
- ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("\nright subtree already present in ")
+ ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
-1);
}
else
@@ -724,9 +724,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
if (current->left ())
// If there is already a left subtree, complain.
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("\nleft subtree already present in ")
- ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("\nleft subtree already present in ")
+ ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
-1);
else
{