diff options
Diffstat (limited to 'TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp')
| -rw-r--r-- | TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index 1d75ca7f3cf..707bc3fe74e 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -23,8 +23,8 @@ ACE_RCSID(tao, RT_Invocation_Endpoint_Selectors, "$Id$") // **************************************************************** void -TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV) +TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL) { TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *, @@ -44,14 +44,14 @@ TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocati TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (), ACE_reinterpret_cast (long, invocation->stub ())); - status = invocation->perform_call (private_desc, ACE_TRY_ENV); + status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else { TAO_Base_Transport_Property default_desc (invocation->endpoint ()); - status = invocation->perform_call (default_desc, ACE_TRY_ENV); + status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -75,19 +75,19 @@ TAO_Priority_Endpoint_Selector::~TAO_Priority_Endpoint_Selector (void) } void -TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV) +TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL) { TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *, invocation->stub ()); CORBA::Short client_priority; // Get client priority. - 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; - if (tph->get_thread_CORBA_priority (client_priority, - ACE_TRY_ENV) + if (tph->get_thread_CORBA_priority (client_priority + TAO_ENV_ARG_PARAMETER) == -1) ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); @@ -158,7 +158,7 @@ TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation { if (invocation->inconsistent_policies ().ptr ()) { - CORBA::Policy_var priority_model_policy = rt_stub->exposed_priority_model (ACE_TRY_ENV); + CORBA::Policy_var priority_model_policy = rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; invocation->inconsistent_policies ()->length (1); @@ -177,14 +177,14 @@ TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (), ACE_reinterpret_cast (long, invocation->stub ())); - status = invocation->perform_call (private_desc, ACE_TRY_ENV); + status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else { TAO_Base_Transport_Property default_desc (invocation->endpoint ()); - status = invocation->perform_call (default_desc, ACE_TRY_ENV); + status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -222,22 +222,22 @@ TAO_Bands_Endpoint_Selector::~TAO_Bands_Endpoint_Selector (void) } void -TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV) +TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL) { TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *, invocation->stub ()); TAO_Protocols_Hooks *protocol_hooks = - invocation->orb_core ()->get_protocols_hooks (ACE_TRY_ENV); + invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - 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; // Figure out target priority. 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; CORBA::Short server_priority = 0; @@ -254,8 +254,8 @@ TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation, // Get Client priority. int status = - protocol_hooks->get_thread_CORBA_priority (p, // side effect - ACE_TRY_ENV); + protocol_hooks->get_thread_CORBA_priority (p // side effect + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (status == -1) { @@ -366,14 +366,14 @@ TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation, TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (), ACE_reinterpret_cast (long, invocation->stub ())); - status = invocation->perform_call (private_desc, ACE_TRY_ENV); + status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else { TAO_Base_Transport_Property default_desc (invocation->endpoint ()); - status = invocation->perform_call (default_desc, ACE_TRY_ENV); + status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -399,16 +399,16 @@ TAO_Protocol_Endpoint_Selector::~TAO_Protocol_Endpoint_Selector (void) void TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation - *invocation, - CORBA::Environment &ACE_TRY_ENV) + *invocation + TAO_ENV_ARG_DECL) { /// Narrow down to the right policy. CORBA::Policy_var cp = - 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; RTCORBA::ClientProtocolPolicy_var cp_policy = - RTCORBA::ClientProtocolPolicy::_narrow (cp.in (), ACE_TRY_ENV); + RTCORBA::ClientProtocolPolicy::_narrow (cp.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; /// Cast to TAO_ClientProtocolPolicy @@ -454,14 +454,14 @@ TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (), ACE_reinterpret_cast (long, invocation->stub ())); - status = invocation->perform_call (private_desc, ACE_TRY_ENV); + status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else { TAO_Base_Transport_Property default_desc (invocation->endpoint ()); - status = invocation->perform_call (default_desc, ACE_TRY_ENV); + status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -497,8 +497,8 @@ TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation void TAO_Protocol_Endpoint_Selector::next (TAO_GIOP_Invocation - *, - CORBA::Environment &) + * + TAO_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("You Are not Suppesed to call: TAO_Protocol_Endpoint_Selector::next!!!\n"))); // invocation->profile_index ()++; @@ -509,8 +509,8 @@ TAO_Protocol_Endpoint_Selector::next (TAO_GIOP_Invocation void TAO_Protocol_Endpoint_Selector::forward (TAO_GIOP_Invocation *invocation, - const TAO_MProfile& /* mprofile */, - CORBA::Environment &ACE_TRY_ENV) + const TAO_MProfile& /* mprofile */ + TAO_ENV_ARG_DECL) { // Location forwarding is currently not supported when using // RTCORBA::ClientProtocolPolicy. With the current profile @@ -522,7 +522,7 @@ TAO_Protocol_Endpoint_Selector::forward (TAO_GIOP_Invocation // a location forward reply, we act as if the profile we used // didn't work, and we try the next one. Should we throw not // supported exception instead? - this->next (invocation, ACE_TRY_ENV); + this->next (invocation TAO_ENV_ARG_PARAMETER); } void |