diff options
Diffstat (limited to 'TAO/tao/diffs/TAOC.h.diff')
| -rw-r--r-- | TAO/tao/diffs/TAOC.h.diff | 81 |
1 files changed, 52 insertions, 29 deletions
diff --git a/TAO/tao/diffs/TAOC.h.diff b/TAO/tao/diffs/TAOC.h.diff index d68d18dd270..3ce7d73e5c5 100644 --- a/TAO/tao/diffs/TAOC.h.diff +++ b/TAO/tao/diffs/TAOC.h.diff @@ -1,16 +1,19 @@ ---- orig/TAOC.h Mon May 1 09:12:20 2000 -+++ TAOC.h Mon May 1 09:14:12 2000 -@@ -9,21 +9,22 @@ +--- orig/TAOC.h Fri Aug 18 23:18:42 2000 ++++ TAOC.h Tue Jun 27 22:47:12 2000 +@@ -1,4 +1,4 @@ +-/* -*- C++ -*- $Id$ */ ++/* -*- 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 +@@ -9,17 +9,24 @@ #ifndef _TAO_IDL_ORIG_TAOC_H_ #define _TAO_IDL_ORIG_TAOC_H_ - #include "ace/pre.h" -#include "tao/corba.h" - --#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) --#include "ace/streams.h" --#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ ++ +#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -28,20 +31,32 @@ + +#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 || + TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ ++ ++#include "tao/Priority_Mapping_Manager.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO -@@ -46,6 +47,9 @@ +@@ -42,6 +49,19 @@ TAO_NAMESPACE TAO { + ++#if (TAO_HAS_RT_CORBA == 1) ++ ++ typedef TAO_Priority_Mapping_Manager PriorityMappingManager; ++ typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr; ++ typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var; ++ typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out; ++ ++#endif /* TAO_HAS_RT_CORBA == 1 */ ++ ++ +#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) + typedef CORBA::Short PrioritySelectionMode; typedef CORBA::Short_out PrioritySelectionMode_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrioritySelectionMode; -@@ -58,7 +62,7 @@ +@@ -54,7 +74,7 @@ struct PrioritySpecification; class PrioritySpecification_var; @@ -50,7 +65,7 @@ struct TAO_Export PrioritySpecification { -@@ -81,18 +85,18 @@ +@@ -77,18 +97,18 @@ PrioritySpecification_var (const PrioritySpecification_var &); // copy constructor PrioritySpecification_var (const PrioritySpecification &); // fixed-size types only ~PrioritySpecification_var (void); // destructor @@ -73,7 +88,7 @@ const PrioritySpecification &in (void) const; PrioritySpecification &inout (void); PrioritySpecification &out (void); -@@ -115,7 +119,7 @@ +@@ -111,7 +131,7 @@ class ClientPriorityPolicy; typedef ClientPriorityPolicy *ClientPriorityPolicy_ptr; @@ -82,8 +97,12 @@ #endif /* end #if !defined */ -@@ -129,14 +133,14 @@ - ClientPriorityPolicy_var (ClientPriorityPolicy_ptr); +@@ -122,17 +142,17 @@ + { + public: + ClientPriorityPolicy_var (void); // default constructor +- ClientPriorityPolicy_var (ClientPriorityPolicy_ptr p) : ptr_ (p) {} ++ ClientPriorityPolicy_var (ClientPriorityPolicy_ptr); ClientPriorityPolicy_var (const ClientPriorityPolicy_var &); // copy constructor ~ClientPriorityPolicy_var (void); // destructor - @@ -100,7 +119,7 @@ ClientPriorityPolicy_ptr in (void) const; ClientPriorityPolicy_ptr &inout (void); ClientPriorityPolicy_ptr &out (void); -@@ -166,7 +170,7 @@ +@@ -165,7 +185,7 @@ operator ClientPriorityPolicy_ptr &(); ClientPriorityPolicy_ptr &ptr (void); ClientPriorityPolicy_ptr operator-> (void); @@ -109,7 +128,7 @@ private: ClientPriorityPolicy_ptr &ptr_; }; -@@ -190,12 +194,12 @@ +@@ -189,12 +209,12 @@ static ClientPriorityPolicy_ptr _duplicate (ClientPriorityPolicy_ptr obj); static ClientPriorityPolicy_ptr _narrow ( CORBA::Object_ptr obj, @@ -124,7 +143,7 @@ TAO_default_environment () ); static ClientPriorityPolicy_ptr _nil (void) -@@ -204,7 +208,7 @@ +@@ -203,7 +223,7 @@ } virtual TAO::PrioritySpecification priority_specification ( @@ -133,7 +152,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -212,7 +216,7 @@ +@@ -211,7 +231,7 @@ )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -142,7 +161,7 @@ virtual const char* _interface_repository_id (void) const; protected: -@@ -226,6 +230,10 @@ +@@ -225,6 +245,10 @@ #endif /* end #if !defined */ @@ -153,7 +172,7 @@ typedef CORBA::UShort BufferingConstraintMode; typedef CORBA::UShort_out BufferingConstraintMode_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintMode; -@@ -240,7 +248,7 @@ +@@ -239,7 +263,7 @@ struct BufferingConstraint; class BufferingConstraint_var; @@ -162,7 +181,7 @@ struct TAO_Export BufferingConstraint { -@@ -264,18 +272,18 @@ +@@ -263,18 +287,18 @@ BufferingConstraint_var (const BufferingConstraint_var &); // copy constructor BufferingConstraint_var (const BufferingConstraint &); // fixed-size types only ~BufferingConstraint_var (void); // destructor @@ -185,7 +204,7 @@ const BufferingConstraint &in (void) const; BufferingConstraint &inout (void); BufferingConstraint &out (void); -@@ -298,7 +306,7 @@ +@@ -297,7 +321,7 @@ class BufferingConstraintPolicy; typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr; @@ -194,8 +213,12 @@ #endif /* end #if !defined */ -@@ -312,14 +320,14 @@ - BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr); +@@ -308,17 +332,17 @@ + { + public: + BufferingConstraintPolicy_var (void); // default constructor +- BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr p) : ptr_ (p) {} ++ BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr); BufferingConstraintPolicy_var (const BufferingConstraintPolicy_var &); // copy constructor ~BufferingConstraintPolicy_var (void); // destructor - @@ -212,7 +235,7 @@ BufferingConstraintPolicy_ptr in (void) const; BufferingConstraintPolicy_ptr &inout (void); BufferingConstraintPolicy_ptr &out (void); -@@ -349,7 +357,7 @@ +@@ -351,7 +375,7 @@ operator BufferingConstraintPolicy_ptr &(); BufferingConstraintPolicy_ptr &ptr (void); BufferingConstraintPolicy_ptr operator-> (void); @@ -221,7 +244,7 @@ private: BufferingConstraintPolicy_ptr &ptr_; }; -@@ -373,12 +381,12 @@ +@@ -375,12 +399,12 @@ static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); static BufferingConstraintPolicy_ptr _narrow ( CORBA::Object_ptr obj, @@ -236,7 +259,7 @@ TAO_default_environment () ); static BufferingConstraintPolicy_ptr _nil (void) -@@ -387,7 +395,7 @@ +@@ -389,7 +413,7 @@ } virtual TAO::BufferingConstraint buffering_constraint ( @@ -245,7 +268,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -395,7 +403,7 @@ +@@ -397,7 +421,7 @@ )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -254,7 +277,7 @@ virtual const char* _interface_repository_id (void) const; protected: -@@ -409,6 +417,8 @@ +@@ -411,6 +435,8 @@ #endif /* end #if !defined */ @@ -263,7 +286,7 @@ typedef CORBA::Short SyncScope; typedef CORBA::Short_out SyncScope_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScope; -@@ -425,25 +435,41 @@ +@@ -427,25 +453,41 @@ TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_DELAYED_BUFFERING; |