diff options
Diffstat (limited to 'TAO/tao/Policy_Set.cpp')
| -rw-r--r-- | TAO/tao/Policy_Set.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index e0e1b2cc115..1fd96e0665a 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -11,10 +11,10 @@ ACE_RCSID(tao, Policy_Set, "$Id$") TAO_Policy_Set::~TAO_Policy_Set (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -45,7 +45,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) if (CORBA::is_nil (policy)) continue; - CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Add the "cacheable" policies into the cache. @@ -70,12 +70,12 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) void TAO_Policy_Set::copy_from (TAO_Policy_Set *source - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (source == 0) return; - this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; @@ -89,7 +89,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source if (! this->compatible_scope (policy->_tao_scope())) ACE_THROW (CORBA::NO_PERMISSION ()); - CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = this->policy_list_.length (); @@ -104,7 +104,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source } void -TAO_Policy_Set::cleanup_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Policy_Set::cleanup_i (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ULong i; @@ -113,7 +113,7 @@ TAO_Policy_Set::cleanup_i (TAO_ENV_SINGLE_ARG_DECL) i < this->policy_list_.length (); ++i) { - this->policy_list_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_list_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->policy_list_[i] = CORBA::Policy::_nil (); } @@ -129,7 +129,7 @@ void TAO_Policy_Set::set_policy_overrides ( const CORBA::PolicyList &policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ The spec does not say what to do on this case. if (set_add != CORBA::SET_OVERRIDE @@ -138,7 +138,7 @@ TAO_Policy_Set::set_policy_overrides ( if (set_add == CORBA::SET_OVERRIDE) { - this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -157,7 +157,7 @@ TAO_Policy_Set::set_policy_overrides ( if (CORBA::is_nil (policy.in ())) continue; - CORBA::PolicyType policy_type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::PolicyType policy_type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (policy_type == TAO_RT_SERVER_PROTOCOL_POLICY_TYPE) @@ -173,22 +173,22 @@ TAO_Policy_Set::set_policy_overrides ( server_protocol_set = 1; } - this->set_policy (policy.in () TAO_ENV_ARG_PARAMETER); + this->set_policy (policy.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (! this->compatible_scope (policy->_tao_scope())) ACE_THROW (CORBA::NO_PERMISSION ()); - CORBA::PolicyType policy_type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::PolicyType policy_type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -197,12 +197,12 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy while (j != length) { CORBA::ULong current = - this->policy_list_[j]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_list_[j]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (current == policy_type) { - this->policy_list_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_list_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->policy_list_[j] = copy.ptr (); break; @@ -228,7 +228,7 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy CORBA::PolicyList * TAO_Policy_Set::get_policy_overrides ( const CORBA::PolicyTypeSeq &types - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong types_length = types.length (); @@ -267,7 +267,7 @@ TAO_Policy_Set::get_policy_overrides ( ++i) { CORBA::ULong current = - this->policy_list_[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (current != slot) @@ -284,7 +284,7 @@ TAO_Policy_Set::get_policy_overrides ( CORBA::Policy_ptr TAO_Policy_Set::get_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong length = this->policy_list_.length (); for (CORBA::ULong i = 0; @@ -292,7 +292,7 @@ TAO_Policy_Set::get_policy (CORBA::PolicyType type ++i) { CORBA::ULong current = - this->policy_list_[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (current != type) |