ChangeLogTag:Tue Dec 5 10:07:14 2000 Carlos O'Ryan <coryan@uci.edu>

2 files changed, 164 insertions, 144 deletions

diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 833653e292c..0b4f176d09d 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,10 +1,16 @@
+Tue Dec  5 10:07:14 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * performance-tests/Misc/childbirth_time.cpp:
+          Use &function instead of just function, hopefully that will make
+          Sun/CC 5.0 happy.
+
 Tue Dec  5 09:38:22 2000  Ossama Othman  <ossama@uci.edu>
 
-	* ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
+        * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
 
-	  Return "-1" instead of the result of the
-	  ACE_SSL_SOCK_Stream::close() method.  The latter may actually,
-	  and most likely will return without error.
+          Return "-1" instead of the result of the
+          ACE_SSL_SOCK_Stream::close() method.  The latter may actually,
+          and most likely will return without error.
 
 Tue Dec 05 05:39:39 2000  Christopher Kohlhoff  <chris@kohlhoff.com>
 
@@ -14,94 +20,98 @@ Tue Dec 05 05:39:39 2000  Christopher Kohlhoff  <chris@kohlhoff.com>
 
 Tue Dec 05 02:02:51 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-	* ace/IPC_SAP.cpp (disable): Reverted this change:
+        * ace/IPC_SAP.cpp (disable): Reverted this change:
 
-	  Tue Nov 21 17:42:36 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+          Tue Nov 21 17:42:36 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+          The change seemed too low level where it might end up effecting
+          more code than was intended.  However, as I discussed with Chris
+          Uzdavinis <chris@atdesk.com>, the correct solution is to
+          specialize the activation of the Svc_Handler rather than its
+          accepting.
 
-	  The change seemed too low level where it might end up effecting
-	  more code than was intended.  However, as I discussed with Chris
-	  Uzdavinis <chris@atdesk.com>, the correct solution is to
-	  specialize the activation of the Svc_Handler rather than its
-	  accepting.
-	
 Mon Dec 04 23:54:10 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-	* examples/Reactor/Proactor/test_proactor.cpp: 
+        * examples/Reactor/Proactor/test_proactor.cpp:
+
+          - Receiver::open(): Only duplicate the message block when we are
+          faking the result.  Otherwise, initiate_read_stream will create
+          its own message block.
 
-	  - Receiver::open(): Only duplicate the message block when we are
-	  faking the result.  Otherwise, initiate_read_stream will create
-	  its own message block.
+          - Receiver::open(): Delete the fake result.
 
-	  - Receiver::open(): Delete the fake result.
+          - Receiver::handle_read_stream(): When there is no more data to
+          read, release the message block and delete the receiver.
 
-	  - Receiver::handle_read_stream(): When there is no more data to
-	  read, release the message block and delete the receiver.
-	  
-	  - Sender::transmit_file(): No need to duplicate the trailer.
+          - Sender::transmit_file(): No need to duplicate the trailer.
 
-	* ace/Proactor.cpp (~ACE_Proactor_Timer_Handler): 
+        * ace/Proactor.cpp (~ACE_Proactor_Timer_Handler):
 
-	  The following was changed:
-	
-	  this->thr_mgr ()->wait ();
-	  
-	  to:
+          The following was changed:
 
-	  this->thr_mgr ()->wait_grp (this->grp_id ());
+          this->thr_mgr ()->wait ();
 
-	  since Thread_Manager::wait() if called while the
-	  ACE_Object_Manager is shutting down (as a result of program
-	  shutdown or ACE::fini), it will not wait for any threads to
-	  complete.
+          to:
 
-	  Also, the timer_handler thread was not created detached since
-	  Thread_Manager::wait_grp() does not wait on detached threads.
+          this->thr_mgr ()->wait_grp (this->grp_id ());
+
+          since Thread_Manager::wait() if called while the
+          ACE_Object_Manager is shutting down (as a result of program
+          shutdown or ACE::fini), it will not wait for any threads to
+          complete.
+
+          Also, the timer_handler thread was not created detached since
+          Thread_Manager::wait_grp() does not wait on detached threads.
 
 Mon Dec 04 16:32:11 2000  Ossama Othman  <ossama@uci.edu>
 
-	* ace/SSL/SSL_SOCK_Stream.i (recv):
+        * ace/SSL/SSL_SOCK_Stream.i (recv):
 
-	  Shutdown the SSL connection if SSL_read() returns with an
-	  SSL_ERROR_ZERO_RETURN OpenSSL error condition.
-	  SSL_ERROR_ZERO_RETURN indicates that the peer is shutting down,
-	  and that a "close_notify" message SSL message has been issued by
-	  the peer.  A "close_notify" message indicates that no further
-	  data will be sent through the given connection, so there is no
-	  need to keep the connection open.
-	
-	  Removed SSL_ERROR_WANT_{WRITE,X509_LOOKUP} switch statement
-	  cases.  They are apparently not necessary when performing a SSL
-	  read.
+          Shutdown the SSL connection if SSL_read() returns with an
+          SSL_ERROR_ZERO_RETURN OpenSSL error condition.
+          SSL_ERROR_ZERO_RETURN indicates that the peer is shutting down,
+          and that a "close_notify" message SSL message has been issued by
+          the peer.  A "close_notify" message indicates that no further
+          data will be sent through the given connection, so there is no
+          need to keep the connection open.
 
-	  (send):
+          Removed SSL_ERROR_WANT_{WRITE,X509_LOOKUP} switch statement
+          cases.  They are apparently not necessary when performing a SSL
+          read.
 
-	  Removed SSL_ERROR_WANT_{READ,X509_LOOKUP} switch statement
-	  cases.  They are apparently not necessary when performing a SSL
-	  write.
+          (send):
 
-	* ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
+          Removed SSL_ERROR_WANT_{READ,X509_LOOKUP} switch statement
+          cases.  They are apparently not necessary when performing a SSL
+          write.
 
-	  Check that the X.509 verification didn't fail.  If the
-	  verification failed then do not continue.
+<<<<<<< ChangeLog
+        * ace/SSL/SSL_SOCK_Acceptor.cpp:
+=======
+        * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
+>>>>>>> 4.1304
 
-	* ace/SSL/SSL_Context.cpp:
-	* ace/SSL/SSL_SOCK_Connector.cpp:
-	* ace/SSL/SSL_SOCK_Stream.cpp:
+          Check that the X.509 verification didn't fail.  If the
+          verification failed then do not continue.
 
-	  Added missing ACE_RCSID macros.
+        * ace/SSL/SSL_Context.cpp:
+        * ace/SSL/SSL_SOCK_Connector.cpp:
+        * ace/SSL/SSL_SOCK_Stream.cpp:
 
-	* ace/SSL/SSL_Context.h:
-	* ace/SSL/SSL_SOCK.h
-	* ace/SSL/SSL_SOCK_Acceptor.h:
-	* ace/SSL/SSL_SOCK_Connector.h:
-	* ace/SSL/SSL_SOCK_Stream.h:
+          Added missing ACE_RCSID macros.
 
-	  Doxygenated these headers.
+        * ace/SSL/SSL_Context.h:
+        * ace/SSL/SSL_SOCK.h
+        * ace/SSL/SSL_SOCK_Acceptor.h:
+        * ace/SSL/SSL_SOCK_Connector.h:
+        * ace/SSL/SSL_SOCK_Stream.h:
 
-	* ace/SSL/SSL_Context.i:
-	* ace/SSL/SSL_SOCK.cpp:
+          Doxygenated these headers.
 
-	  Cosmetic updates.
+        * ace/SSL/SSL_Context.i:
+        * ace/SSL/SSL_SOCK.cpp:
+
+          Cosmetic updates.
 
 Mon Dec 04 12:45:46 2000  Steve Huston  <shuston@riverace.com>
 
@@ -123,15 +133,15 @@ Mon Dec  4 07:39:16 2000  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Dec  3 20:03:16 2000  Ossama Othman  <ossama@uci.edu>
 
-	* examples/Web_Crawler/Command_Processor.cpp:
+        * examples/Web_Crawler/Command_Processor.cpp:
 
-	  Removed duplicate template instantiations.  Thanks to Paul Rubel
-	  <prubel@bbn.com> for pointing out this bug, and for providing a
-	  fix.
+          Removed duplicate template instantiations.  Thanks to Paul Rubel
+          <prubel@bbn.com> for pointing out this bug, and for providing a
+          fix.
 
-	* THANKS:
+        * THANKS:
 
-	  Added Paul to the Hall-of-Fame.
+          Added Paul to the Hall-of-Fame.
 
 Sun Dec  3 15:23:50 2000  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 833653e292c..0b4f176d09d 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,10 +1,16 @@
+Tue Dec  5 10:07:14 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * performance-tests/Misc/childbirth_time.cpp:
+          Use &function instead of just function, hopefully that will make
+          Sun/CC 5.0 happy.
+
 Tue Dec  5 09:38:22 2000  Ossama Othman  <ossama@uci.edu>
 
-	* ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
+        * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
 
-	  Return "-1" instead of the result of the
-	  ACE_SSL_SOCK_Stream::close() method.  The latter may actually,
-	  and most likely will return without error.
+          Return "-1" instead of the result of the
+          ACE_SSL_SOCK_Stream::close() method.  The latter may actually,
+          and most likely will return without error.
 
 Tue Dec 05 05:39:39 2000  Christopher Kohlhoff  <chris@kohlhoff.com>
 
@@ -14,94 +20,98 @@ Tue Dec 05 05:39:39 2000  Christopher Kohlhoff  <chris@kohlhoff.com>
 
 Tue Dec 05 02:02:51 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-	* ace/IPC_SAP.cpp (disable): Reverted this change:
+        * ace/IPC_SAP.cpp (disable): Reverted this change:
 
-	  Tue Nov 21 17:42:36 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+          Tue Nov 21 17:42:36 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+          The change seemed too low level where it might end up effecting
+          more code than was intended.  However, as I discussed with Chris
+          Uzdavinis <chris@atdesk.com>, the correct solution is to
+          specialize the activation of the Svc_Handler rather than its
+          accepting.
 
-	  The change seemed too low level where it might end up effecting
-	  more code than was intended.  However, as I discussed with Chris
-	  Uzdavinis <chris@atdesk.com>, the correct solution is to
-	  specialize the activation of the Svc_Handler rather than its
-	  accepting.
-	
 Mon Dec 04 23:54:10 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-	* examples/Reactor/Proactor/test_proactor.cpp: 
+        * examples/Reactor/Proactor/test_proactor.cpp:
+
+          - Receiver::open(): Only duplicate the message block when we are
+          faking the result.  Otherwise, initiate_read_stream will create
+          its own message block.
 
-	  - Receiver::open(): Only duplicate the message block when we are
-	  faking the result.  Otherwise, initiate_read_stream will create
-	  its own message block.
+          - Receiver::open(): Delete the fake result.
 
-	  - Receiver::open(): Delete the fake result.
+          - Receiver::handle_read_stream(): When there is no more data to
+          read, release the message block and delete the receiver.
 
-	  - Receiver::handle_read_stream(): When there is no more data to
-	  read, release the message block and delete the receiver.
-	  
-	  - Sender::transmit_file(): No need to duplicate the trailer.
+          - Sender::transmit_file(): No need to duplicate the trailer.
 
-	* ace/Proactor.cpp (~ACE_Proactor_Timer_Handler): 
+        * ace/Proactor.cpp (~ACE_Proactor_Timer_Handler):
 
-	  The following was changed:
-	
-	  this->thr_mgr ()->wait ();
-	  
-	  to:
+          The following was changed:
 
-	  this->thr_mgr ()->wait_grp (this->grp_id ());
+          this->thr_mgr ()->wait ();
 
-	  since Thread_Manager::wait() if called while the
-	  ACE_Object_Manager is shutting down (as a result of program
-	  shutdown or ACE::fini), it will not wait for any threads to
-	  complete.
+          to:
 
-	  Also, the timer_handler thread was not created detached since
-	  Thread_Manager::wait_grp() does not wait on detached threads.
+          this->thr_mgr ()->wait_grp (this->grp_id ());
+
+          since Thread_Manager::wait() if called while the
+          ACE_Object_Manager is shutting down (as a result of program
+          shutdown or ACE::fini), it will not wait for any threads to
+          complete.
+
+          Also, the timer_handler thread was not created detached since
+          Thread_Manager::wait_grp() does not wait on detached threads.
 
 Mon Dec 04 16:32:11 2000  Ossama Othman  <ossama@uci.edu>
 
-	* ace/SSL/SSL_SOCK_Stream.i (recv):
+        * ace/SSL/SSL_SOCK_Stream.i (recv):
 
-	  Shutdown the SSL connection if SSL_read() returns with an
-	  SSL_ERROR_ZERO_RETURN OpenSSL error condition.
-	  SSL_ERROR_ZERO_RETURN indicates that the peer is shutting down,
-	  and that a "close_notify" message SSL message has been issued by
-	  the peer.  A "close_notify" message indicates that no further
-	  data will be sent through the given connection, so there is no
-	  need to keep the connection open.
-	
-	  Removed SSL_ERROR_WANT_{WRITE,X509_LOOKUP} switch statement
-	  cases.  They are apparently not necessary when performing a SSL
-	  read.
+          Shutdown the SSL connection if SSL_read() returns with an
+          SSL_ERROR_ZERO_RETURN OpenSSL error condition.
+          SSL_ERROR_ZERO_RETURN indicates that the peer is shutting down,
+          and that a "close_notify" message SSL message has been issued by
+          the peer.  A "close_notify" message indicates that no further
+          data will be sent through the given connection, so there is no
+          need to keep the connection open.
 
-	  (send):
+          Removed SSL_ERROR_WANT_{WRITE,X509_LOOKUP} switch statement
+          cases.  They are apparently not necessary when performing a SSL
+          read.
 
-	  Removed SSL_ERROR_WANT_{READ,X509_LOOKUP} switch statement
-	  cases.  They are apparently not necessary when performing a SSL
-	  write.
+          (send):
 
-	* ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
+          Removed SSL_ERROR_WANT_{READ,X509_LOOKUP} switch statement
+          cases.  They are apparently not necessary when performing a SSL
+          write.
 
-	  Check that the X.509 verification didn't fail.  If the
-	  verification failed then do not continue.
+<<<<<<< ChangeLog
+        * ace/SSL/SSL_SOCK_Acceptor.cpp:
+=======
+        * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept):
+>>>>>>> 4.1304
 
-	* ace/SSL/SSL_Context.cpp:
-	* ace/SSL/SSL_SOCK_Connector.cpp:
-	* ace/SSL/SSL_SOCK_Stream.cpp:
+          Check that the X.509 verification didn't fail.  If the
+          verification failed then do not continue.
 
-	  Added missing ACE_RCSID macros.
+        * ace/SSL/SSL_Context.cpp:
+        * ace/SSL/SSL_SOCK_Connector.cpp:
+        * ace/SSL/SSL_SOCK_Stream.cpp:
 
-	* ace/SSL/SSL_Context.h:
-	* ace/SSL/SSL_SOCK.h
-	* ace/SSL/SSL_SOCK_Acceptor.h:
-	* ace/SSL/SSL_SOCK_Connector.h:
-	* ace/SSL/SSL_SOCK_Stream.h:
+          Added missing ACE_RCSID macros.
 
-	  Doxygenated these headers.
+        * ace/SSL/SSL_Context.h:
+        * ace/SSL/SSL_SOCK.h
+        * ace/SSL/SSL_SOCK_Acceptor.h:
+        * ace/SSL/SSL_SOCK_Connector.h:
+        * ace/SSL/SSL_SOCK_Stream.h:
 
-	* ace/SSL/SSL_Context.i:
-	* ace/SSL/SSL_SOCK.cpp:
+          Doxygenated these headers.
 
-	  Cosmetic updates.
+        * ace/SSL/SSL_Context.i:
+        * ace/SSL/SSL_SOCK.cpp:
+
+          Cosmetic updates.
 
 Mon Dec 04 12:45:46 2000  Steve Huston  <shuston@riverace.com>
 
@@ -123,15 +133,15 @@ Mon Dec  4 07:39:16 2000  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Dec  3 20:03:16 2000  Ossama Othman  <ossama@uci.edu>
 
-	* examples/Web_Crawler/Command_Processor.cpp:
+        * examples/Web_Crawler/Command_Processor.cpp:
 
-	  Removed duplicate template instantiations.  Thanks to Paul Rubel
-	  <prubel@bbn.com> for pointing out this bug, and for providing a
-	  fix.
+          Removed duplicate template instantiations.  Thanks to Paul Rubel
+          <prubel@bbn.com> for pointing out this bug, and for providing a
+          fix.
 
-	* THANKS:
+        * THANKS:
 
-	  Added Paul to the Hall-of-Fame.
+          Added Paul to the Hall-of-Fame.
 
 Sun Dec  3 15:23:50 2000  Carlos O'Ryan  <coryan@uci.edu>