diff options
Diffstat (limited to 'TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp')
| -rw-r--r-- | TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp index 425c34bee14..515421473a5 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp @@ -42,8 +42,8 @@ RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void) } TAO_Invocation_Endpoint_Selector * -RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV) +RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL) { // Initialize selection state with all RTCORBA policies affecting // endpoint selection. @@ -64,17 +64,17 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation, } CORBA::Policy_var priority_model_policy = - rt_stub->exposed_priority_model (ACE_TRY_ENV); + rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // state.private_connection_ = // rt_stub->private_connection (); CORBA::Policy_var client_protocol_policy = - TAO_RT_Endpoint_Utils::client_protocol_policy (invocation, ACE_TRY_ENV); + TAO_RT_Endpoint_Utils::client_protocol_policy (invocation TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation, ACE_TRY_ENV); + CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ -106,7 +106,7 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation, CORBA::Short server_priority = 0; CORBA::Boolean is_client_propagated = 0; - TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (ACE_TRY_ENV); + TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); tph->get_selector_hook (priority_model_policy.in (), @@ -144,8 +144,8 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation, void RT_Endpoint_Selector_Factory:: -init_client_protocol (TAO_GIOP_Invocation *, - CORBA::Environment &) +init_client_protocol (TAO_GIOP_Invocation * + TAO_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RT_Endpoint_Selector_Factory:init_client_protocol - Is deprecated!"))); /* @@ -155,7 +155,7 @@ init_client_protocol (TAO_GIOP_Invocation *, ACE_TRY { invocation->endpoint_selection_state_.client_protocol_policy_ = - rt_stub->effective_client_protocol (ACE_TRY_ENV); + rt_stub->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::INV_POLICY, ex) |