diff options
Diffstat (limited to 'TAO/tao/Asynch_Invocation.i')
| -rw-r--r-- | TAO/tao/Asynch_Invocation.i | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i index a44dc1efc70..f00ce65d269 100644 --- a/TAO/tao/Asynch_Invocation.i +++ b/TAO/tao/Asynch_Invocation.i @@ -3,9 +3,9 @@ // $Id$ // -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -# if defined (TAO_HAS_AMI_CALLBACK) || (TAO_HAS_AMI_POLLER) +# if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) ACE_INLINE TAO_GIOP_Twoway_Asynch_Invocation:: @@ -14,24 +14,24 @@ TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *stub, TAO_ORB_Core *orb_core, const TAO_Reply_Handler_Skeleton &reply_handler_skel, Messaging::ReplyHandler_ptr reply_handler_ptr) - : TAO_GIOP_Invocation (stub, - operation, - orb_core), + : TAO_GIOP_Invocation (stub, + operation, + orb_core), rd_ (0) { // New reply dispatcher on the heap, because - // we will go out of scope and hand over the + // we will go out of scope and hand over the // reply dispatcher to the ORB. - // So this->rd_ is 0, because we do not need to + // So this->rd_ is 0, because we do not need to // hold a pointer to it. ACE_NEW (rd_, TAO_Asynch_Reply_Dispatcher (reply_handler_skel, reply_handler_ptr)); } -# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +# endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ //**************************************************************************** @@ -42,19 +42,18 @@ TAO_GIOP_DII_Deferred_Invocation:: TAO_GIOP_DII_Deferred_Invocation (TAO_Stub *stub, TAO_ORB_Core *orb_core, const CORBA::Request_ptr req) - : TAO_GIOP_Invocation (stub, - req->operation (), - orb_core), + : TAO_GIOP_Invocation (stub, + req->operation (), + orb_core), rd_ (0) { // New reply dispatcher on the heap, because - // we will go out of scope and hand over the + // we will go out of scope and hand over the // reply dispatcher to the ORB. - // So this->rd_ is 0, because we do not need to + // So this->rd_ is 0, because we do not need to // hold a pointer to it. ACE_NEW (rd_, TAO_DII_Deferred_Reply_Dispatcher (req)); } #endif /* TAO_HAS_MINIMUM_CORBA */ - |