diff options
Diffstat (limited to 'TAO/tao/PortableServer/POA_Policy_Set.i')
-rw-r--r-- | TAO/tao/PortableServer/POA_Policy_Set.i | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i index 3cdda2dc2cc..b0a9ec35c10 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.i +++ b/TAO/tao/PortableServer/POA_Policy_Set.i @@ -20,20 +20,20 @@ TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type) ACE_INLINE void TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Add the policies if they don't exist, override them if they do. this->impl_.set_policy_overrides (policies, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_INLINE void TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->impl_.set_policy (policy TAO_ENV_ARG_PARAMETER); + this->impl_.set_policy (policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } |