removed template specializations that are now in ace/Service_Record.cpp and ace/Task.cpp

21 files changed, 74 insertions, 97 deletions

diff --git a/apps/Gateway/Gateway/Event_Channel.cpp b/apps/Gateway/Gateway/Event_Channel.cpp
index 43c0e919e40..d02b4d368ea 100644
--- a/apps/Gateway/Gateway/Event_Channel.cpp
+++ b/apps/Gateway/Gateway/Event_Channel.cpp
@@ -440,9 +440,5 @@ ACE_Event_Channel::open (void *)
 template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>;
 template class ACE_Map_Iterator<ACE_INT32, Proxy_Handler *, MAP_MUTEX>;
 template class ACE_Map_Manager<ACE_INT32, Proxy_Handler *, MAP_MUTEX>;
-template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-template class ACE_Task<ACE_SYNCH>;
-template class ACE_Module<ACE_NULL_SYNCH>;
-template class ACE_Thru_Task<ACE_NULL_SYNCH>;
 template class ACE_Unbounded_Set_Iterator<Proxy_Handler *>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/Gateway/Gateway/Proxy_Handler.cpp b/apps/Gateway/Gateway/Proxy_Handler.cpp
index e6dc3820bc1..3d407a81ea3 100644
--- a/apps/Gateway/Gateway/Proxy_Handler.cpp
+++ b/apps/Gateway/Gateway/Proxy_Handler.cpp
@@ -245,5 +245,4 @@ template class ACE_Map_Iterator<Event_Key, Consumer_Dispatch_Set *, MAP_MUTEX>;
 template class ACE_Map_Manager<Event_Key, Consumer_Dispatch_Set *, MAP_MUTEX>;
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>;
-template class ACE_TSS<ACE_Dynamic>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/Gateway/Gateway/Proxy_Handler_Connector.cpp b/apps/Gateway/Gateway/Proxy_Handler_Connector.cpp
index abe3bdbe55a..5727f443edf 100644
--- a/apps/Gateway/Gateway/Proxy_Handler_Connector.cpp
+++ b/apps/Gateway/Gateway/Proxy_Handler_Connector.cpp
@@ -98,7 +98,12 @@ template class ACE_Svc_Tuple<Proxy_Handler>;
 template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Proxy_Handler> *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Proxy_Handler> *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Proxy_Handler> *>;
-template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+
+#if defined (ACE_HAS_THREADS)
+  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+#else
+  // These are specialized in libACE if ACE doesn't have threads.
+#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp
index 88b09e16687..744eea7ad89 100644
--- a/apps/JAWS/server/HTTP_Server.cpp
+++ b/apps/JAWS/server/HTTP_Server.cpp
@@ -252,8 +252,4 @@ ACE_STATIC_SVC_DEFINE (HTTP_Server, "HTTP_Server", ACE_SVC_OBJ_T,
 
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>;
-template class ACE_Task<ACE_NULL_SYNCH>;
-template class ACE_Thru_Task<ACE_NULL_SYNCH>;
-template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-template class ACE_Module<ACE_NULL_SYNCH>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 7a1a9f7153d..86e1de48f7d 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -208,6 +208,6 @@ main (int argc, char *argv[])
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Connector<Event_Transceiver, ACE_SOCK_CONNECTOR>;
 template class ACE_Svc_Tuple<Event_Transceiver>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<Event_Transceiver> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<Event_Transceiver> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Event_Transceiver> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Event_Transceiver> *, ACE_SYNCH_RW_MUTEX>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
index a1421e05ef3..e34270deab3 100644
--- a/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
@@ -131,7 +131,7 @@ template class ACE_Acceptor<Consumer_Handler, ACE_UPIPE_ACCEPTOR>;
 template class Acceptor_Factory<Consumer_Handler, CONSUMER_KEY>;
 template class Peer_Handler<CONSUMER_ROUTER, CONSUMER_KEY>;
 template class Peer_Router<Consumer_Handler, CONSUMER_KEY>;
-template class ACE_Map_Iterator<long, Consumer_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Manager<long, Consumer_Handler *, ACE_RW_Mutex>;
+template class ACE_Map_Iterator<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>;
+template class ACE_Map_Manager<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
 #endif /* ACE_HAS_THREADS */
diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index f0674f11bb5..05f3c911293 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -192,16 +192,16 @@ IPC_Client::parse_args (int argc, char *argv[])
 
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Connector<Peer_Handler, ACE_SPIPE_CONNECTOR>;
-template class ACE_Guard<ACE_RW_Mutex>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<Peer_Handler> *, ACE_RW_Mutex>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<Peer_Handler> *, ACE_RW_Mutex>;
-template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-template class ACE_Module<ACE_NULL_SYNCH>;
-template class ACE_Read_Guard<ACE_RW_Mutex>;
+template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Peer_Handler> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Peer_Handler> *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Svc_Tuple<Peer_Handler>;
-template class ACE_TSS<ACE_Dynamic>;
-template class ACE_Task<ACE_NULL_SYNCH>;
-template class ACE_Thru_Task<ACE_NULL_SYNCH>;
-template class ACE_Write_Guard<ACE_RW_Mutex>;
+
+#if defined (ACE_HAS_THREADS)
+  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+#else
+  // These are specialized in libACE if ACE doesn't have threads.
+#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/misc/Connection_Handler.cpp b/examples/Connection/misc/Connection_Handler.cpp
index 0fb35036c94..610d642abca 100644
--- a/examples/Connection/misc/Connection_Handler.cpp
+++ b/examples/Connection/misc/Connection_Handler.cpp
@@ -229,10 +229,5 @@ main (int argc, char *argv[])
 
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-template class ACE_Module<ACE_NULL_SYNCH>;
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_TSS<ACE_Dynamic>;
-template class ACE_Task<ACE_NULL_SYNCH>;
-template class ACE_Thru_Task<ACE_NULL_SYNCH>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp
index 816b73b1714..e7109dbdaa0 100644
--- a/examples/Connection/misc/test_upipe.cpp
+++ b/examples/Connection/misc/test_upipe.cpp
@@ -177,21 +177,21 @@ template class ACE_Acceptor<Server_Service, ACE_UPIPE_ACCEPTOR>;
 template class ACE_Concurrency_Strategy<Server_Service>;
 template class ACE_Connector<Client_Service, ACE_UPIPE_CONNECTOR>;
 template class ACE_Creation_Strategy<Server_Service>;
-template class ACE_Guard<ACE_Null_Mutex>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<Client_Service> *, ACE_Null_Mutex>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<Client_Service> *, ACE_Null_Mutex>;
-template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-template class ACE_Module<ACE_NULL_SYNCH>;
-template class ACE_Read_Guard<ACE_Null_Mutex>;
+template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Client_Service> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Client_Service> *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Scheduling_Strategy<Server_Service>;
 template class ACE_Strategy_Acceptor<Server_Service, ACE_UPIPE_ACCEPTOR>;
 template class ACE_Svc_Handler<ACE_UPIPE_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Svc_Tuple<Client_Service>;
-template class ACE_TSS<ACE_Dynamic>;
-template class ACE_Task<ACE_NULL_SYNCH>;
 template class ACE_Thread_Strategy<Server_Service>;
-template class ACE_Thru_Task<ACE_NULL_SYNCH>;
-template class ACE_Write_Guard<ACE_Null_Mutex>;
+
+#if defined (ACE_HAS_THREADS)
+  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+#else
+  // These are specialized in libACE if ACE doesn't have threads.
+#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
 
 #else
diff --git a/examples/Connection/non_blocking/test_sock_acceptor.cpp b/examples/Connection/non_blocking/test_sock_acceptor.cpp
index 6bc67888972..853ea8c38dd 100644
--- a/examples/Connection/non_blocking/test_sock_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_sock_acceptor.cpp
@@ -27,12 +27,7 @@ main (int argc, char *argv[])
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Concurrency_Strategy<SVC_HANDLER>;
 template class ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_SOCK_ACCEPTOR>;
-template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-template class ACE_Module<ACE_NULL_SYNCH>;
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_TSS<ACE_Dynamic>;
-template class ACE_Task<ACE_NULL_SYNCH>;
-template class ACE_Thru_Task<ACE_NULL_SYNCH>;
 template class IPC_Server<SVC_HANDLER, ACE_SOCK_ACCEPTOR>;
 template class Svc_Handler<ACE_SOCK_STREAM>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/non_blocking/test_sock_connector.cpp b/examples/Connection/non_blocking/test_sock_connector.cpp
index 52f3d9a7b72..3111f90e5db 100644
--- a/examples/Connection/non_blocking/test_sock_connector.cpp
+++ b/examples/Connection/non_blocking/test_sock_connector.cpp
@@ -27,12 +27,16 @@ main (int argc, char *argv[])
 template class ACE_Connector<PEER_HANDLER, ACE_SOCK_CONNECTOR>;
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>;
 template class ACE_Svc_Tuple<PEER_HANDLER>;
-template class ACE_TSS<ACE_Dynamic>;
 template class IPC_Client<PEER_HANDLER, ACE_SOCK_CONNECTOR>;
 template class Peer_Handler<ACE_SOCK_STREAM>;
-template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
+
+#if defined (ACE_HAS_THREADS)
+  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+#else
+  // These are specialized in libACE if ACE doesn't have threads.
+#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/non_blocking/test_spipe_acceptor.cpp b/examples/Connection/non_blocking/test_spipe_acceptor.cpp
index fa4d4a4481d..76374f208f6 100644
--- a/examples/Connection/non_blocking/test_spipe_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_spipe_acceptor.cpp
@@ -26,12 +26,7 @@ main (int argc, char *argv[])
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Concurrency_Strategy<SVC_HANDLER>;
 template class ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_SPIPE_ACCEPTOR>;
-template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-template class ACE_Module<ACE_NULL_SYNCH>;
 template class ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_NULL_SYNCH>;
-template class ACE_TSS<ACE_Dynamic>;
-template class ACE_Task<ACE_NULL_SYNCH>;
-template class ACE_Thru_Task<ACE_NULL_SYNCH>;
 template class IPC_Server<SVC_HANDLER, ACE_SPIPE_ACCEPTOR>;
 template class Svc_Handler<ACE_SPIPE_STREAM>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/non_blocking/test_spipe_connector.cpp b/examples/Connection/non_blocking/test_spipe_connector.cpp
index c629c7ddff7..1c06a3fa6b9 100644
--- a/examples/Connection/non_blocking/test_spipe_connector.cpp
+++ b/examples/Connection/non_blocking/test_spipe_connector.cpp
@@ -27,14 +27,18 @@ main (int argc, char *argv[])
 template class ACE_Connector<PEER_HANDLER, ACE_SPIPE_CONNECTOR>;
 template class ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_SYNCH>;
 template class ACE_Svc_Tuple<PEER_HANDLER>;
-template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_TSS<ACE_Dynamic>;
+template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
 template class IPC_Client<PEER_HANDLER, ACE_SPIPE_CONNECTOR>;
 template class Peer_Handler<ACE_SPIPE_STREAM>;
+
+#if defined (ACE_HAS_THREADS)
+  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+#else
+  // These are specialized in libACE if ACE doesn't have threads.
+#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
 
 #else
diff --git a/examples/Connection/non_blocking/test_tli_acceptor.cpp b/examples/Connection/non_blocking/test_tli_acceptor.cpp
index 6e08159781a..fb7e373dddb 100644
--- a/examples/Connection/non_blocking/test_tli_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_tli_acceptor.cpp
@@ -27,12 +27,7 @@ main (int argc, char *argv[])
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Concurrency_Strategy<SVC_HANDLER>;
 template class ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_TLI_ACCEPTOR>;
-template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-template class ACE_Module<ACE_NULL_SYNCH>;
 template class ACE_Svc_Handler<ACE_TLI_STREAM, ACE_NULL_SYNCH>;
-template class ACE_TSS<ACE_Dynamic>;
-template class ACE_Task<ACE_NULL_SYNCH>;
-template class ACE_Thru_Task<ACE_NULL_SYNCH>;
 template class IPC_Server<SVC_HANDLER, ACE_TLI_ACCEPTOR>;
 template class Svc_Handler<ACE_TLI_STREAM>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/non_blocking/test_tli_connector.cpp b/examples/Connection/non_blocking/test_tli_connector.cpp
index fc2ac9a7105..b7a9b3ca3ca 100644
--- a/examples/Connection/non_blocking/test_tli_connector.cpp
+++ b/examples/Connection/non_blocking/test_tli_connector.cpp
@@ -29,14 +29,18 @@ main (int argc, char *argv[])
 template class ACE_Connector<PEER_HANDLER, ACE_TLI_CONNECTOR>;
 template class ACE_Svc_Handler<ACE_TLI_STREAM, ACE_SYNCH>;
 template class ACE_Svc_Tuple<PEER_HANDLER>;
-template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_TSS<ACE_Dynamic>;
+template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
 template class IPC_Client<PEER_HANDLER, ACE_TLI_CONNECTOR>;
 template class Peer_Handler<ACE_TLI_STREAM>;
+
+#if defined (ACE_HAS_THREADS)
+  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+#else
+  // These are specialized in libACE if ACE doesn't have threads.
+#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
 
 #else
diff --git a/examples/IOStream/server/iostream_server.cpp b/examples/IOStream/server/iostream_server.cpp
index 21958e66449..149d5a61eb7 100644
--- a/examples/IOStream/server/iostream_server.cpp
+++ b/examples/IOStream/server/iostream_server.cpp
@@ -141,11 +141,6 @@ main (int argc, char *argv [])
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Acceptor <Handler, ACE_SOCK_ACCEPTOR>;
 template class ACE_IOStream <ACE_SOCK_Stream>;
-template class ACE_Message_Queue <ACE_NULL_SYNCH>;
-template class ACE_Module <ACE_NULL_SYNCH>;
 template class ACE_Streambuf <ACE_SOCK_Stream>;
 template class ACE_Svc_Handler <ACE_SOCK_IOStream, ACE_INET_Addr, ACE_NULL_SYNCH>;
-template class ACE_TSS <ACE_Dynamic>;
-template class ACE_Task <ACE_NULL_SYNCH>;
-template class ACE_Thru_Task <ACE_NULL_SYNCH>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index 7a7a13fc6ff..941b9b8438f 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -253,14 +253,9 @@ main (int argc, char *argv[])
 
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Acceptor<Logging_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-template class ACE_Module<ACE_NULL_SYNCH>;
 template class ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>;
 template class ACE_Singleton<ACE_Test_and_Set <ACE_Null_Mutex, sig_atomic_t>, ACE_Null_Mutex>;
 template class ACE_Singleton<Options, ACE_Null_Mutex>;
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_TSS<ACE_Dynamic>;
-template class ACE_Task<ACE_NULL_SYNCH>;
 template class ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>;
-template class ACE_Thru_Task<ACE_NULL_SYNCH>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
index 7720b0515d4..0f8ac4f081f 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
@@ -198,7 +198,6 @@ template class ACE_Svc_Handler<ACE_TLI_STREAM, ACE_MT_SYNCH>;
 template class ACE_Concurrency_Strategy<CLI_STREAM>;
 template class ACE_Creation_Strategy<CLI_STREAM>;
 template class ACE_Scheduling_Strategy<CLI_STREAM>;
-template class ACE_TSS<ACE_Dynamic>;
 template class ACE_Thread_Strategy<CLI_STREAM>;
 template class CLI_Stream <THR_STREAM>;
 template class Handle_Thr_Acceptor<CLI_STREAM, THR_ACCEPTOR>;
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index 614ad15b25d..21ffab135f7 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -306,6 +306,6 @@ ACE_SVC_FACTORY_DEFINE (ACE_Client_Logging_Connector)
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Connector<ACE_Client_Logging_Handler, ACE_SOCK_CONNECTOR>;
 template class ACE_Svc_Tuple<ACE_Client_Logging_Handler>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<ACE_Client_Logging_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<ACE_Client_Logging_Handler> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<ACE_Client_Logging_Handler> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<ACE_Client_Logging_Handler> *, ACE_SYNCH_RW_MUTEX>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp
index 590537c725d..653e70a05a3 100644
--- a/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -597,9 +597,14 @@ template class ACE_Set_Node<ACE_TS_Clerk_Handler *>;
 template class ACE_Svc_Tuple<ACE_TS_Clerk_Handler>;
 template class ACE_Unbounded_Set<ACE_TS_Clerk_Handler *>;
 template class ACE_Unbounded_Set_Iterator<ACE_TS_Clerk_Handler *>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<ACE_TS_Clerk_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<ACE_TS_Clerk_Handler> *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<ACE_TS_Clerk_Handler> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<ACE_TS_Clerk_Handler> *, ACE_SYNCH_RW_MUTEX>;
+
+#if defined (ACE_HAS_THREADS)
+  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
+  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+#else
+  // These are specialized in libACE if ACE doesn't have threads.
+#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp
index ed674a86f82..ab542fb8d20 100644
--- a/netsvcs/lib/TS_Server_Handler.cpp
+++ b/netsvcs/lib/TS_Server_Handler.cpp
@@ -243,13 +243,8 @@ template class ACE_Accept_Strategy<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR>;
 template class ACE_Acceptor<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR>;
 template class ACE_Concurrency_Strategy<ACE_TS_Server_Handler>;
 template class ACE_Creation_Strategy<ACE_TS_Server_Handler>;
-template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-template class ACE_Module<ACE_NULL_SYNCH>;
 template class ACE_Schedule_All_Reactive_Strategy<ACE_TS_Server_Handler>;
 template class ACE_Scheduling_Strategy<ACE_TS_Server_Handler>;
 template class ACE_Strategy_Acceptor<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR>;
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_TSS<ACE_Dynamic>;
-template class ACE_Task<ACE_NULL_SYNCH>;
-template class ACE_Thru_Task<ACE_NULL_SYNCH>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */