diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-07-04 18:23:12 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-07-04 18:23:12 +0000 |
| commit | 523aa4a484f446b3ebd1334849f4af26a7371e3f (patch) | |
| tree | fc711a38bc92e1e0b95734bc2ef616d189508177 /ace | |
| parent | 82b367d03acf1087f5cdfa93d9b057bbf81a1d80 (diff) | |
| download | ATCD-523aa4a484f446b3ebd1334849f4af26a7371e3f.tar.gz | |
ChangeLogTag:Sun Jul 4 12:34:24 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Connector.cpp | 10 | ||||
| -rw-r--r-- | ace/RB_Tree.cpp | 12 |
2 files changed, 12 insertions, 10 deletions
diff --git a/ace/Connector.cpp b/ace/Connector.cpp index b77fe99f276..02d3e1d54b8 100644 --- a/ace/Connector.cpp +++ b/ace/Connector.cpp @@ -747,7 +747,8 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open else if (this->creation_strategy_ == 0) { ACE_NEW_RETURN (this->creation_strategy_, - CREATION_STRATEGY, -1); + CREATION_STRATEGY, + -1); this->delete_creation_strategy_ = 1; } @@ -768,11 +769,11 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open else if (this->connect_strategy_ == 0) { ACE_NEW_RETURN (this->connect_strategy_, - CONNECT_STRATEGY, -1); + CONNECT_STRATEGY, + -1); this->delete_connect_strategy_ = 1; } - // Initialize the concurrency strategy. if (this->concurrency_strategy_ != 0 && @@ -789,7 +790,8 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open else if (this->concurrency_strategy_ == 0) { ACE_NEW_RETURN (this->concurrency_strategy_, - CONCURRENCY_STRATEGY, -1); + CONCURRENCY_STRATEGY, + -1); this->delete_concurrency_strategy_ = 1; } diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp index cd58d7829e6..e1dcc5a859e 100644 --- a/ace/RB_Tree.cpp +++ b/ace/RB_Tree.cpp @@ -591,7 +591,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0; ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t)), + (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), 0); current->right (tmp); @@ -622,7 +622,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, // The left subtree is empty: insert new node there. ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0; ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t)), + (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), 0); current->left (tmp); @@ -643,7 +643,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, // The tree is empty: insert at the root and color the root // black. ACE_NEW_RETURN (root_, - (ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t)), + (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), 0); if (root_) { @@ -702,7 +702,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, // The right subtree is empty: insert new node there. ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0; ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t)), + (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), -1); current->right (tmp); @@ -733,7 +733,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, // The left subtree is empty: insert new node there. ACE_RB_Tree_Node<EXT_ID, INT_ID> *tmp = 0; ACE_NEW_RETURN (tmp, - (ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t)), + (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), -1); current->left (tmp); // If the node was successfully inserted, set its @@ -752,7 +752,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, { // The tree is empty: insert at the root and color the root black. ACE_NEW_RETURN (root_, - (ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t)), + (ACE_RB_Tree_Node<EXT_ID, INT_ID>) (k, t), -1); root_->color (ACE_RB_Tree_Node_Base::BLACK); ++current_size_; |