diff options
Diffstat (limited to 'TAO/tao/diffs/TAOC.i.diff')
| -rw-r--r-- | TAO/tao/diffs/TAOC.i.diff | 237 |
1 files changed, 108 insertions, 129 deletions
diff --git a/TAO/tao/diffs/TAOC.i.diff b/TAO/tao/diffs/TAOC.i.diff index 9e35578cfc5..bd722152fdc 100644 --- a/TAO/tao/diffs/TAOC.i.diff +++ b/TAO/tao/diffs/TAOC.i.diff @@ -1,6 +1,14 @@ ---- orig/TAOC.i Mon May 1 09:12:20 2000 -+++ TAOC.i Mon May 1 09:10:57 2000 -@@ -11,6 +11,8 @@ +--- orig/TAOC.i Tue Apr 17 00:03:03 2001 ++++ TAOC.i Tue Apr 17 00:13:28 2001 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ TAOC.i,v 1.8 2001/01/17 02:59:45 parsons Exp $ */ + + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -23,6 +23,8 @@ // Inline operations for class TAO::PrioritySpecification_var // ************************************************************* @@ -9,62 +17,59 @@ ACE_INLINE TAO::PrioritySpecification_var::PrioritySpecification_var (void) // default constructor : ptr_ (0) -@@ -93,13 +95,13 @@ - } - - ACE_INLINE --TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() // cast -+TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() // cast - { - return *this->ptr_; - } - - ACE_INLINE --TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() const // cast -+TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() const // cast - { - return *this->ptr_; - } -@@ -116,7 +118,7 @@ - return *this->ptr_; - } - --// mapping for fixed size -+// mapping for fixed size - ACE_INLINE ::TAO::PrioritySpecification & - TAO::PrioritySpecification_var::out (void) - { -@@ -197,14 +199,14 @@ - return *this; - } - --ACE_INLINE -+ACE_INLINE - TAO::ClientPriorityPolicy_var::operator const ::TAO::ClientPriorityPolicy_ptr &() const // cast - { +@@ -75,12 +77,12 @@ + } + else + { +- PrioritySpecification *deep_copy = +- new PrioritySpecification (*p.ptr_); ++ TAO::PrioritySpecification *deep_copy = ++ new TAO::PrioritySpecification (*p.ptr_); + + if (deep_copy != 0) + { +- PrioritySpecification *tmp = deep_copy; ++ TAO::PrioritySpecification *tmp = deep_copy; + deep_copy = this->ptr_; + this->ptr_ = tmp; + delete deep_copy; +@@ -164,7 +166,6 @@ return this->ptr_; } --ACE_INLINE --TAO::ClientPriorityPolicy_var::operator ::TAO::ClientPriorityPolicy_ptr &() // cast -+ACE_INLINE -+TAO::ClientPriorityPolicy_var::operator ::TAO::ClientPriorityPolicy_ptr &() // cast - { - return this->ptr_; - } -@@ -296,7 +298,7 @@ - return *this; - } +- + #if !defined (_TAO_CLIENTPRIORITYPOLICY___CI_) + #define _TAO_CLIENTPRIORITYPOLICY___CI_ --ACE_INLINE -+ACE_INLINE - TAO::ClientPriorityPolicy_out::operator ::TAO::ClientPriorityPolicy_ptr &() // cast - { - return this->ptr_; -@@ -317,6 +319,10 @@ +@@ -214,6 +215,35 @@ #endif /* end #if !defined */ ++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::PrioritySpecification &_tao_aggregate) ++{ ++ if ( ++ (strm << _tao_aggregate.mode) && ++ (strm << _tao_aggregate.min_priority) && ++ (strm << _tao_aggregate.max_priority) ++ ) ++ return 1; ++ else ++ return 0; ++ ++} ++ ++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::PrioritySpecification &_tao_aggregate) ++{ ++ if ( ++ (strm >> _tao_aggregate.mode) && ++ (strm >> _tao_aggregate.min_priority) && ++ (strm >> _tao_aggregate.max_priority) ++ ) ++ return 1; ++ else ++ return 0; ++ ++} +#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ + +#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -72,91 +77,65 @@ // ************************************************************* // Inline operations for class TAO::BufferingConstraint_var // ************************************************************* -@@ -403,13 +409,13 @@ - } - - ACE_INLINE --TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast -+TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast - { - return *this->ptr_; - } - - ACE_INLINE --TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast -+TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast - { - return *this->ptr_; - } -@@ -426,7 +432,7 @@ - return *this->ptr_; - } - --// mapping for fixed size -+// mapping for fixed size - ACE_INLINE ::TAO::BufferingConstraint & - TAO::BufferingConstraint_var::out (void) - { -@@ -507,14 +513,14 @@ - return *this; - } - --ACE_INLINE -+ACE_INLINE - TAO::BufferingConstraintPolicy_var::operator const ::TAO::BufferingConstraintPolicy_ptr &() const // cast - { +@@ -270,12 +300,12 @@ + } + else + { +- BufferingConstraint *deep_copy = +- new BufferingConstraint (*p.ptr_); ++ TAO::BufferingConstraint *deep_copy = ++ new TAO::BufferingConstraint (*p.ptr_); + + if (deep_copy != 0) + { +- BufferingConstraint *tmp = deep_copy; ++ TAO::BufferingConstraint *tmp = deep_copy; + deep_copy = this->ptr_; + this->ptr_ = tmp; + delete deep_copy; +@@ -359,7 +389,6 @@ return this->ptr_; } --ACE_INLINE --TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast -+ACE_INLINE -+TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast - { - return this->ptr_; - } -@@ -606,7 +612,7 @@ - return *this; - } +- + #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___CI_) + #define _TAO_BUFFERINGCONSTRAINTPOLICY___CI_ --ACE_INLINE -+ACE_INLINE - TAO::BufferingConstraintPolicy_out::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast - { - return this->ptr_; -@@ -637,7 +643,7 @@ - return 1; - else - return 0; -- -+ - } +@@ -409,32 +438,6 @@ - ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::PrioritySpecification &_tao_aggregate) -@@ -650,7 +656,7 @@ - return 1; - else - return 0; -- -+ - } + #endif /* end #if !defined */ - ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::BufferingConstraint &_tao_aggregate) -@@ -664,7 +670,7 @@ - return 1; - else - return 0; +-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::PrioritySpecification &_tao_aggregate) +-{ +- if ( +- (strm << _tao_aggregate.mode) && +- (strm << _tao_aggregate.min_priority) && +- (strm << _tao_aggregate.max_priority) +- ) +- return 1; +- else +- return 0; - -+ - } - - ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::BufferingConstraint &_tao_aggregate) -@@ -678,6 +684,7 @@ - return 1; - else - return 0; +-} +- +-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::PrioritySpecification &_tao_aggregate) +-{ +- if ( +- (strm >> _tao_aggregate.mode) && +- (strm >> _tao_aggregate.min_priority) && +- (strm >> _tao_aggregate.max_priority) +- ) +- return 1; +- else +- return 0; - -+ +-} +- + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::BufferingConstraint &_tao_aggregate) + { + if ( +@@ -463,3 +466,4 @@ + } +#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ |