diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp index 5da641d7c2f..17f3c2aa201 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp @@ -19,7 +19,7 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, TAO_IIOP_Properties *tcp_properties, TAO_SSLIOP_Connection_Handler_State &s) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Go straight to the object_ref_table in the ORB Core to avoid @@ -28,21 +28,21 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, // (happens on the client side). CORBA::Object_var obj = orb_core->object_ref_table ().resolve_initial_references ( - "SSLIOPCurrent", - ACE_TRY_ENV); + "SSLIOPCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SSLIOP::Current_var current = - SSLIOP::Current::_narrow (obj.in (), - ACE_TRY_ENV); + SSLIOP::Current::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (current.in ())) ACE_TRY_THROW (CORBA::INV_OBJREF ()); TAO_SSLIOP_Current_var tao_current = - TAO_SSLIOP_Current::_narrow (current.in (), - ACE_TRY_ENV); + TAO_SSLIOP_Current::_narrow (current.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (tao_current.in ())) |