diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-15 17:02:37 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-15 17:02:37 +0000 |
| commit | 55afbd53dbf23fa17872fb7fb7379ced455699eb (patch) | |
| tree | 63846c6985a7872ba14b8dc7aa88d2aefd72a4d7 | |
| parent | b9c9bd94e56932a4b3ac43aeab9d47944a94b86c (diff) | |
| download | ATCD-55afbd53dbf23fa17872fb7fb7379ced455699eb.tar.gz | |
ChangeLogTag:Sat Aug 15 12:00:15 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/varout.h | 2 | ||||
| -rw-r--r-- | TAO/tao/varout.i | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 6e487a888ad..8c11f44235b 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,14 @@ +Sat Aug 15 12:00:15 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/varout.h: + * tao/varout.i: + Fixed some cast-away-const problems in the new + TAO_Object_Field_T class. + + * orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp: + Typecodes use a TAO_Unbounded_Pseudo_Sequence, not a + TAO_Unbounded_Object_Sequence. + Sat Aug 15 08:19:26 1998 David L. Levine <levine@cs.wustl.edu> * tao/deep_free.cpp (deep_free), diff --git a/TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp b/TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp index 4efb59f8d33..9e08df9a205 100644 --- a/TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp +++ b/TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp @@ -13,7 +13,7 @@ ACE_RCSID(orbsvcs, tmplinst_orbsvcs, "$Id$") template class TAO_Object_Manager<CORBA_Object>; template class TAO_Object_Manager<CORBA_TypeCode>; template class TAO_Unbounded_Object_Sequence<CORBA_Object>; -template class TAO_Unbounded_Object_Sequence<CORBA_TypeCode>; +template class TAO_Unbounded_Pseudo_Sequence<CORBA_TypeCode>; template class TAO_Unbounded_Sequence<CosLifeCycle::NVP>; template class TAO_Unbounded_Sequence<CosNaming::NameComponent>; template class TAO_Unbounded_Sequence<CosNaming::Binding>; @@ -30,7 +30,7 @@ template class TAO_Unbounded_Sequence<RtecScheduler::RT_Info>; #pragma instantiate TAO_Object_Manager<CORBA_Object> #pragma instantiate TAO_Object_Manager<CORBA_TypeCode> #pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_Object> -#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_TypeCode> +#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA_TypeCode> #pragma instantiate TAO_Unbounded_Sequence<CosLifeCycle::NVP> #pragma instantiate TAO_Unbounded_Sequence<CosNaming::NameComponent> #pragma instantiate TAO_Unbounded_Sequence<CosNaming::Binding> diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h index 96ae1416ffc..038bdc2fddd 100644 --- a/TAO/tao/varout.h +++ b/TAO/tao/varout.h @@ -61,7 +61,7 @@ public: T* operator-> (void) const; // smart pointer (const) - operator const T* &() const; + operator T* const &() const; // cast operator operator T* &(); diff --git a/TAO/tao/varout.i b/TAO/tao/varout.i index 132628d1cf7..ea0f0f6d7bf 100644 --- a/TAO/tao/varout.i +++ b/TAO/tao/varout.i @@ -52,7 +52,7 @@ TAO_Object_Field_T<T>::ptr (void) const } template<class T> ACE_INLINE -TAO_Object_Field_T<T>::operator const T* &() const +TAO_Object_Field_T<T>::operator T* const &() const { return this->ptr_; } |