diff options
Diffstat (limited to 'TAO/tao/TAOC.h')
-rw-r--r-- | TAO/tao/TAOC.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index 8684609d3e5..c0daffa336d 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -1,5 +1,6 @@ /* -*- C++ -*- $Id$ */ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. @@ -17,12 +18,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/PolicyC.h" #include "tao/TimeBaseC.h" -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -44,7 +45,7 @@ TAO_NAMESPACE TAO { -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) typedef CORBA::Short PrioritySelectionMode; typedef CORBA::Short_out PrioritySelectionMode_out; @@ -223,7 +224,7 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy typedef CORBA::UShort_out BufferingConstraintMode_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintMode; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_NONE; + TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_FLUSH; TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_TIMEOUT; @@ -396,10 +397,10 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // It seems easier to have copies of these here than to use - // #if defined (TAO_HAS_CORBA_MESSAGING) everywhere or to + // #if (TAO_HAS_CORBA_MESSAGING == 1) everywhere or to // define a new class TAO_GIOP_Reliable_Oneway_Invocation typedef CORBA::Short SyncScope; @@ -410,12 +411,10 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_SERVER; TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET; - - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_FLUSH; } TAO_NAMESPACE_CLOSE // module TAO -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Export void operator<<= (CORBA::Any &, const TAO::PrioritySpecification &); // copying version TAO_Export void operator<<= (CORBA::Any &, TAO::PrioritySpecification*); // noncopying version @@ -430,18 +429,18 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstra void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy *&); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #ifndef __ACE_INLINE__ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::PrioritySpecification &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::PrioritySpecification &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* __ACE_INLINE__ */ |