diff options
Diffstat (limited to 'TAO/tao/IIOP_Connector.cpp')
| -rw-r--r-- | TAO/tao/IIOP_Connector.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index e4c86a4ffec..ec0bac2b60c 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -116,8 +116,8 @@ TAO_IIOP_Connector::close (void) int TAO_IIOP_Connector::connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc, - CORBA::Environment &) + TAO_Transport_Descriptor_Interface *desc + TAO_ENV_ARG_DECL_NOT_USED) { TAO_Transport *&transport = invocation->transport (); ACE_Time_Value *max_wait_time = invocation->max_wait_time (); @@ -427,7 +427,7 @@ TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_IIOP_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV) +TAO_IIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) { // The endpoint should be of the form: // N.n@host:port/object_key @@ -494,7 +494,7 @@ TAO_IIOP_Connector::init_tcp_properties (void) // lookup and caching are not done based on protocol // properties. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; // Initialize the settings to the ORB defaults. If RT CORBA is enabled, // it may override these. @@ -502,7 +502,7 @@ TAO_IIOP_Connector::init_tcp_properties (void) int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size (); int no_delay = this->orb_core ()->orb_params ()->nodelay (); - TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_TRY_ENV); + TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (tph != 0) |