diff options
Diffstat (limited to 'TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp')
| -rw-r--r-- | TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index 99486039f72..da828bfc82d 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -40,13 +40,13 @@ TAO_IFR_Client_Adapter_Impl::dispose ( CORBA_InterfaceDef_ptr TAO_IFR_Client_Adapter_Impl::get_interface ( CORBA::ORB_ptr orb, - const char *repo_id, - CORBA::Environment &ACE_TRY_ENV + const char *repo_id + TAO_ENV_ARG_DECL ) { CORBA::Object_var obj = - orb->resolve_initial_references ("InterfaceRepository", - ACE_TRY_ENV); + orb->resolve_initial_references ("InterfaceRepository" + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (CORBA::is_nil (obj.in ())) @@ -56,8 +56,8 @@ TAO_IFR_Client_Adapter_Impl::get_interface ( } CORBA_Repository_var repo = - CORBA_Repository::_narrow (obj.in (), - ACE_TRY_ENV); + CORBA_Repository::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (CORBA::is_nil (repo.in ())) @@ -66,8 +66,8 @@ TAO_IFR_Client_Adapter_Impl::get_interface ( CORBA_InterfaceDef::_nil ()); } - CORBA_Contained_var result = repo->lookup_id (repo_id, - ACE_TRY_ENV); + CORBA_Contained_var result = repo->lookup_id (repo_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (CORBA::is_nil (result.in ())) @@ -76,15 +76,15 @@ TAO_IFR_Client_Adapter_Impl::get_interface ( } else { - return CORBA_InterfaceDef::_narrow (result.in (), - ACE_TRY_ENV); + return CORBA_InterfaceDef::_narrow (result.in () + TAO_ENV_ARG_PARAMETER); } } CORBA_InterfaceDef_ptr TAO_IFR_Client_Adapter_Impl::get_interface_remote ( - const CORBA::Object_ptr target, - CORBA_Environment &ACE_TRY_ENV + const CORBA::Object_ptr target + TAO_ENV_ARG_DECL ) { CORBA_InterfaceDef_ptr _tao_retval = CORBA_InterfaceDef::_nil (); @@ -112,17 +112,17 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote ( for (;;) { - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), - ACE_TRY_ENV); + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (_invoke_status == TAO_INVOKE_RESTART) |