diff options
Diffstat (limited to 'TAO/tao/PortableServer/POA_Policy_Set.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/POA_Policy_Set.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index d07934f0594..2c6ffc1fc20 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -29,8 +29,8 @@ TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void) } void -TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies, - CORBA::Environment &ACE_TRY_ENV) +TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies + TAO_ENV_ARG_DECL) { CORBA::ULong cep_index = client_exposed_policies->length (); @@ -45,7 +45,7 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client { client_exposed_policies->length (cep_index + 1); (*client_exposed_policies)[cep_index] = - policy->copy (ACE_TRY_ENV); + policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cep_index++; @@ -55,11 +55,11 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client void TAO_POA_Policy_Set::validate_policies (TAO_POA_Policy_Validator &validator, - TAO_ORB_Core &orb_core, - CORBA::Environment &ACE_TRY_ENV) + TAO_ORB_Core &orb_core + TAO_ENV_ARG_DECL) { // Validate that all of the specified policies make sense. - validator.validate (this->impl_, ACE_TRY_ENV); + validator.validate (this->impl_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Verify that all policies are legal for the currently loaded @@ -70,7 +70,7 @@ TAO_POA_Policy_Set::validate_policies (TAO_POA_Policy_Validator &validator, { CORBA::Policy_var policy = this->impl_.get_policy_by_index (i); - CORBA::PolicyType type = policy->policy_type (ACE_TRY_ENV); + CORBA::PolicyType type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (validator.legal_policy (type) == 0) @@ -80,8 +80,8 @@ TAO_POA_Policy_Set::validate_policies (TAO_POA_Policy_Validator &validator, // Check whether we have a BiDirectional policy set. Call the // ORB_Core to do the checking for us - int retval = orb_core.parse_bidir_policy (policy.in (), - ACE_TRY_ENV); + int retval = orb_core.parse_bidir_policy (policy.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; |