diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
commit | b11770b30f8b58d20fe2d61846bfa3fc5354ee7e (patch) | |
tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/tao/Connector_Registry.cpp | |
parent | 8fd5b8293423d91c699711bce0f3551cb8c20a69 (diff) | |
download | ATCD-b11770b30f8b58d20fe2d61846bfa3fc5354ee7e.tar.gz |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/tao/Connector_Registry.cpp')
-rw-r--r-- | TAO/tao/Connector_Registry.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 20b0985707f..62fb33b84ff 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -265,8 +265,8 @@ TAO_Connector_Registry::preprocess_preconnects (TAO_ORB_Core *orb_core, int TAO_Connector_Registry::connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc, - CORBA::Environment &ACE_TRY_ENV) + TAO_Transport_Descriptor_Interface *desc + TAO_ENV_ARG_DECL) { TAO_Endpoint *endpoint = desc->endpoint (); if (endpoint == 0) @@ -280,14 +280,14 @@ TAO_Connector_Registry::connect (TAO_GIOP_Invocation *invocation, return -1; return connector->connect (invocation, - desc, - ACE_TRY_ENV); + desc + TAO_ENV_ARG_PARAMETER); } int TAO_Connector_Registry::make_mprofile (const char *ior, - TAO_MProfile &mprofile, - CORBA::Environment &ACE_TRY_ENV) + TAO_MProfile &mprofile + TAO_ENV_ARG_DECL) { if (!ior) // Failure: Null IOR string pointer @@ -308,8 +308,8 @@ TAO_Connector_Registry::make_mprofile (const char *ior, if (*connector) { int mp_result = (*connector)->make_mprofile (ior, - mprofile, - ACE_TRY_ENV); + mprofile + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (mp_result); |