ChangeLogTag: Thu Apr 20 11:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 12 insertions, 216 deletions

diff --git a/Kokyu/Dispatcher_Task.cpp b/Kokyu/Dispatcher_Task.cpp
index 491e59fda40..25ae499ec68 100644
--- a/Kokyu/Dispatcher_Task.cpp
+++ b/Kokyu/Dispatcher_Task.cpp
@@ -11,7 +11,7 @@
 
 ACE_RCSID(Kokyu, Dispatcher_Task, "$Id$")
 
-namespace 
+namespace
 //anonymous namespace - use this to avoid polluting the global namespace
 {
   const int ALLOC_POOL_CHUNKS = 200;
@@ -20,7 +20,7 @@ namespace
 namespace Kokyu
 {
 
-typedef ACE_Cached_Allocator<Dispatch_Queue_Item, ACE_SYNCH_MUTEX> 
+typedef ACE_Cached_Allocator<Dispatch_Queue_Item, ACE_SYNCH_MUTEX>
 Dispatch_Queue_Item_Allocator;
 
 int
@@ -150,7 +150,7 @@ Dispatcher_Task::enqueue (const Dispatch_Command* cmd,
                                    this->allocator_);
 
   this->putq (mb);
-  
+
   return 0;
 }
 
@@ -187,21 +187,3 @@ void Dispatch_Queue_Item::init_i (const QoSDescriptor& qos_info)
 
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >;
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-template class ACE_Cached_Allocator<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_MUTEX>;
-template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item> >;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item>, ACE_SYNCH_MUTEX>;
-template class ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item> >
-#pragma instantiate ACE_Cached_Allocator<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/Kokyu/Kokyu_defs.cpp b/Kokyu/Kokyu_defs.cpp
index dd99b6b7064..33ebae25f31 100644
--- a/Kokyu/Kokyu_defs.cpp
+++ b/Kokyu/Kokyu_defs.cpp
@@ -34,7 +34,7 @@ int Dispatcher_Attributes::thread_creation_flags () const
 
    switch (sched_policy_)
    {
-      case ACE_SCHED_FIFO: 
+      case ACE_SCHED_FIFO:
          thread_creation_flags |= THR_SCHED_FIFO;
          break;
 
@@ -54,22 +54,13 @@ int Dispatcher_Attributes::thread_creation_flags () const
          thread_creation_flags |= THR_SCOPE_PROCESS;
          break;
 
-      case ACE_SCOPE_THREAD: 
-      default:        
+      case ACE_SCOPE_THREAD:
+      default:
          thread_creation_flags |= THR_SCOPE_SYSTEM;
          break;
    }
-   return thread_creation_flags;   
+   return thread_creation_flags;
 }
 
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array<Kokyu::ConfigInfo>;
-template class ACE_Array_Base<Kokyu::ConfigInfo>;
-template class ACE_Array_Iterator<Kokyu::ConfigInfo>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Array<Kokyu::ConfigInfo>
-#pragma instantiate ACE_Array_Base<Kokyu::ConfigInfo>
-#pragma instantiate ACE_Array_Iterator<Kokyu::ConfigInfo>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/Kokyu/tests/DSRT_MIF/MIF.cpp b/Kokyu/tests/DSRT_MIF/MIF.cpp
index 17aee89687e..4c943533ad6 100644
--- a/Kokyu/tests/DSRT_MIF/MIF.cpp
+++ b/Kokyu/tests/DSRT_MIF/MIF.cpp
@@ -183,72 +183,3 @@ int ACE_TMAIN (int,ACE_TCHAR**)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Kokyu::DSRT_Dispatcher_Factory<mif_scheduler_traits>;
-template class Kokyu::DSRT_Dispatcher<mif_scheduler_traits>;
-template class Kokyu::DSRT_Dispatcher_Impl<mif_scheduler_traits>;
-template class Kokyu::DSRT_Direct_Dispatcher_Impl<mif_scheduler_traits>;
-template class Kokyu::DSRT_CV_Dispatcher_Impl<mif_scheduler_traits>;
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-template class Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>;
-template class Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>;
-template class Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Manager_Ex<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *, Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<int>, ACE_Null_Mutex>;
-
-template class ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>;
-
-template class ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Entry<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *>;
-
-template class ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> >;
-
-template class Kokyu::MIF_Comparator<mif_scheduler_traits::QoSDescriptor_t>;
-
-template class ACE_Hash_Map_Iterator_Base_Ex<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *, Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<int>, ACE_Null_Mutex>;
-
-template class ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>;
-
-template class ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>;
-
-template class ACE_Array_Iterator<Kokyu::ConfigInfo>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Kokyu::DSRT_Dispatcher_Factory<mif_scheduler_traits>
-#pragma instantiate Kokyu::DSRT_Dispatcher<mif_scheduler_traits>
-#pragma instantiate Kokyu::DSRT_Dispatcher_Impl<mif_scheduler_traits>
-#pragma instantiate Kokyu::DSRT_Direct_Dispatcher_Impl<mif_scheduler_traits>
-#pragma instantiate Kokyu::DSRT_CV_Dispatcher_Impl<mif_scheduler_traits>
-#pragma instantiate Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>
-#pragma instantiate Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>
-
-#pragma instantiate Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Manager_Ex<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *, Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<int>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>
-
-ACE_Hash_Map_Entry<int, ACE_RB_Tree_Node<Koky\
-u::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<\
-mif_scheduler_traits> >
-
-#pragma instantiate ACE_Hash_Map_Entry<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *>
-
-#pragma instantiate ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> >
-
-#pragma instantiate Kokyu::MIF_Comparator<mif_scheduler_traits::QoSDescriptor_t>
-
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits> > *, Kokyu::Sched_Ready_Queue<mif_scheduler_traits, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<int>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::DSRT_Dispatch_Item_var<mif_scheduler_traits>, Kokyu::Comparator_Adapter_Generator<mif_scheduler_traits>::MoreEligible, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Array_Iterator<Kokyu::ConfigInfo>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
index 8d376f27b4b..cb82eec16df 100644
--- a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
@@ -107,7 +107,7 @@ Peer_Router_Context::Peer_Router_Context (u_short port)
       if (this->acceptor ().get_local_addr (addr) != -1)
 	ACE_DEBUG ((LM_DEBUG,
 		    ACE_TEXT ("(%t) initializing %C on port = %d, handle = %d, this = %u\n"),
-		    addr.get_port_number () == Options::instance ()->supplier_port () 
+		    addr.get_port_number () == Options::instance ()->supplier_port ()
                     ? "Supplier_Handler" : "Consumer_Handler",
 		    addr.get_port_number (),
 		    this->acceptor().get_handle (),
@@ -250,7 +250,7 @@ Peer_Handler::open (void *)
   // Insert outselves into the routing map.
   else if (this->peer_router_context_->bind_peer (this->get_handle (),
                                                   this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
+    ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("bind_peer")),
                       -1);
@@ -285,7 +285,7 @@ Peer_Handler::handle_input (ACE_HANDLE h)
                                   db->size ());
 
   if (n == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
+    ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p"),
                        ACE_TEXT ("recv failed")),
                       -1);
@@ -300,7 +300,7 @@ Peer_Handler::handle_input (ACE_HANDLE h)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) shutting down handle %d\n"), h));
       // Instruct the <ACE_Reactor> to deregister us by returning -1.
-      return -1; 
+      return -1;
     }
   else
     {
@@ -411,7 +411,7 @@ Peer_Handler::svc (void)
 
           // We do not need to be deregistered by reactor
 	  // as we were not registered at all.
-	  return -1; 
+	  return -1;
 	}
       else
 	{
@@ -433,20 +433,3 @@ Peer_Handler::svc (void)
 #endif /* 0 */
 #endif /* _PEER_ROUTER_C */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<Peer_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Map_Entry<ROUTING_KEY, Peer_Handler *>;
-template class ACE_Map_Iterator_Base<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Peer_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Map_Entry<ROUTING_KEY, Peer_Handler *>
-#pragma instantiate ACE_Map_Iterator_Base<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Manager<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index a1b618bbffb..37bbaad7d3d 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -236,14 +236,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<Event_Transceiver>;
-template class ACE_Connector<Event_Transceiver, ACE_SOCK_CONNECTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_NonBlocking_Connect_Handler<Event_Transceiver>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<Event_Transceiver>
-#pragma instantiate ACE_Connector<Event_Transceiver, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<Event_Transceiver>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
index cc96c58c137..b9c9c0cf2bd 100644
--- a/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
@@ -135,26 +135,4 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const
   return ACE_OS::strlen (mod_name);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-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_Entry<CONSUMER_KEY, Consumer_Handler *>;
-template class ACE_Map_Iterator_Base<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Iterator<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Reverse_Iterator<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Manager<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Consumer_Handler, ACE_UPIPE_ACCEPTOR>
-#pragma instantiate Acceptor_Factory<Consumer_Handler, CONSUMER_KEY>
-#pragma instantiate Peer_Handler<CONSUMER_ROUTER, CONSUMER_KEY>
-#pragma instantiate Peer_Router<Consumer_Handler, CONSUMER_KEY>
-#pragma instantiate ACE_Map_Entry<CONSUMER_KEY, Consumer_Handler *>
-#pragma instantiate ACE_Map_Iterator_Base<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Iterator<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Manager<CONSUMER_KEY, Consumer_Handler *, ACE_RW_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_HAS_THREADS */
diff --git a/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
index 73fe806780a..8b4a53d6331 100644
--- a/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
@@ -134,35 +134,4 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const
   return ACE_OS::strlen (mod_name);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Acceptor_Factory<Supplier_Handler, SUPPLIER_KEY>;
-template class ACE_Acceptor<Supplier_Handler, ACE_UPIPE_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_UPIPE_STREAM, ACE_MT_SYNCH>;
-template class Peer_Handler<SUPPLIER_ROUTER, SUPPLIER_KEY>;
-template class Peer_Router<Supplier_Handler, SUPPLIER_KEY>;
-template class ACE_Map_Entry<SUPPLIER_KEY, Supplier_Handler *>;
-template class ACE_Map_Iterator_Base<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Iterator<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Reverse_Iterator<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>;
-template class ACE_Map_Manager<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>;
-template class ACE_Read_Guard<ACE_RW_Mutex>;
-template class ACE_Write_Guard<ACE_RW_Mutex>;
-template class ACE_Guard<ACE_RW_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Acceptor_Factory<Supplier_Handler, SUPPLIER_KEY>
-#pragma instantiate ACE_Acceptor<Supplier_Handler, ACE_UPIPE_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_UPIPE_STREAM, ACE_MT_SYNCH>
-#pragma instantiate Peer_Handler<SUPPLIER_ROUTER, SUPPLIER_KEY>
-#pragma instantiate Peer_Router<Supplier_Handler, SUPPLIER_KEY>
-#pragma instantiate ACE_Map_Entry<SUPPLIER_KEY, Supplier_Handler *>
-#pragma instantiate ACE_Map_Iterator_Base<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Iterator<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Map_Manager<SUPPLIER_KEY, Supplier_Handler *, ACE_RW_Mutex>
-#pragma instantiate ACE_Read_Guard<ACE_RW_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_RW_Mutex>
-#pragma instantiate ACE_Guard<ACE_RW_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 #endif /* ACE_HAS_THREADS */
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 af38408067d..fb53c0f8d70 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
@@ -191,32 +191,5 @@ typedef Handle_Thr_Acceptor<CLI_STREAM, THR_ACCEPTOR> HANDLE_THR_ACCEPTOR;
 HANDLE_THR_ACCEPTOR remote_thr_stream;
 ACE_Service_Object_Type rts (&remote_thr_stream, ACE_TEXT("Remote_Thr_Stream"));
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<CLI_STREAM, THR_ACCEPTOR>;
-template class ACE_Accept_Strategy<CLI_STREAM, THR_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<CLI_STREAM>;
-template class ACE_Creation_Strategy<CLI_STREAM>;
-template class ACE_Scheduling_Strategy<CLI_STREAM>;
-template class ACE_Strategy_Acceptor<CLI_STREAM, THR_ACCEPTOR>;
-template class ACE_Svc_Handler<THR_STREAM, ACE_MT_SYNCH>;
-template class ACE_Thread_Strategy<CLI_STREAM>;
-template class CLI_Stream <THR_STREAM>;
-template class Handle_Thr_Acceptor<CLI_STREAM, THR_ACCEPTOR>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<CLI_STREAM, THR_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<CLI_STREAM, THR_ACCEPTOR>
-#pragma instantiate ACE_Concurrency_Strategy<CLI_STREAM>
-#pragma instantiate ACE_Creation_Strategy<CLI_STREAM>
-#pragma instantiate ACE_Scheduling_Strategy<CLI_STREAM>
-#pragma instantiate ACE_Strategy_Acceptor<CLI_STREAM, THR_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<THR_STREAM, ACE_MT_SYNCH>
-#pragma instantiate ACE_Thread_Strategy<CLI_STREAM>
-#pragma instantiate CLI_Stream <THR_STREAM>
-#pragma instantiate Handle_Thr_Acceptor<CLI_STREAM, THR_ACCEPTOR>
-#elif defined (AIX) && (defined (__IBMCPP__) && (__IBMCPP__ >= 500))
-// This works around a bug in Visual Age C++ template auto-instantiate.
-template CLI_Stream<THR_STREAM>::CLI_Stream(ACE_Thread_Manager*);
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_HAS_THREADS */
 #endif /* ACE_HANDLE_THR_STREAM_C */