6 files changed, 3 insertions, 36 deletions
diff --git a/TAO/tao/PortableServer/ORT_Adapter.cpp b/TAO/tao/PortableServer/ORT_Adapter.cpp
index 2e5546db090..5c918bb1a4b 100644
--- a/TAO/tao/PortableServer/ORT_Adapter.cpp
+++ b/TAO/tao/PortableServer/ORT_Adapter.cpp
@@ -7,15 +7,3 @@ ACE_RCSID(PortableServer,
           ORT_Adapter,
           "$Id$")
 
-namespace TAO
-{
-  #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class ACE_Dynamic_Service<ORT_Adapter>;
-
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-  #pragma instantiate ACE_Dynamic_Service<ORT_Adapter>
-
-  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-}
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
index 746e52f2837..b64dec61851 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
@@ -12,15 +12,5 @@ namespace TAO
   ORT_Adapter_Factory::~ORT_Adapter_Factory (void)
   {
   }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class ACE_Dynamic_Service<ORT_Adapter_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<ORT_Adapter_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 }
 
diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp
index 3f1fd83a956..98331b770b4 100644
--- a/TAO/tao/PortableServer/StrategyFactory.cpp
+++ b/TAO/tao/PortableServer/StrategyFactory.cpp
@@ -14,16 +14,5 @@ namespace TAO
     StrategyFactory::~StrategyFactory (void)
     {
     }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<StrategyFactory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<StrategyFactory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
   } /* namespace Portable_Server */
 } /* namespace TAO */
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index cf4d03e7f45..bdbb6888c2b 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -88,7 +88,7 @@ TAO_RT_ORBInitializer::pre_init (
                                  rt_poa_factory_directive);
 
   // Create the initial priority mapping instance.
-  TAO_Priority_Mapping *pm;
+  TAO_Priority_Mapping *pm = 0;
   switch (this->priority_mapping_type_)
     {
     case TAO_PRIORITY_MAPPING_CONTINUOUS:
diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp
index 3ffb1bf388f..b93f0e3f7b2 100644
--- a/TAO/tests/Big_Twoways/Peer.cpp
+++ b/TAO/tests/Big_Twoways/Peer.cpp
@@ -24,7 +24,7 @@ Peer::create_session (Test::Session_Control_ptr control,
                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  Session *session_impl;
+  Session *session_impl = 0;
   ACE_NEW_THROW_EX (session_impl,
                     Session (control,
                              payload_size,
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
index ba69a8f271c..37b911f8198 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
@@ -12,7 +12,7 @@ project(*Server): taoserver, valuetype, pi, pi_server, interceptors {
   }
 }
 
-project(*Client): taoclient, valuetype, pi, interceptors {
+project(*Client): taoclient, valuetype, pi, pi_server, interceptors {
   idlflags += -DCORBA3
 
   Source_Files {