ChangeLogTag:Sun Jul 4 12:34:24 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

4 files changed, 23 insertions, 15 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index ea263e7f7c4..89570f064a0 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,5 +1,9 @@
 Sun Jul  4 12:34:24 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
+	* tests/Thread_Pool_Test.cpp (open): We need to define 'int i'
+	  outside of the for loop to keep EGCS from complaining for some
+ 	  reason.
+
 	* ace/Timer_Heap_T.cpp: Reformatted this code to conform to 
 	  the ACE programming guidelines.
 	
@@ -7,10 +11,10 @@ Sun Jul  4 12:34:24 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 	  allocator failure with the ACE_ALLOCATOR_RETURN macro.
 
 	* ace/RB_Tree.cpp: Modified Carlo's change so that we add an
-	  extra set of parens rather than using a new macro.  This is
- 	  consistent with how we deal with this problem in other parts of
- 	  ACE.
-	
+	  extra set of parens in a special way, rather than using a new
+ 	  macro.  This is more consistent with how we deal with this
+ 	  problem in other parts of ACE.	
+  
 	* ace/RB_Tree.cpp (insert_i): Removed an unreachable statement.
 	  Thanks to David Levine for reporting this.
 
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_;
diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp
index 14bc973287d..b840cbe28bd 100644
--- a/tests/Thread_Pool_Test.cpp
+++ b/tests/Thread_Pool_Test.cpp
@@ -203,7 +203,9 @@ Thread_Pool::open (void *)
                                      &this->lock_adapter_),
                   -1);
 
-  for (int i = this->thr_count (); i > 0; i--)
+  int i; // We need to define 'i' here to keep EGCS from complaining...
+
+  for (i = this->thr_count (); i > 0; i--)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("(%t) EOF, enqueueing NULL block for thread = %d\n"),