.

3 files changed, 39 insertions, 28 deletions

diff --git a/netsvcs/lib/Server_Logging_Handler.cpp b/netsvcs/lib/Server_Logging_Handler.cpp
index 346f1ad2da3..ded5a2d321f 100644
--- a/netsvcs/lib/Server_Logging_Handler.cpp
+++ b/netsvcs/lib/Server_Logging_Handler.cpp
@@ -19,6 +19,7 @@ ACE_SVC_FACTORY_DEFINE (ACE_Thr_Server_Logging_Acceptor)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class Log_Message_Receiver_Impl<ACE_NULL_SYNCH>;
+#if defined (ACE_HAS_THREADS)
 template class Static_Log_Message_Receiver<ACE_NULL_SYNCH>;
 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>;
@@ -36,7 +37,7 @@ template class ACE_Server_Logging_Handler<Null_Synch_Static_Receiver>;
   template class Base_Optimizer<Null_Synch_Static_Receiver, ACE_CString>;
   template class Base_Optimizer<Null_Synch_Static_Receiver, ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> >;
 #endif /* ! (ACE_HAS_BROKEN_HPUX_TEMPLATES) && ! (__GNUG__) */
-
+#endif /* ACE_HAS_THREADS */
 
 template class Static_Log_Message_Receiver<ACE_LOGGER_SYNCH>;
 template class Log_Message_Receiver<ACE_LOGGER_SYNCH>;
@@ -125,6 +126,7 @@ template class ACE_Thr_Server_Logging_Handler<Synch_Receiver>;
   #endif /* ACE_HAS_TLI */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate Log_Message_Receiver_Impl<ACE_NULL_SYNCH>
+#if defined (ACE_HAS_THREADS)
 #pragma instantiate Static_Log_Message_Receiver<ACE_NULL_SYNCH>
 #pragma instantiate ACE_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
 #pragma instantiate ACE_Accept_Strategy<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>
@@ -142,7 +144,7 @@ template class ACE_Thr_Server_Logging_Handler<Synch_Receiver>;
   #pragma instantiate Base_Optimizer<Null_Synch_Static_Receiver, ACE_CString>
   #pragma instantiate Base_Optimizer<Null_Synch_Static_Receiver, ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> >
 #endif /* ! (ACE_HAS_BROKEN_HPUX_TEMPLATES) && ! (__GNUG__) */
-
+#endif /* ACE_HAS_THREADS */
 
 #pragma instantiate Static_Log_Message_Receiver<ACE_LOGGER_SYNCH>
 #pragma instantiate Log_Message_Receiver<ACE_LOGGER_SYNCH>
diff --git a/netsvcs/lib/Server_Logging_Handler.h b/netsvcs/lib/Server_Logging_Handler.h
index 3f20c55dbfa..26b79d178f9 100644
--- a/netsvcs/lib/Server_Logging_Handler.h
+++ b/netsvcs/lib/Server_Logging_Handler.h
@@ -10,7 +10,7 @@
 //    Server_Logging_Handler.h
 //
 // = AUTHOR
-//    Doug Schmidt and Per Andersson
+//    Doug Schmidt and Per Andersson <Per.Andersson@hfera.ericsson.se>
 //
 // ============================================================================
 
@@ -20,69 +20,74 @@
 #include "Log_Message_Receiver.h"
 #include "Server_Logging_Handler_T.h"
 
-// typedefs for Logging Handlers & acceptors using a static
-// type based log message receivers.
+// Typedefs for Logging Handlers & acceptors using a static type based
+// log message receivers.
 
 // Synched and NULL synched message receivers
-typedef Static_Log_Message_Receiver<ACE_NULL_SYNCH> Null_Synch_Static_Receiver;
-typedef Static_Log_Message_Receiver<ACE_LOGGER_SYNCH> Synch_Static_Receiver;
+typedef Static_Log_Message_Receiver<ACE_NULL_SYNCH>
+        Null_Synch_Static_Receiver;
+typedef Static_Log_Message_Receiver<ACE_LOGGER_SYNCH>
+        Synch_Static_Receiver;
 
 // NULL synched logging handler
-typedef ACE_Server_Logging_Handler<Null_Synch_Static_Receiver> Null_Synch_Logging_Handler_Static_Receiver;
+typedef ACE_Server_Logging_Handler<Null_Synch_Static_Receiver>
+        Null_Synch_Logging_Handler_Static_Receiver;
 
 // synched logging handlers
-typedef ACE_Server_Logging_Handler<Synch_Static_Receiver> Synch_Logging_Handler_Static_Receiver;
-typedef ACE_Thr_Server_Logging_Handler<Synch_Static_Receiver> Synch_Thr_Logging_Handler_Static_Receiver;
+typedef ACE_Server_Logging_Handler<Synch_Static_Receiver>
+        Synch_Logging_Handler_Static_Receiver;
+typedef ACE_Thr_Server_Logging_Handler<Synch_Static_Receiver>
+        Synch_Thr_Logging_Handler_Static_Receiver;
 
 // NULL synched logging acceptor
 typedef ACE_Server_Logging_Acceptor_T<Null_Synch_Logging_Handler_Static_Receiver,
                                       Null_Synch_Static_Receiver,
                                       ACE_Schedule_All_Reactive_Strategy<Null_Synch_Logging_Handler_Static_Receiver> >
-                  Null_Synch_Logging_Handler_Static_Receiver_Acceptor;
+        Null_Synch_Logging_Handler_Static_Receiver_Acceptor;
 
 // NULL synched logging acceptors
 typedef ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Static_Receiver,
                                       Synch_Static_Receiver,
                                       ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Static_Receiver> >
-                  Synch_Logging_Handler_Static_Receiver_Acceptor;
+        Synch_Logging_Handler_Static_Receiver_Acceptor;
 
 typedef ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Static_Receiver,
                                       Synch_Static_Receiver,
                                       ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Static_Receiver> >
-                  Synch_Thr_Logging_Handler_Static_Receiver_Acceptor;
+        Synch_Thr_Logging_Handler_Static_Receiver_Acceptor;
 
-// typedefs for Logging Handlers & acceptors using a instance
-// based log message receivers.
+// typedefs for Logging Handlers & acceptors using a instance based
+// log message receivers.
 
 // Synched message receivers
-typedef Log_Message_Receiver<ACE_LOGGER_SYNCH> Synch_Receiver;
+typedef Log_Message_Receiver<ACE_LOGGER_SYNCH> 
+        Synch_Receiver;
 
 // synched logging handlers
-typedef ACE_Server_Logging_Handler<Synch_Receiver> Synch_Logging_Handler_Receiver;
-typedef ACE_Thr_Server_Logging_Handler<Synch_Receiver> Synch_Thr_Logging_Handler_Receiver;
+typedef ACE_Server_Logging_Handler<Synch_Receiver>
+        Synch_Logging_Handler_Receiver;
+typedef ACE_Thr_Server_Logging_Handler<Synch_Receiver>
+        Synch_Thr_Logging_Handler_Receiver;
 
 // synched logging acceptors
 typedef ACE_Server_Logging_Acceptor_T<Synch_Logging_Handler_Receiver,
                                       Synch_Receiver,
                                       ACE_Schedule_All_Reactive_Strategy<Synch_Logging_Handler_Receiver> >
-                  Synch_Logging_Handler_Receiver_Acceptor;
+        Synch_Logging_Handler_Receiver_Acceptor;
 
 typedef ACE_Server_Logging_Acceptor_T<Synch_Thr_Logging_Handler_Receiver,
                                       Synch_Receiver,
                                       ACE_Schedule_All_Threaded_Strategy<Synch_Thr_Logging_Handler_Receiver> >
-                  Synch_Thr_Logging_Handler_Receiver_Acceptor;
+        Synch_Thr_Logging_Handler_Receiver_Acceptor;
 
 
 // Define external acceptors
 
-// acceptors that use static/type based log message receiver
-typedef  Null_Synch_Logging_Handler_Static_Receiver_Acceptor ACE_Server_Logging_Acceptor;
-typedef  Synch_Thr_Logging_Handler_Static_Receiver_Acceptor ACE_Thr_Server_Logging_Acceptor;
-
-// acceptors that use instance based log message receiver
-//typedef  Synch_Logging_Handler_Receiver_Acceptor ACE_Server_Logging_Acceptor;
-//typedef  Synch_Thr_Logging_Handler_Receiver_Acceptor ACE_Thr_Server_Logging_Acceptor;
-
+// Acceptors that use static/type based log message receiver.
+typedef Null_Synch_Logging_Handler_Static_Receiver_Acceptor 
+        ACE_Server_Logging_Acceptor;
+typedef Synch_Thr_Logging_Handler_Static_Receiver_Acceptor 
+        ACE_Thr_Server_Logging_Acceptor;
 
 ACE_SVC_FACTORY_DECLARE (ACE_Server_Logging_Acceptor)
 ACE_SVC_FACTORY_DECLARE (ACE_Thr_Server_Logging_Acceptor)
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index 46a23e23a31..79c48c3ac1e 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -742,6 +742,7 @@ template class ACE_Creation_Strategy<Svc_Handler>;
 template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>;
 template class ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
 template class ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
+#if defined (ACE_HAS_THREADS)
 template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
@@ -749,6 +750,7 @@ template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handle
 template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
+#endif /* ACE_HAS_THREADS */
 template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
@@ -788,6 +790,7 @@ template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
 #pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>
 #pragma instantiate ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>
 #pragma instantiate ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>
+#if defined (ACE_HAS_THREADS)
 #pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
@@ -795,6 +798,7 @@ template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
+#endif /* ACE_HAS_THREADS */
 #pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>