*** empty log message ***

4 files changed, 47 insertions, 26 deletions

diff --git a/ChangeLog-98b b/ChangeLog-98b
index f42e2c93b2a..b57383e0565 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,10 @@
+Sun Aug  9 09:17:16 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/Strategies_T.cpp (connect_svc_handler): Changed the call to
+ 	  this->CONNECT_STRATEGIES::connect_svc_handler() to avoid compile
+ 	  problems with GCC on LynxOS.  Thanks to Sergio for reporting
+ 	  this.
+
 Sat Aug  8 09:37:27 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* ace/INET_Addr.cpp: 
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index fc103a290f6..73badf81bfc 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,9 @@
+Sun Aug  9 08:51:58 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/Trader/Trader.cpp: Added a #include of
+ 	  Offer_Iterators_T.h so that the code will compile on VxWorks.
+  	  Thanks to Sergio for reporting this.
+
 Sun Aug  9 000:45:55 1998  Jeff Parsons <jp4@cs.wustl.edu>
 
 	* Param_Test/client.dsp:
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index 4a726654ffb..63ad3f9332c 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -511,13 +511,13 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
 
             // Actively establish the connection.  This is a timed
             // blocking connect.
-            if (CONNECT_STRATEGY::connect_svc_handler (sh,
-                                                       remote_addr,
-                                                       timeout,
-                                                       local_addr,
-                                                       reuse_addr,
-                                                       flags,
-                                                       perms) == -1)
+            if (this->CONNECT_STRATEGY::connect_svc_handler (sh,
+                                                             remote_addr,
+                                                             timeout,
+                                                             local_addr,
+                                                             reuse_addr,
+                                                             flags,
+                                                             perms) == -1)
               {
                 // If connect() failed because of timeouts, we have to
                 // reject the connection entirely. This is necessary
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index f0f0c05112c..0300614a1ae 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -784,15 +784,15 @@ public:
   // Checks to see if there is already a <SVC_HANDLER> in the cache
   // connected to the <remote_addr>.  If so, we return this pointer.
   // Otherwise we establish the connection, put it into the cache, and
-  // return the <SVC_HANDLER> pointer.
-  // <[NOTE]>: the <{reuse_addr}> argument does NOT control re-use of
-  // addresses in the cache.  Rather, if the underlying protocol
-  // requires a "dead time" prior to re-use of its addresses (TCP
-  // is a classic example of this), <{and}> the protocol provides a means
-  // by which to defeat the dead time, setting this argument to non-zero
-  // will defeat the dead-time requirement.  <{Dev. Note: We might want
-  // to consider enhancing the interface at some point so that this also
-  // controls re-use of the cache.}>
+  // return the <SVC_HANDLER> pointer.  <[NOTE]>: the <{reuse_addr}>
+  // argument does NOT control re-use of addresses in the cache.
+  // Rather, if the underlying protocol requires a "dead time" prior
+  // to re-use of its addresses (TCP is a classic example of this),
+  // <{and}> the protocol provides a means by which to defeat the dead
+  // time, setting this argument to non-zero will defeat the dead-time
+  // requirement.  <{Dev. Note: We might want to consider enhancing
+  // the interface at some point so that this also controls re-use of
+  // the cache.}>
 
   virtual int purge (const void *recycling_act);
   // Remove from cache.
@@ -801,21 +801,29 @@ public:
   // Add to cache.
 
 private:
-
   // = Define some useful typedefs.
-  typedef ACE_Creation_Strategy<SVC_HANDLER> CREATION_STRATEGY;
-  typedef ACE_Concurrency_Strategy<SVC_HANDLER> CONCURRENCY_STRATEGY;
-  typedef ACE_Recycling_Strategy<SVC_HANDLER> RECYCLING_STRATEGY;
+  typedef ACE_Creation_Strategy<SVC_HANDLER> 
+          CREATION_STRATEGY;
+  typedef ACE_Concurrency_Strategy<SVC_HANDLER> 
+          CONCURRENCY_STRATEGY;
+  typedef ACE_Recycling_Strategy<SVC_HANDLER> 
+          RECYCLING_STRATEGY;
 
   // = Super class
-  typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> CONNECT_STRATEGY;
+  typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> 
+          CONNECT_STRATEGY;
 
   // = Typedefs for managing the map
-  typedef ACE_Hash_Addr<ACE_PEER_CONNECTOR_ADDR> ADDRESS;
-  typedef ACE_Hash_Recyclable<ADDRESS> RECYCLABLE_ADDRESS;
-  typedef ACE_Hash_Map_Manager <RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex> CONNECTION_MAP;
-  typedef ACE_Hash_Map_Iterator <RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex> CONNECTION_MAP_ITERATOR;
-  typedef ACE_Hash_Map_Entry<RECYCLABLE_ADDRESS, SVC_HANDLER *> CONNECTION_MAP_ENTRY;
+  typedef ACE_Hash_Addr<ACE_PEER_CONNECTOR_ADDR> 
+          ADDRESS;
+  typedef ACE_Hash_Recyclable<ADDRESS> 
+          RECYCLABLE_ADDRESS;
+  typedef ACE_Hash_Map_Manager <RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex> 
+          CONNECTION_MAP;
+  typedef ACE_Hash_Map_Iterator <RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Null_Mutex> 
+          CONNECTION_MAP_ITERATOR;
+  typedef ACE_Hash_Map_Entry<RECYCLABLE_ADDRESS, SVC_HANDLER *> 
+          CONNECTION_MAP_ENTRY;
 
   CONNECTION_MAP connection_cache_;
   // Table that maintains the cache of connected <SVC_HANDLER>s.