ChangeLogTag:Tue Mar 16 00:49:15 2004 Ossama Othman <ossama@dre.vanderbilt.edu>

1 files changed, 393 insertions, 393 deletions

diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp
index 83899b0e823..9baa62a9bbf 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS.cpp
@@ -51,7 +51,7 @@
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
-#include "tao/PICurrent.h"
+#include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -705,30 +705,30 @@ public:
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * server_;
   const char * activator_;
 };
@@ -760,19 +760,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activa
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -786,14 +786,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activa
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -805,7 +805,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activa
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -816,7 +816,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activa
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -854,45 +854,45 @@ public:
       const char * activator
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * server_;
   const char * activator_;
 };
@@ -924,19 +924,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -950,14 +950,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -969,7 +969,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -980,7 +980,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1019,47 +1019,47 @@ public:
       const ImplementationRepository::Locator::ServerNameList & servers
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   void result (CORBA::Long result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * activator_;
   ImplementationRepository::Administration_ptr admin_;
   const ImplementationRepository::Locator::ServerNameList & servers_;
@@ -1095,23 +1095,23 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::argum
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (3);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->admin_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->servers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1125,11 +1125,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::excep
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1140,11 +1140,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::resul
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
-  
+
   return safe_result_any._retn ();
 }
 
@@ -1168,7 +1168,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::targe
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::result (CORBA::Long result)
 {
   // Update the result.
@@ -1189,45 +1189,45 @@ public:
       const CORBA::Long & token
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * activator_;
   const CORBA::Long & token_;
 };
@@ -1259,19 +1259,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::arg
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= token_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1285,11 +1285,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::exc
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1300,7 +1300,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::res
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1340,45 +1340,45 @@ public:
       ImplementationRepository::ServerObject_ptr server_object
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * server_;
   const char * activator_;
   const char * addr_;
@@ -1416,27 +1416,27 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_acti
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= addr_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->server_object_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1450,14 +1450,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_acti
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -1469,7 +1469,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_acti
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1480,7 +1480,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_acti
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1518,45 +1518,45 @@ public:
       const char * activator
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-  
+
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator &
     );
-  
+
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator &
     );
-  
+
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-  
+
   const char * server_;
   const char * activator_;
 };
@@ -1588,19 +1588,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator::argume
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= activator_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1614,14 +1614,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator::except
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -1633,7 +1633,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator::except
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1644,7 +1644,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator::result
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1683,7 +1683,7 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::the_TAO_Loc
 {
   static POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -1705,7 +1705,7 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::get_strateg
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -1725,10 +1725,10 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::dispatch (
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  
+
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-  
+
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -1738,29 +1738,29 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::dispatch (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-  
+
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-  
+
   if (status == -1)
     {
       ACE_THROW (CORBA::BAD_OPERATION ());
     }
-  
+
   ACE_TRY
     {
       collocated_skel (servant,
@@ -1804,9 +1804,9 @@ ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function (CORBA::Obje
 int
 ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer = 
+  ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1832,14 +1832,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::_TAO_Locator_Thru
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1861,14 +1861,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_i
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1889,14 +1889,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server_in_
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1917,14 +1917,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server_i
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1945,14 +1945,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shuttin
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1974,14 +1974,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_activato
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unregister_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2001,14 +2001,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unregister_activa
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_running_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2031,14 +2031,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_running
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find_in_activator (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2071,14 +2071,14 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find_in_activator
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::_TAO_Locator_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2098,14 +2098,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_in
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2124,14 +2124,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server_in_a
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2150,14 +2150,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server_in
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2176,14 +2176,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2203,14 +2203,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_activator
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unregister_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2228,14 +2228,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unregister_activat
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_running_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2256,14 +2256,14 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_running_
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
+}// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find_in_activator (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2289,7 +2289,7 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find_in_activator
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:97
 
 POA_ImplementationRepository::Locator::Locator (void)
@@ -2308,7 +2308,7 @@ POA_ImplementationRepository::Locator::~Locator (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::activate_server_in_activator_skel (
@@ -2325,10 +2325,10 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ())
@@ -2337,46 +2337,46 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->activate_server_in_activator (
                   server.in (),
-                  
+
                   activator.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -2384,7 +2384,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2400,35 +2400,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -2436,14 +2436,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::remove_server_in_activator_skel (
@@ -2460,10 +2460,10 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ())
@@ -2472,46 +2472,46 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->remove_server_in_activator (
                   server.in (),
-                  
+
                   activator.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -2519,7 +2519,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2535,35 +2535,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -2571,14 +2571,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::shutdown_server_in_activator_skel (
@@ -2595,10 +2595,10 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ())
@@ -2607,46 +2607,46 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->shutdown_server_in_activator (
                   server.in (),
-                  
+
                   activator.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -2654,7 +2654,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2670,35 +2670,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -2706,14 +2706,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::server_is_shutting_down_in_activator_skel (
@@ -2730,10 +2730,10 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ())
@@ -2742,46 +2742,46 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->server_is_shutting_down_in_activator (
                   server.in (),
-                  
+
                   activator.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -2789,7 +2789,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2805,35 +2805,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -2841,14 +2841,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::register_activator_skel (
@@ -2868,7 +2868,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
   CORBA::String_var activator;
   ImplementationRepository::Administration_var admin;
   ImplementationRepository::Locator::ServerNameList servers;
-  
+
   if (!(
       (_tao_in >> activator.out ()) &&
       (_tao_in >> admin.out ()) &&
@@ -2878,50 +2878,50 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       activator.in (),
-      
+
       admin.in (),
-      
+
       servers
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval = 
+            _tao_retval =
               _tao_impl->register_activator (
                   activator.in (),
-                  
+
                   admin.in (),
-                  
+
                   servers
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -2929,7 +2929,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::Long _tao_retval_info = _tao_retval;
@@ -2947,35 +2947,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -2983,11 +2983,11 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << _tao_retval)
       ))
@@ -2995,12 +2995,12 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::unregister_activator_skel (
@@ -3017,10 +3017,10 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var activator;
   CORBA::Long token;
-  
+
   if (!(
       (_tao_in >> activator.out ()) &&
       (_tao_in >> token)
@@ -3029,46 +3029,46 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       activator.in (),
-      
+
       token
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->unregister_activator (
                   activator.in (),
-                  
+
                   token
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -3076,7 +3076,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3092,35 +3092,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -3128,14 +3128,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::server_is_running_in_activator_skel (
@@ -3152,12 +3152,12 @@ POA_ImplementationRepository::Locator *_tao_impl =
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
   CORBA::String_var addr;
   ImplementationRepository::ServerObject_var server_object;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ()) &&
@@ -3168,54 +3168,54 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_running_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in (),
-      
+
       addr.in (),
-      
+
       server_object.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->server_is_running_in_activator (
                   server.in (),
-                  
+
                   activator.in (),
-                  
+
                   addr.in (),
-                  
+
                   server_object.in ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -3223,7 +3223,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3239,35 +3239,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -3275,14 +3275,14 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::find_in_activator_skel (
@@ -3298,11 +3298,11 @@ POA_ImplementationRepository::Locator *_tao_impl =
         POA_ImplementationRepository::Locator *,
         _tao_servant
       );
-  
+
   CORBA::String_var server;
   CORBA::String_var activator;
   ImplementationRepository::ServerInformation_var info;
-  
+
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> activator.out ())
@@ -3311,48 +3311,48 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (
         TAO_Object_Adapter::Servant_Upcall *,
         _tao_servant_upcall
       );
-    
+
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-  
+
   TAO_ServerRequestInfo_ImplementationRepository_Locator_find_in_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      
+
       server.in (),
-      
+
       activator.in ()
       ACE_ENV_ARG_PARAMETER
     );
-  
+
   ACE_TRY
     {
       {
-        TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
-                                           1  /* Copy TSC to RSC */);
-        
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            
+
               _tao_impl->find_in_activator (
                   server.in (),
-                  
+
                   activator.in (),
-                  
+
                   info.out ()
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -3360,7 +3360,7 @@ POA_ImplementationRepository::Locator *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-      
+
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3376,35 +3376,35 @@ POA_ImplementationRepository::Locator *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-  
+
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-      
+
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-      
+
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -3412,11 +3412,11 @@ POA_ImplementationRepository::Locator *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
+
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(
       (_tao_out << info.in ())
       ))
@@ -3424,40 +3424,40 @@ POA_ImplementationRepository::Locator *_tao_impl =
       TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_ImplementationRepository::Locator::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  
+
   POA_ImplementationRepository::Locator *_tao_impl =
     (POA_ImplementationRepository::Locator *) _tao_servant;
-  
+
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-  
+
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-  
+
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -3465,7 +3465,7 @@ void POA_ImplementationRepository::Locator::_is_a_skel (
 }
 
 void POA_ImplementationRepository::Locator::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -3473,14 +3473,14 @@ void POA_ImplementationRepository::Locator::_non_existent_skel (
 {
   POA_ImplementationRepository::Locator *_tao_impl =
     (POA_ImplementationRepository::Locator *) _tao_servant;
-  
+
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -3488,7 +3488,7 @@ void POA_ImplementationRepository::Locator::_non_existent_skel (
 }
 
 void POA_ImplementationRepository::Locator::_interface_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -3498,30 +3498,30 @@ void POA_ImplementationRepository::Locator::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-  
+
   POA_ImplementationRepository::Locator *_tao_impl =
     (POA_ImplementationRepository::Locator *) _tao_servant;
-  
-  CORBA::InterfaceDef_ptr _tao_retval = 
+
+  CORBA::InterfaceDef_ptr _tao_retval =
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -3529,7 +3529,7 @@ void POA_ImplementationRepository::Locator::_interface_skel (
 }
 
 void POA_ImplementationRepository::Locator::_component_skel (
-    TAO_ServerRequest &_tao_server_request, 
+    TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -3537,14 +3537,14 @@ void POA_ImplementationRepository::Locator::_component_skel (
 {
   POA_ImplementationRepository::Locator *_tao_impl =
     (POA_ImplementationRepository::Locator *) _tao_object_reference;
-  
+
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
+
   if (!(_tao_out << _tao_retval.in ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -3588,19 +3588,19 @@ void* POA_ImplementationRepository::Locator::_downcast (
     {
       return ACE_static_cast (POA_ImplementationRepository::Administration_ptr, this);
     }
-  
+
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:ImplementationRepository/Locator:1.0") == 0)
     {
       return ACE_static_cast (POA_ImplementationRepository::Locator_ptr, this);
     }
-  
+
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
       return ACE_static_cast (PortableServer::Servant, this);
     }
-  
+
   return 0;
 }
 
@@ -3632,10 +3632,10 @@ POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -3652,10 +3652,10 @@ POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::ImplementationRepository::Locator STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3667,7 +3667,7 @@ POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
 // TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_root/root.cpp:1777
 
-#if 0 
+#if 0
 /* Useful at a later date.
 At present will be commented out */
 
@@ -3914,8 +3914,8 @@ At present will be commented out */
         ImplementationRepository::ServerInformation_out \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-#endif /*if 0*/ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /*if 0*/
 
 
 #endif /* ifndef */