*** empty log message ***

5 files changed, 62 insertions, 61 deletions

diff --git a/netsvcs/lib/Log_Message_Receiver.cpp b/netsvcs/lib/Log_Message_Receiver.cpp
index af47b20bef4..03fccfea3b2 100644
--- a/netsvcs/lib/Log_Message_Receiver.cpp
+++ b/netsvcs/lib/Log_Message_Receiver.cpp
@@ -1,4 +1,4 @@
-#include "Log_Message_Receiver.cpp"
+#include "Log_Message_Receiver.h"
 
 // Type based log message receiver.
 template<ACE_SYNCH_1> void
diff --git a/netsvcs/lib/Makefile b/netsvcs/lib/Makefile
index 87b52e3a80e..3c489ecb139 100644
--- a/netsvcs/lib/Makefile
+++ b/netsvcs/lib/Makefile
@@ -471,7 +471,8 @@ include	$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
  $(WRAPPER_ROOT)/ace/Name_Request_Reply.h \
  $(WRAPPER_ROOT)/ace/Name_Space.h
 .obj/Server_Logging_Handler.o .shobj/Server_Logging_Handler.so: Server_Logging_Handler.cpp \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
+ Server_Logging_Handler.h Server_Logging_Handler_T.h \
+ $(WRAPPER_ROOT)/ace/Synch.h \
  $(WRAPPER_ROOT)/ace/ACE.h \
  $(WRAPPER_ROOT)/ace/OS.h \
  $(WRAPPER_ROOT)/ace/config.h \
@@ -483,9 +484,6 @@ include	$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
  $(WRAPPER_ROOT)/ace/Log_Priority.h \
  $(WRAPPER_ROOT)/ace/Log_Record.i \
  $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.i \
- Server_Logging_Handler.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
  $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
  $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
  $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -576,7 +574,10 @@ include	$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
  $(WRAPPER_ROOT)/ace/Task_T.h \
  $(WRAPPER_ROOT)/ace/Task_T.i \
  $(WRAPPER_ROOT)/ace/Svc_Handler.i \
- $(WRAPPER_ROOT)/ace/Acceptor.i
+ $(WRAPPER_ROOT)/ace/Acceptor.i \
+ $(WRAPPER_ROOT)/ace/SString.h \
+ $(WRAPPER_ROOT)/ace/SString.i \
+ Base_Optimizer.h Log_Message_Receiver.h
 .obj/Token_Handler.o .shobj/Token_Handler.so: Token_Handler.cpp \
  $(WRAPPER_ROOT)/ace/Get_Opt.h \
  $(WRAPPER_ROOT)/ace/ACE.h \
diff --git a/netsvcs/lib/Server_Logging_Handler.cpp b/netsvcs/lib/Server_Logging_Handler.cpp
index 4ae8a3e57fa..04c86c6fd8f 100644
--- a/netsvcs/lib/Server_Logging_Handler.cpp
+++ b/netsvcs/lib/Server_Logging_Handler.cpp
@@ -17,76 +17,76 @@ ACE_SVC_FACTORY_DEFINE (ACE_Thr_Server_Logging_Acceptor)
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 
 template class Static_Log_Message_Receiver<ACE_NULL_SYNCH>;
-template class ACE_Acceptor<Null_Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Accept_Strategy<Null_Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<Null_Synch_Logg_Handler_Static_Receiver>;
-template class ACE_Creation_Strategy<Null_Synch_Logg_Handler_Static_Receiver>;
-template class ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logg_Handler_Static_Receiver>;
-template class ACE_Scheduling_Strategy<Null_Synch_Logg_Handler_Static_Receiver>;
-template class ACE_Strategy_Acceptor<Null_Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-template class ACE_Server_Logging_AcceptorT<Null_Synch_Logg_Handler_Static_Receiver, 
+template class ACE_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+template class ACE_Accept_Strategy<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+template class ACE_Concurrency_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
+template class ACE_Creation_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
+template class ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
+template class ACE_Scheduling_Strategy<Null_Synch_Logging_Handler_Static_Receiver>;
+template class ACE_Strategy_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+template class ACE_Server_Logging_Acceptor_T<Null_Synch_Logging_Handler_Static_Receiver, 
                                             Null_Synch_Static_Receiver, 
-                                            ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logg_Handler_Static_Receiver> >;
-template class ACE_Server_Logging_HandlerT<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Null_Synch_Static_Receiver>;
+                                            ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> >;
+template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Null_Synch_Static_Receiver>;
 template class ACE_Server_Logging_Handler<Null_Synch_Static_Receiver>;
 
 #if defined (ACE_HAS_THREADS) 
   template class Static_Log_Message_Receiver<ACE_LOGGER_SYNCH>;
   template class Log_Message_Receiver<ACE_LOGGER_SYNCH>;
 
-  template class ACE_Acceptor<Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Acceptor<Synch_Thr_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Acceptor<Synch_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Acceptor<Synch_Thr_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Acceptor<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Acceptor<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Acceptor<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Acceptor<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
 
-  template class ACE_Accept_Strategy<Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Accept_Strategy<Synch_Thr_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Accept_Strategy<Synch_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Accept_Strategy<Synch_Thr_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Accept_Strategy<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Accept_Strategy<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Accept_Strategy<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Accept_Strategy<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
 
-  template class ACE_Concurrency_Strategy<Synch_Logg_Handler_Static_Receiver>;
-  template class ACE_Concurrency_Strategy<Synch_Thr_Logg_Handler_Static_Receiver>;
-  template class ACE_Concurrency_Strategy<Synch_Logg_Handler_Receiver>;
-  template class ACE_Concurrency_Strategy<Synch_Thr_Logg_Handler_Receiver>;
+  template class ACE_Concurrency_Strategy<Synch_Logging_Handler_Static_Receiver>;
+  template class ACE_Concurrency_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
+  template class ACE_Concurrency_Strategy<Synch_Logging_Handler_Receiver>;
+  template class ACE_Concurrency_Strategy<Synch_Thr_Logging_Handler_Receiver>;
 
-  template class ACE_Creation_Strategy<Synch_Logg_Handler_Static_Receiver>;
-  template class ACE_Creation_Strategy<Synch_Thr_Logg_Handler_Static_Receiver>;
-  template class ACE_Creation_Strategy<Synch_Logg_Handler_Receiver>;
-  template class ACE_Creation_Strategy<Synch_Thr_Logg_Handler_Receiver>;
+  template class ACE_Creation_Strategy<Synch_Logging_Handler_Static_Receiver>;
+  template class ACE_Creation_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
+  template class ACE_Creation_Strategy<Synch_Logging_Handler_Receiver>;
+  template class ACE_Creation_Strategy<Synch_Thr_Logging_Handler_Receiver>;
 
-  template class ACE_Schedule_All_Reactive_Strategy<Synch_Logg_Handler_Static_Receiver>;
-  template class ACE_Schedule_All_Reactive_Strategy<Synch_Logg_Handler_Receiver>;
+  template class ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver>;
+  template class ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver>;
 
-  template class ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logg_Handler_Static_Receiver>;
-  template class ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logg_Handler_Receiver>;
+  template class ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
+  template class ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver>;
 
-  template class ACE_Scheduling_Strategy<Synch_Logg_Handler_Static_Receiver>;
-  template class ACE_Scheduling_Strategy<Synch_Logg_Handler_Receiver>;
-  template class ACE_Scheduling_Strategy<Synch_Thr_Logg_Handler_Static_Receiver>;
-  template class ACE_Scheduling_Strategy<Synch_Thr_Logg_Handler_Receiver>;
+  template class ACE_Scheduling_Strategy<Synch_Logging_Handler_Static_Receiver>;
+  template class ACE_Scheduling_Strategy<Synch_Logging_Handler_Receiver>;
+  template class ACE_Scheduling_Strategy<Synch_Thr_Logging_Handler_Static_Receiver>;
+  template class ACE_Scheduling_Strategy<Synch_Thr_Logging_Handler_Receiver>;
 
-  template class ACE_Strategy_Acceptor<Synch_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Strategy_Acceptor<Synch_Thr_Logg_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Strategy_Acceptor<Synch_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
-  template class ACE_Strategy_Acceptor<Synch_Thr_Logg_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Strategy_Acceptor<Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Strategy_Acceptor<Synch_Thr_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Strategy_Acceptor<Synch_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
+  template class ACE_Strategy_Acceptor<Synch_Thr_Logging_Handler_Receiver, LOGGING_PEER_ACCEPTOR>;
 
-  template class ACE_Server_Logging_AcceptorT<Synch_Logg_Handler_Static_Receiver, 
+  template class ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Static_Receiver, 
                                               Synch_Static_Receiver, 
-                                              ACE_Schedule_All_Reactive_Strategy<Synch_Logg_Handler_Static_Receiver> >;
-  template class ACE_Server_Logging_AcceptorT<Synch_Thr_Logg_Handler_Static_Receiver, 
+                                              ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver> >;
+  template class ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Static_Receiver, 
                                               Synch_Static_Receiver, 
-                                              ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logg_Handler_Static_Receiver> >;
-  template class ACE_Server_Logging_AcceptorT<Synch_Logg_Handler_Receiver, 
+                                              ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver> >;
+  template class ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Receiver, 
                                               Synch_Receiver, 
-                                              ACE_Schedule_All_Reactive_Strategy<Synch_Logg_Handler_Receiver> >;
-  template class ACE_Server_Logging_AcceptorT<Synch_Thr_Logg_Handler_Receiver, 
+                                              ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver> >;
+  template class ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Receiver, 
                                               Synch_Receiver, 
-                                              ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logg_Handler_Receiver> >;
+                                              ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver> >;
 
-  template class ACE_Server_Logging_HandlerT<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Static_Receiver>;
-  template class ACE_Server_Logging_HandlerT<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Static_Receiver>;
-  template class ACE_Server_Logging_HandlerT<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Receiver>;
-  template class ACE_Server_Logging_HandlerT<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Receiver>;
+  template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Static_Receiver>;
+  template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Static_Receiver>;
+  template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, Synch_Receiver>;
+  template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_MT_SYNCH, Synch_Receiver>;
 
   template class ACE_Server_Logging_Handler<Synch_Static_Receiver>;
   template class ACE_Thr_Server_Logging_Handler<Synch_Static_Receiver>;
diff --git a/netsvcs/lib/Server_Logging_Handler.h b/netsvcs/lib/Server_Logging_Handler.h
index fa232af82fc..91d73412955 100644
--- a/netsvcs/lib/Server_Logging_Handler.h
+++ b/netsvcs/lib/Server_Logging_Handler.h
@@ -55,14 +55,14 @@ typedef ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Receiver,
 
 // Define external Acceptor_Ts
 typedef Null_Synch_Logging_Handler_Static_Receiver_Acceptor_T 
-        ACE_Server_Logging_Acceptor_T;
+        ACE_Server_Logging_Acceptor;
 typedef Synch_Thr_Logging_Handler_Static_Receiver_Acceptor_T 
-        ACE_Thr_Server_Logging_Acceptor_T;
+        ACE_Thr_Server_Logging_Acceptor;
 
 //typedef  Synch_Logging_Handler_Receiver_Acceptor_T ACE_Server_Logging_Acceptor_T;
 //typedef  Synch_Thr_Logging_Handler_Receiver_Acceptor_T ACE_Thr_Server_Logging_Acceptor_T;
 
-ACE_SVC_FACTORY_DECLARE (ACE_Server_Logging_Acceptor_T)
-ACE_SVC_FACTORY_DECLARE (ACE_Thr_Server_Logging_Acceptor_T)
+ACE_SVC_FACTORY_DECLARE (ACE_Server_Logging_Acceptor)
+ACE_SVC_FACTORY_DECLARE (ACE_Thr_Server_Logging_Acceptor)
 
 #endif /* SERVER_LOGGING_HANDLER_H */
diff --git a/netsvcs/lib/Server_Logging_Handler_T.h b/netsvcs/lib/Server_Logging_Handler_T.h
index 84936ed11ff..6a31212fe21 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.h
+++ b/netsvcs/lib/Server_Logging_Handler_T.h
@@ -122,7 +122,7 @@ public:
   ACE_Server_Logging_Handler (ACE_Thread_Manager * = 0);
   ACE_Server_Logging_Handler (ACE_Thread_Manager *,
                               LOG_MESSAGE_RECEIVER const &receiver);
-  virtual int open (void *= 0);
+  virtual int open (void * = 0);
 };
 
 #if !defined (ACE_HAS_THREADS)