diff options
Diffstat (limited to 'TAO/tao/MessagingC.h')
| -rw-r--r-- | TAO/tao/MessagingC.h | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h index 2a2bb22ee30..9f14b0e9f8a 100644 --- a/TAO/tao/MessagingC.h +++ b/TAO/tao/MessagingC.h @@ -23,12 +23,12 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) #include "tao/ValueBase.h" #include "tao/ValueFactory.h" -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ #include "tao/corbafwd.h" @@ -84,9 +84,6 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET; - // = TAO specific extension. - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_FLUSH; - typedef CORBA::Short RoutingType; typedef CORBA::Short_out RoutingType_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RoutingType; @@ -1562,7 +1559,7 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES; -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) // valuetype class class ExceptionHolder; @@ -1894,9 +1891,9 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler; -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) class Poller; typedef Poller *Poller_ptr; @@ -2013,12 +2010,12 @@ TAO_NAMESPACE Messaging }; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Poller; -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ } TAO_NAMESPACE_CLOSE // module Messaging -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) TAO_NAMESPACE OBV_Messaging { @@ -2064,7 +2061,7 @@ TAO_NAMESPACE OBV_Messaging } TAO_NAMESPACE_CLOSE -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ // Typedef for the Reply Handler Skeleton. // This is handcrafted not generated by the IDL compiler. @@ -2087,7 +2084,7 @@ enum TAO_AMI_Reply_Status }; -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) typedef void (*TAO_Reply_Handler_Skeleton)( TAO_InputCDR &, @@ -2095,7 +2092,7 @@ typedef void (*TAO_Reply_Handler_Skeleton)( CORBA::ULong reply_status, CORBA::Environment & ); -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ TAO_Export void operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PriorityRange *&); @@ -2111,22 +2108,24 @@ TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); / TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) extern TAO_Export Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj); + CORBA::Object_ptr obj); // Any operators for interface Messaging::ReplyHandler TAO_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyHandler *&); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&); -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ + -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) // Any operators for interface Messaging::Poller TAO_Export void operator<<= (CORBA::Any &, Messaging::Poller_ptr); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::Poller *&); -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ + #ifndef __ACE_INLINE__ @@ -2141,16 +2140,16 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue::_t TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValueSeq &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValueSeq &); -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder::_tao_seq_Octet &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder::_tao_seq_Octet &); -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::Poller_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Poller_ptr &); #endif @@ -2166,6 +2165,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Poller_ptr &); #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* TAO_IDL_MESSAGINGC_H */ |