diff options
Diffstat (limited to 'TAO/tao/MessagingC.h')
| -rw-r--r-- | TAO/tao/MessagingC.h | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h index 18f1d1fa7cd..e97761b33f1 100644 --- a/TAO/tao/MessagingC.h +++ b/TAO/tao/MessagingC.h @@ -1551,8 +1551,7 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES; -#if defined (TAO_HAS_AMI_POLLER) - +#if defined (TAO_POLLER) struct TAO_Export ExceptionHolder { CORBA::Boolean is_system_exception; @@ -1638,10 +1637,6 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionHolder; -#endif /* TAO_HAS_AMI_POLLER */ - -#if defined (TAO_HAS_AMI_CALLBACK) - class ReplyHandler; typedef ReplyHandler *ReplyHandler_ptr; @@ -1729,10 +1724,6 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler; -#endif /* TAO_HAS_AMI_CALLBACK */ - -#if defined (TAO_HAS_AMI_POLLER) - class Poller; typedef Poller *Poller_ptr; @@ -1848,7 +1839,7 @@ TAO_NAMESPACE Messaging }; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Poller; -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_POLLER */ } TAO_NAMESPACE_CLOSE // module Messaging @@ -1858,13 +1849,13 @@ TAO_NAMESPACE_CLOSE // module Messaging class TAO_InputCDR; -#if defined (TAO_HAS_AMI_CALLBACK) +#if defined (TAO_POLLER) typedef void (*TAO_Reply_Handler_Skeleton)( TAO_InputCDR &, Messaging::ReplyHandler *, CORBA::Environment & ); -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_POLLER */ void TAO_Export operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::PriorityRange *&); @@ -1880,20 +1871,17 @@ void TAO_Export operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); / void TAO_Export operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); -#if defined (TAO_HAS_AMI_CALLBACK) -// Any operators for interface Messaging::ReplyHandler -void TAO_Export operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr); -CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::ReplyHandler *&); -#endif /* TAO_HAS_AMI_CALLBACK */ - -#if defined (TAO_HAS_AMI_POLLER) +#if defined (TAO_POLLER) void TAO_Export operator<<= (CORBA::Any &, const Messaging::ExceptionHolder &); // copying version void TAO_Export operator<<= (CORBA::Any &, Messaging::ExceptionHolder*); // noncopying version CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::ExceptionHolder *&); +// Any operators for interface Messaging::ReplyHandler +void TAO_Export operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr); +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::ReplyHandler *&); // Any operators for interface Messaging::Poller void TAO_Export operator<<= (CORBA::Any &, Messaging::Poller_ptr); CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::Poller *&); -#endif /* TAO_HAS_AMI_POLLER */ +#endif #ifndef __ACE_INLINE__ @@ -1908,19 +1896,16 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::PolicyValue::_t CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::PolicyValueSeq &); // CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::PolicyValueSeq &); -#if defined (TAO_HAS_AMI_CALLBACK) -CORBA::Boolean TAO_Export -operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr ); -CORBA::Boolean TAO_Export -operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &); -#endif /* TAO_HAS_AMI_CALLBACK */ - -#if defined (TAO_HAS_AMI_POLLER) +#if defined (TAO_POLLER) CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder &); // CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::ExceptionHolder &); CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder::_tao_seq_Octet &); // CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::ExceptionHolder::_tao_seq_Octet &); CORBA::Boolean TAO_Export +operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr ); +CORBA::Boolean TAO_Export +operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &); +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::Poller_ptr ); CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::Poller_ptr &); |