diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-01-05 23:46:21 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-01-05 23:46:21 +0000 |
| commit | 5d4898f54d4df2c9b592ff73f0b2f1caab1543bd (patch) | |
| tree | 67d64d84f3e831d434b68c62114610fa093ffddd | |
| parent | 8abf94bdcc8be83b76ce86955a0a6320c59eb8de (diff) | |
| download | ATCD-5d4898f54d4df2c9b592ff73f0b2f1caab1543bd.tar.gz | |
ChangeLogTag:Tue Jan 5 17:44:53 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 10 | ||||
| -rw-r--r-- | TAO/tao/DynAnyC.h | 6 | ||||
| -rw-r--r-- | TAO/tao/DynAnyC.i | 12 | ||||
| -rw-r--r-- | TAO/tao/DynSequence_i.h | 2 | ||||
| -rw-r--r-- | TAO/tao/DynStruct_i.h | 2 |
5 files changed, 12 insertions, 20 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index df30dc1340c..20463f9345b 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,13 @@ +Tue Jan 5 17:44:53 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/DynAnyC.h + * tao/DynAnyC.i + * tao/DynSequence_i.h: + * tao/DynStruct_i.h: + Removed some other uses of ACE_Array in favor of ACE_Array_Base, + in these cases there was no need for the operator== and/or + operator!= + Tue Jan 05 15:40:20 1999 Nanbor Wang <nanbor@cs.wustl.edu> * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp (init_orb): diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h index c7fb3dc230a..d37e332bfc0 100644 --- a/TAO/tao/DynAnyC.h +++ b/TAO/tao/DynAnyC.h @@ -63,12 +63,6 @@ public: operator const CORBA_DynAny_ptr &() const; operator CORBA_DynAny_ptr &(); - // These are here to satisfy g++'s way of dealing with templates. - // These operators are not called in any TAO code but are - // given a semi-reasonable definition anyway. - CORBA::Boolean operator == (const CORBA_DynAny_var &); - CORBA::Boolean operator != (const CORBA_DynAny_var &); - // in, inout, out, _retn CORBA_DynAny_ptr in (void) const; CORBA_DynAny_ptr &inout (void); diff --git a/TAO/tao/DynAnyC.i b/TAO/tao/DynAnyC.i index 43a48293b00..8ba97ca7955 100644 --- a/TAO/tao/DynAnyC.i +++ b/TAO/tao/DynAnyC.i @@ -107,18 +107,6 @@ CORBA_DynAny_var::operator-> (void) const return this->ptr_; } -ACE_INLINE CORBA::Boolean -CORBA_DynAny_var::operator== (const CORBA_DynAny_var &rhs) -{ - return this->ptr_ == rhs.ptr_; -} - -ACE_INLINE CORBA::Boolean -CORBA_DynAny_var::operator!= (const CORBA_DynAny_var &rhs) -{ - return this->ptr_ != rhs.ptr_; -} - ACE_INLINE CORBA_DynAny_ptr CORBA_DynAny_var::in (void) const { diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h index 3b178c6cf62..a0682f3a834 100644 --- a/TAO/tao/DynSequence_i.h +++ b/TAO/tao/DynSequence_i.h @@ -168,7 +168,7 @@ private: CORBA::Long index_; // Index of the current component - ACE_Array<CORBA_DynAny_var> da_members_; + ACE_Array_Base<CORBA_DynAny_var> da_members_; // Each component is also a DynAny TAO_DynSequence_i (void); diff --git a/TAO/tao/DynStruct_i.h b/TAO/tao/DynStruct_i.h index 472adbfe23c..1113bc23aff 100644 --- a/TAO/tao/DynStruct_i.h +++ b/TAO/tao/DynStruct_i.h @@ -163,7 +163,7 @@ private: CORBA::Long index_; // Index of the current component - ACE_Array<CORBA_DynAny_var> da_members_; + ACE_Array_Base<CORBA_DynAny_var> da_members_; // Each component is also a DynAny TAO_DynStruct_i (void); |