ChangeLogTag:Tue Jan 16 15:28:22 2001 Carlos O'Ryan <coryan@uci.edu>

4 files changed, 128 insertions, 107 deletions

diff --git a/ChangeLog b/ChangeLog
index a7fb765cb08..2d71d5d84c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,41 +1,47 @@
+Tue Jan 16 15:28:22 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+          The formal parameter names must match in the .h and .cpp file
+          to make Sun/CC 6.0 happy.
+
 Tue Jan 16 11:25:32 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/Log_Msg.cpp (log): Convert strerror() text string to a
-	  TCHAR so that this call will work correctly with Unicode.
-  	  Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting
- 	  this.
+        * ace/Log_Msg.cpp (log): Convert strerror() text string to a
+          TCHAR so that this call will work correctly with Unicode.
+          Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting
+          this.
 
 Tue Jan 16 09:58:20 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * ace/ace_wchar.inl:
 
-          Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to 
+          Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to
           preserve null pointers.
 
-          Thanks to Matthias Wittig <m.wittig@com-on.de> for 
+          Thanks to Matthias Wittig <m.wittig@com-on.de> for
           reporting this and suggesting a fix.
 
 Tue Jan 16 10:47:33 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
 
-	* ace/config-win32-common.h:
-	* ace/config-win32-msvc.h:
-	  Moved #define ACE_HAS_LLSEEK from config-win32-common.h to 
-	  config-win32-msvc.h, since _lseeki64 isn't defined for 
-	  Borland.  Also implicitly removed ACE_HAS_LLSEEK for the
-	  VisualAge compiler - it might have worked (didn't know,
-	  couldn't test)
+        * ace/config-win32-common.h:
+        * ace/config-win32-msvc.h:
+          Moved #define ACE_HAS_LLSEEK from config-win32-common.h to
+          config-win32-msvc.h, since _lseeki64 isn't defined for
+          Borland.  Also implicitly removed ACE_HAS_LLSEEK for the
+          VisualAge compiler - it might have worked (didn't know,
+          couldn't test)
 
 Mon Jan 15 15:22:42 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read()
-	  method's "bytes_to_read" parameter to "num_bytes_to_read" to
- 	  workaround a weird problem with some compilers.  Thanks to Chris
- 	  Kohlhoff <chris@kohlhoff.com> for this fix.
+        * ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read()
+          method's "bytes_to_read" parameter to "num_bytes_to_read" to
+          workaround a weird problem with some compilers.  Thanks to Chris
+          Kohlhoff <chris@kohlhoff.com> for this fix.
 
-	* examples/Service_Configurator/IPC-tests/README: Updated this
-	  file so that it's now up-to-date and also explains how to
- 	  reconfigure a server if SIGHUP isn't supported.  Thanks to Mike
- 	  Curtis <mccurry@my-deja.com> for reporting this.
+        * examples/Service_Configurator/IPC-tests/README: Updated this
+          file so that it's now up-to-date and also explains how to
+          reconfigure a server if SIGHUP isn't supported.  Thanks to Mike
+          Curtis <mccurry@my-deja.com> for reporting this.
 
 Mon Jan 15 12:13:48 2001  Darrell Brunsch <brunsch@uci.edu>
 
@@ -48,13 +54,13 @@ Mon Jan 15 12:13:48 2001  Darrell Brunsch <brunsch@uci.edu>
 
 Mon Jan 15 12:29:53 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME
-	  is spelled correctly.  Thanks to Mike Curtis
- 	  <mccurry@my-deja.com> for reporting this.
-	
-	* ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions
-	  with ACE_OS::strcpy() functions.  Thanks to Ron Hashimshony
- 	  <Ron@bandwiz.com> for reporting this.
+        * ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME
+          is spelled correctly.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for reporting this.
+
+        * ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions
+          with ACE_OS::strcpy() functions.  Thanks to Ron Hashimshony
+          <Ron@bandwiz.com> for reporting this.
 
 Mon Jan 15 09:44:16 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a7fb765cb08..2d71d5d84c6 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,41 +1,47 @@
+Tue Jan 16 15:28:22 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+          The formal parameter names must match in the .h and .cpp file
+          to make Sun/CC 6.0 happy.
+
 Tue Jan 16 11:25:32 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/Log_Msg.cpp (log): Convert strerror() text string to a
-	  TCHAR so that this call will work correctly with Unicode.
-  	  Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting
- 	  this.
+        * ace/Log_Msg.cpp (log): Convert strerror() text string to a
+          TCHAR so that this call will work correctly with Unicode.
+          Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting
+          this.
 
 Tue Jan 16 09:58:20 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * ace/ace_wchar.inl:
 
-          Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to 
+          Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to
           preserve null pointers.
 
-          Thanks to Matthias Wittig <m.wittig@com-on.de> for 
+          Thanks to Matthias Wittig <m.wittig@com-on.de> for
           reporting this and suggesting a fix.
 
 Tue Jan 16 10:47:33 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
 
-	* ace/config-win32-common.h:
-	* ace/config-win32-msvc.h:
-	  Moved #define ACE_HAS_LLSEEK from config-win32-common.h to 
-	  config-win32-msvc.h, since _lseeki64 isn't defined for 
-	  Borland.  Also implicitly removed ACE_HAS_LLSEEK for the
-	  VisualAge compiler - it might have worked (didn't know,
-	  couldn't test)
+        * ace/config-win32-common.h:
+        * ace/config-win32-msvc.h:
+          Moved #define ACE_HAS_LLSEEK from config-win32-common.h to
+          config-win32-msvc.h, since _lseeki64 isn't defined for
+          Borland.  Also implicitly removed ACE_HAS_LLSEEK for the
+          VisualAge compiler - it might have worked (didn't know,
+          couldn't test)
 
 Mon Jan 15 15:22:42 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read()
-	  method's "bytes_to_read" parameter to "num_bytes_to_read" to
- 	  workaround a weird problem with some compilers.  Thanks to Chris
- 	  Kohlhoff <chris@kohlhoff.com> for this fix.
+        * ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read()
+          method's "bytes_to_read" parameter to "num_bytes_to_read" to
+          workaround a weird problem with some compilers.  Thanks to Chris
+          Kohlhoff <chris@kohlhoff.com> for this fix.
 
-	* examples/Service_Configurator/IPC-tests/README: Updated this
-	  file so that it's now up-to-date and also explains how to
- 	  reconfigure a server if SIGHUP isn't supported.  Thanks to Mike
- 	  Curtis <mccurry@my-deja.com> for reporting this.
+        * examples/Service_Configurator/IPC-tests/README: Updated this
+          file so that it's now up-to-date and also explains how to
+          reconfigure a server if SIGHUP isn't supported.  Thanks to Mike
+          Curtis <mccurry@my-deja.com> for reporting this.
 
 Mon Jan 15 12:13:48 2001  Darrell Brunsch <brunsch@uci.edu>
 
@@ -48,13 +54,13 @@ Mon Jan 15 12:13:48 2001  Darrell Brunsch <brunsch@uci.edu>
 
 Mon Jan 15 12:29:53 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME
-	  is spelled correctly.  Thanks to Mike Curtis
- 	  <mccurry@my-deja.com> for reporting this.
-	
-	* ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions
-	  with ACE_OS::strcpy() functions.  Thanks to Ron Hashimshony
- 	  <Ron@bandwiz.com> for reporting this.
+        * ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME
+          is spelled correctly.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for reporting this.
+
+        * ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions
+          with ACE_OS::strcpy() functions.  Thanks to Ron Hashimshony
+          <Ron@bandwiz.com> for reporting this.
 
 Mon Jan 15 09:44:16 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a7fb765cb08..2d71d5d84c6 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,41 +1,47 @@
+Tue Jan 16 15:28:22 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+          The formal parameter names must match in the .h and .cpp file
+          to make Sun/CC 6.0 happy.
+
 Tue Jan 16 11:25:32 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/Log_Msg.cpp (log): Convert strerror() text string to a
-	  TCHAR so that this call will work correctly with Unicode.
-  	  Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting
- 	  this.
+        * ace/Log_Msg.cpp (log): Convert strerror() text string to a
+          TCHAR so that this call will work correctly with Unicode.
+          Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting
+          this.
 
 Tue Jan 16 09:58:20 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * ace/ace_wchar.inl:
 
-          Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to 
+          Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to
           preserve null pointers.
 
-          Thanks to Matthias Wittig <m.wittig@com-on.de> for 
+          Thanks to Matthias Wittig <m.wittig@com-on.de> for
           reporting this and suggesting a fix.
 
 Tue Jan 16 10:47:33 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
 
-	* ace/config-win32-common.h:
-	* ace/config-win32-msvc.h:
-	  Moved #define ACE_HAS_LLSEEK from config-win32-common.h to 
-	  config-win32-msvc.h, since _lseeki64 isn't defined for 
-	  Borland.  Also implicitly removed ACE_HAS_LLSEEK for the
-	  VisualAge compiler - it might have worked (didn't know,
-	  couldn't test)
+        * ace/config-win32-common.h:
+        * ace/config-win32-msvc.h:
+          Moved #define ACE_HAS_LLSEEK from config-win32-common.h to
+          config-win32-msvc.h, since _lseeki64 isn't defined for
+          Borland.  Also implicitly removed ACE_HAS_LLSEEK for the
+          VisualAge compiler - it might have worked (didn't know,
+          couldn't test)
 
 Mon Jan 15 15:22:42 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read()
-	  method's "bytes_to_read" parameter to "num_bytes_to_read" to
- 	  workaround a weird problem with some compilers.  Thanks to Chris
- 	  Kohlhoff <chris@kohlhoff.com> for this fix.
+        * ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read()
+          method's "bytes_to_read" parameter to "num_bytes_to_read" to
+          workaround a weird problem with some compilers.  Thanks to Chris
+          Kohlhoff <chris@kohlhoff.com> for this fix.
 
-	* examples/Service_Configurator/IPC-tests/README: Updated this
-	  file so that it's now up-to-date and also explains how to
- 	  reconfigure a server if SIGHUP isn't supported.  Thanks to Mike
- 	  Curtis <mccurry@my-deja.com> for reporting this.
+        * examples/Service_Configurator/IPC-tests/README: Updated this
+          file so that it's now up-to-date and also explains how to
+          reconfigure a server if SIGHUP isn't supported.  Thanks to Mike
+          Curtis <mccurry@my-deja.com> for reporting this.
 
 Mon Jan 15 12:13:48 2001  Darrell Brunsch <brunsch@uci.edu>
 
@@ -48,13 +54,13 @@ Mon Jan 15 12:13:48 2001  Darrell Brunsch <brunsch@uci.edu>
 
 Mon Jan 15 12:29:53 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME
-	  is spelled correctly.  Thanks to Mike Curtis
- 	  <mccurry@my-deja.com> for reporting this.
-	
-	* ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions
-	  with ACE_OS::strcpy() functions.  Thanks to Ron Hashimshony
- 	  <Ron@bandwiz.com> for reporting this.
+        * ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME
+          is spelled correctly.  Thanks to Mike Curtis
+          <mccurry@my-deja.com> for reporting this.
+
+        * ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions
+          with ACE_OS::strcpy() functions.  Thanks to Ron Hashimshony
+          <Ron@bandwiz.com> for reporting this.
 
 Mon Jan 15 09:44:16 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index 4f63edbe447..35cb49706b1 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -265,32 +265,35 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, char *argv[]
   return 0;
 }
 
-template<class SLH, class LMR, class SST> int
-ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::make_svc_handler (SLH *&handler)
+template<class SERVER_LOGGING_HANDLER, class LOG_MESSAGE_RECEIVER, class SCHEDULE_STRATEGY> int
+ACE_Server_Logging_Acceptor_T<SERVER_LOGGING_HANDLER,
+                              LOG_MESSAGE_RECEIVER,
+                              SCHEDULE_STRATEGY>
+    ::make_svc_handler (SERVER_LOGGING_HANDLER *&handler)
 {
   ACE_NEW_RETURN (handler,
-                  SLH (ACE_Thread_Manager::instance (),
-                       this->receiver()),
+                  SERVER_LOGGING_HANDLER (ACE_Thread_Manager::instance (),
+                                          this->receiver()),
                   -1);
   return 0;
 }
 
-template<class LMR>
-ACE_Server_Logging_Handler<LMR>::ACE_Server_Logging_Handler (ACE_Thread_Manager * tm,
-                                                             LMR const& receiver)
-  : ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, LMR>(tm,
+template<class LOG_MESSAGE_RECEIVER>
+ACE_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::ACE_Server_Logging_Handler (ACE_Thread_Manager * tm,
+                                                             LOG_MESSAGE_RECEIVER const& receiver)
+  : ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, LOG_MESSAGE_RECEIVER>(tm,
                                                                                    receiver)
 {
 }
 
-template<class LMR>
-ACE_Server_Logging_Handler<LMR>::ACE_Server_Logging_Handler(ACE_Thread_Manager * tm)
-  : ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, LMR>(tm, LMR())
+template<class LOG_MESSAGE_RECEIVER>
+ACE_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::ACE_Server_Logging_Handler(ACE_Thread_Manager * tm)
+  : ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, LOG_MESSAGE_RECEIVER>(tm, LOG_MESSAGE_RECEIVER())
 {
 }
 
-template<class LMR>  int
-ACE_Server_Logging_Handler<LMR>::open (void *)
+template<class LOG_MESSAGE_RECEIVER>  int
+ACE_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::open (void *)
 {
   // call base class open_common
   if (this->open_common () != 0)
@@ -304,20 +307,20 @@ ACE_Server_Logging_Handler<LMR>::open (void *)
   return 0;
 }
 
-template<class LMR>
-ACE_Thr_Server_Logging_Handler<LMR>::ACE_Thr_Server_Logging_Handler (ACE_Thread_Manager *tm, LMR const &receiver)
-  : ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_LOGGER_SYNCH, LMR>(tm, receiver)
+template<class LOG_MESSAGE_RECEIVER>
+ACE_Thr_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::ACE_Thr_Server_Logging_Handler (ACE_Thread_Manager *tm, LOG_MESSAGE_RECEIVER const &receiver)
+  : ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_LOGGER_SYNCH, LOG_MESSAGE_RECEIVER>(tm, receiver)
 {
 }
 
-template<class LMR>
-ACE_Thr_Server_Logging_Handler<LMR>::ACE_Thr_Server_Logging_Handler (ACE_Thread_Manager *tm)
-  : ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_LOGGER_SYNCH, LMR>(tm, LMR ())
+template<class LOG_MESSAGE_RECEIVER>
+ACE_Thr_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::ACE_Thr_Server_Logging_Handler (ACE_Thread_Manager *tm)
+  : ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_LOGGER_SYNCH, LOG_MESSAGE_RECEIVER>(tm, LOG_MESSAGE_RECEIVER ())
 {
 }
 
-template<class LMR> int
-ACE_Thr_Server_Logging_Handler<LMR>::open (void *)
+template<class LOG_MESSAGE_RECEIVER> int
+ACE_Thr_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::open (void *)
 {
   // call base class open_common
   if (this->open_common () != 0)
@@ -337,8 +340,8 @@ ACE_Thr_Server_Logging_Handler<LMR>::open (void *)
 
 // Process remote logging records.
 
-template<class LMR> int
-ACE_Thr_Server_Logging_Handler<LMR>::svc (void)
+template<class LOG_MESSAGE_RECEIVER> int
+ACE_Thr_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::svc (void)
 {
   int result = 0;