diff options
Diffstat (limited to 'TAO/tests/Exposed_Policies/Policy_Verifier.cpp')
| -rw-r--r-- | TAO/tests/Exposed_Policies/Policy_Verifier.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index 9ef23562029..8d2329cfa06 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp @@ -18,11 +18,11 @@ Policy_Verifier::~Policy_Verifier (void) void Policy_Verifier::init (int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { this->orb_ = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_Arg_Shifter arg_shifter (argc, argv); @@ -34,7 +34,7 @@ Policy_Verifier::init (int argc, if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile"))) { this->rt_poa_properties_ = - RT_Properties::read_from (arg, ACE_TRY_ENV); + RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->priority_bands_ = this->rt_poa_properties_->priority_bands ().length (); @@ -42,7 +42,7 @@ Policy_Verifier::init (int argc, else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile"))) { this->rt_object_properties_ = - RT_Properties::read_from (arg, ACE_TRY_ENV); + RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR"))) @@ -88,27 +88,27 @@ Policy_Verifier::init (int argc, } // Get the Object references. - CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_, - ACE_TRY_ENV); + CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n")) return; - this->base_object_ = Counter::_narrow (object.in (), ACE_TRY_ENV); + this->base_object_ = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!Policy_Verifier::check_reference (this->base_object_.in (), "Unable to convert the IOR to the proper object reference.\n")) return; - object = this->orb_->string_to_object (this->overridden_object_ref_, ACE_TRY_ENV); + object = this->orb_->string_to_object (this->overridden_object_ref_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n")) return; - this->overridden_object_ = Counter::_narrow (object.in (), ACE_TRY_ENV); + this->overridden_object_ = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!Policy_Verifier::check_reference (this->overridden_object_.in (), @@ -118,30 +118,30 @@ Policy_Verifier::init (int argc, } void -Policy_Verifier::run (CORBA::Environment &ACE_TRY_ENV ) +Policy_Verifier::run (TAO_ENV_SINGLE_ARG_DECL ) { this->verify_reference (this->base_object_.in (), - this->rt_poa_properties_, - ACE_TRY_ENV); + this->rt_poa_properties_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->verify_reference (this->overridden_object_.in (), - this->rt_object_properties_, - ACE_TRY_ENV); + this->rt_object_properties_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void Policy_Verifier::verify_reference (Counter_ptr object, - RT_Properties *rt_properties, - CORBA::Environment &ACE_TRY_ENV) + RT_Properties *rt_properties + TAO_ENV_ARG_DECL) { ACE_TRY { CORBA::Policy_var policy_var = - object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE, - ACE_TRY_ENV); + object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Policy.\n")) @@ -150,11 +150,11 @@ Policy_Verifier::verify_reference (Counter_ptr object, RTCORBA::PriorityModelPolicy::_narrow (policy_var.in ()); RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (ACE_TRY_ENV); + priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Priority priority = - priority_policy->server_priority (ACE_TRY_ENV); + priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (priority_model == RTCORBA::SERVER_DECLARED) @@ -174,15 +174,15 @@ Policy_Verifier::verify_reference (Counter_ptr object, ACE_TEXT ("Priority Value Mismatch.\n"))); } - policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE, - ACE_TRY_ENV); + policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE + TAO_ENV_ARG_PARAMETER); if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Banded Policy\n")) { RTCORBA::PriorityBandedConnectionPolicy_var priority_banded_policy = - RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in (), - ACE_TRY_ENV); + RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -218,17 +218,17 @@ Policy_Verifier::verify_reference (Counter_ptr object, } } } - policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE, - ACE_TRY_ENV); + policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE + TAO_ENV_ARG_PARAMETER); if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Client Protocol Policy\n")) { RTCORBA::ClientProtocolPolicy_var client_protocol_policy = - RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in (), ACE_TRY_ENV); + RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::ProtocolList_var protocol_list = - client_protocol_policy->protocols (ACE_TRY_ENV); + client_protocol_policy->protocols (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (unsigned int i = 0; i < protocol_list->length (); i++) |