diff options
Diffstat (limited to 'TAO/tao/Asynch_Invocation.cpp')
| -rw-r--r-- | TAO/tao/Asynch_Invocation.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp index 842918bcc2a..d252b5d137e 100644 --- a/TAO/tao/Asynch_Invocation.cpp +++ b/TAO/tao/Asynch_Invocation.cpp @@ -15,6 +15,7 @@ ACE_RCSID(tao, Asynch_Invocation, "$Id$") + #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_Asynch_Invocation_Timeprobe_Description[] = @@ -48,8 +49,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Asynch_Invocation_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -#if defined (TAO_HAS_CORBA_MESSAGING) -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_CORBA_MESSAGING == 1) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) void TAO_GIOP_Twoway_Asynch_Invocation::start (CORBA::Environment &ACE_TRY_ENV) @@ -58,8 +59,9 @@ TAO_GIOP_Twoway_Asynch_Invocation::start (CORBA::Environment &ACE_TRY_ENV) this->TAO_GIOP_Invocation::start (ACE_TRY_ENV); ACE_CHECK; + TAO_Target_Specification spec; this->transport_->start_request (this->orb_core_, - this->profile_, + spec, this->out_stream_, ACE_TRY_ENV); } @@ -94,7 +96,7 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) } // Just send the request, without trying to wait for the reply. - retval = TAO_GIOP_Invocation::invoke (1, + retval = TAO_GIOP_Invocation::invoke (0, ACE_TRY_ENV); ACE_CHECK_RETURN (retval); @@ -106,8 +108,8 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) return TAO_INVOKE_OK; } -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ //************************************************************************** @@ -159,7 +161,7 @@ TAO_GIOP_DII_Deferred_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) } // Just send the request, without trying to wait for the reply. - retval = TAO_GIOP_Invocation::invoke (1, + retval = TAO_GIOP_Invocation::invoke (0, ACE_TRY_ENV); ACE_CHECK_RETURN (retval); @@ -172,4 +174,3 @@ TAO_GIOP_DII_Deferred_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) } #endif /* TAO_HAS_MINIMUM_CORBA */ - |