Merged corba-env-clean branch.

1 files changed, 21 insertions, 21 deletions

diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i
index e4252dbd222..478156475fc 100644
--- a/TAO/tao/Policy_Manager.i
+++ b/TAO/tao/Policy_Manager.i
@@ -8,37 +8,37 @@ TAO_Policy_Manager::TAO_Policy_Manager (void)
 
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Manager::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::PolicyType policy
+      TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy (policy, ACE_TRY_ENV);
+  return this->impl_.get_policy (policy TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::PolicyList *
 TAO_Policy_Manager::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV)
+        const CORBA::PolicyTypeSeq & ts
+        TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
                        CORBA::SystemException
                        ))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy_overrides (ts, ACE_TRY_ENV);
+  return this->impl_.get_policy_overrides (ts TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_Policy_Manager::set_policy_overrides (
         const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV)
+        CORBA::SetOverrideType set_add
+        TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
                        CORBA::SystemException,
                        CORBA_InvalidPolicies
                        ))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-  this->impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
+  this->impl_.set_policy_overrides (policies, set_add TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Policy_ptr
@@ -72,10 +72,10 @@ TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void)
 
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Current_Impl::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::PolicyType policy
+      TAO_ENV_ARG_DECL)
 {
-  return this->manager_impl_.get_policy (policy, ACE_TRY_ENV);
+  return this->manager_impl_.get_policy (policy TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Policy_ptr
@@ -88,36 +88,36 @@ TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type)
 
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Current::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::PolicyType policy
+      TAO_ENV_ARG_DECL)
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  return impl.get_policy (policy, ACE_TRY_ENV);
+  return impl.get_policy (policy TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::PolicyList *
 TAO_Policy_Current::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV)
+        const CORBA::PolicyTypeSeq & ts
+        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  return impl.get_policy_overrides (ts, ACE_TRY_ENV);
+  return impl.get_policy_overrides (ts TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies,
-                                          CORBA::SetOverrideType set_add,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          CORBA::SetOverrideType set_add
+                                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA_InvalidPolicies))
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  impl.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
+  impl.set_policy_overrides (policies, set_add TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Policy_ptr