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 | 63165b00e2d667e39e15cf084128d94a563d484e (patch) | |
| tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/tao/Invocation_Endpoint_Selectors.cpp | |
| parent | 6579bccb3a3f22f882ef908ad5f7e1a65b00b133 (diff) | |
| download | ATCD-63165b00e2d667e39e15cf084128d94a563d484e.tar.gz | |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/tao/Invocation_Endpoint_Selectors.cpp')
| -rw-r--r-- | TAO/tao/Invocation_Endpoint_Selectors.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index f9ce51342e6..f58e71ed890 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -36,8 +36,8 @@ TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void) void TAO_Default_Endpoint_Selector::select_endpoint ( - TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV) + TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL) { do { @@ -45,8 +45,7 @@ TAO_Default_Endpoint_Selector::select_endpoint ( invocation->endpoint (invocation->profile ()->endpoint ()); int status = - this->endpoint_from_profile (invocation, - ACE_TRY_ENV); + this->endpoint_from_profile (invocation TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (status == 1) @@ -62,8 +61,8 @@ TAO_Default_Endpoint_Selector::select_endpoint ( // @@ RTCORBA_Subsetting - next should be deprecated... void -TAO_Default_Endpoint_Selector::next (TAO_GIOP_Invocation *, - CORBA::Environment &) +TAO_Default_Endpoint_Selector::next (TAO_GIOP_Invocation * + TAO_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This method is DEPRECATED!\n"))); // if (invocation->stub_->next_profile_retry () == 0) @@ -74,8 +73,8 @@ TAO_Default_Endpoint_Selector::next (TAO_GIOP_Invocation *, void TAO_Default_Endpoint_Selector::forward (TAO_GIOP_Invocation *invocation, - const TAO_MProfile &mprofile, - CORBA::Environment &ACE_TRY_ENV) + const TAO_MProfile &mprofile + TAO_ENV_ARG_DECL) { invocation->stub ()->add_forward_profiles (mprofile); // This has to be and is thread safe. @@ -111,8 +110,8 @@ TAO_Default_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invocation int TAO_Default_Endpoint_Selector::endpoint_from_profile ( - TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV) + TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL) { size_t endpoint_count = invocation->profile ()->endpoint_count(); @@ -125,7 +124,7 @@ TAO_Default_Endpoint_Selector::endpoint_from_profile ( TAO_Base_Transport_Property desc (invocation->endpoint ()); int status = - invocation->perform_call (desc, ACE_TRY_ENV); + invocation->perform_call (desc TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Check if the invocation has completed. |