Thu Jun 24 13:24:56 1999 Irfan Pyarali <irfan@cs.wustl.edu>

3 files changed, 83 insertions, 96 deletions

diff --git a/TAO/tao/Forwarding_Servant.cpp b/TAO/tao/Forwarding_Servant.cpp
index eca4db6c77e..9288f775128 100644
--- a/TAO/tao/Forwarding_Servant.cpp
+++ b/TAO/tao/Forwarding_Servant.cpp
@@ -40,11 +40,11 @@ TAO_Forwarding_Servant::invoke (CORBA::ServerRequest_ptr request,
 CORBA::RepositoryId
 TAO_Forwarding_Servant::_primary_interface (const PortableServer::ObjectId &oid,
                                             PortableServer::POA_ptr poa,
-                                            CORBA::Environment &env)
+                                            CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_UNUSED_ARG (oid);
   ACE_UNUSED_ARG (poa);
-  ACE_UNUSED_ARG (env);
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
 
   return CORBA::string_dup (this->interface_repository_id_.in ());
 }
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index efe3dd30961..a4de6c68583 100644
--- a/TAO/tao/POAS.cpp
+++ b/TAO/tao/POAS.cpp
@@ -298,11 +298,10 @@ POA_PortableServer::_tao_collocated_ThreadPolicy::value (
 }
 
 PortableServer::ThreadPolicy*
-POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_ThreadPolicy (this, stub);
 }
 
@@ -585,11 +584,10 @@ POA_PortableServer::_tao_collocated_LifespanPolicy::value (
 }
 
 PortableServer::LifespanPolicy*
-POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_LifespanPolicy (this, stub);
 }
 
@@ -1155,11 +1153,10 @@ POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value (
 }
 
 PortableServer::IdAssignmentPolicy*
-POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy (this, stub);
 }
 
@@ -1442,11 +1439,10 @@ POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value (
 }
 
 PortableServer::ImplicitActivationPolicy*
-POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (this, stub);
 }
 
@@ -1727,11 +1723,10 @@ POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value (
 }
 
 PortableServer::ServantRetentionPolicy*
-POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy (this, stub);
 }
 
@@ -2012,11 +2007,10 @@ POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value (
 }
 
 PortableServer::RequestProcessingPolicy*
-POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy (this, stub);
 }
 
@@ -2137,11 +2131,10 @@ POA_PortableServer::_tao_collocated_POAManager:: get_state(CORBA::Environment &A
 }
 
 PortableServer::POAManager*
-POA_PortableServer::POAManager::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::POAManager::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_POAManager (this, stub);
 }
 
@@ -2222,11 +2215,10 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_ada
 
 
 PortableServer::AdapterActivator*
-POA_PortableServer::AdapterActivator::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::AdapterActivator::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_AdapterActivator (this, stub);
 }
 
@@ -2292,11 +2284,10 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a (
 
 
 PortableServer::ServantManager*
-POA_PortableServer::ServantManager::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::ServantManager::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_ServantManager (this, stub);
 }
 
@@ -2398,11 +2389,10 @@ void POA_PortableServer::_tao_collocated_ServantActivator::etherealize (
 
 
 PortableServer::ServantActivator*
-POA_PortableServer::ServantActivator::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::ServantActivator::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_ServantActivator (this, stub);
 }
 
@@ -2508,11 +2498,10 @@ void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke (
 
 
 PortableServer::ServantLocator*
-POA_PortableServer::ServantLocator::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::ServantLocator::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_ServantLocator (this, stub);
 }
 
@@ -2916,11 +2905,10 @@ CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::id_to_reference (
 
 
 PortableServer::POA*
-POA_PortableServer::POA::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::POA::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_POA (this, stub);
 }
 
@@ -3008,10 +2996,9 @@ PortableServer::ObjectId * POA_PortableServer::_tao_collocated_Current::get_obje
 
 
 PortableServer::Current*
-POA_PortableServer::Current::_this (CORBA_Environment &TAO_IN_ENV)
+POA_PortableServer::Current::_this (CORBA_Environment &ACE_TRY_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  if (TAO_IN_ENV.exception () != 0)
-    return 0;
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
   return new POA_PortableServer::_tao_collocated_Current (this, stub);
 }
diff --git a/TAO/tao/POAS.i b/TAO/tao/POAS.i
index ea63bcf1531..0d08448e83d 100644
--- a/TAO/tao/POAS.i
+++ b/TAO/tao/POAS.i
@@ -16,20 +16,20 @@ POA_PortableServer::ThreadPolicy::~ThreadPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::ThreadPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::ThreadPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::ThreadPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::ThreadPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::ThreadPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::ThreadPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -42,20 +42,20 @@ POA_PortableServer::LifespanPolicy::~LifespanPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::LifespanPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::LifespanPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::LifespanPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::LifespanPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::LifespanPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::LifespanPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -66,20 +66,20 @@ POA_PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -90,20 +90,20 @@ POA_PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -116,20 +116,20 @@ POA_PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -140,20 +140,20 @@ POA_PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
@@ -164,20 +164,20 @@ POA_PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 }
 
 #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
-ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, ACE_TRY_ENV);
 }
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */