diff options
| author | mjb2 <mjb2@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-13 15:42:04 +0000 |
|---|---|---|
| committer | mjb2 <mjb2@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-13 15:42:04 +0000 |
| commit | 0fb1bfaee9f24b9f0054d373c1aa0d45f61e1a54 (patch) | |
| tree | 6e9565484434124eec02545826b2f900320d6e6c | |
| parent | c6cb0f40f651a27a06031f431986edf2ee36fd6a (diff) | |
| download | ATCD-0fb1bfaee9f24b9f0054d373c1aa0d45f61e1a54.tar.gz | |
See Tue Jul 13 10:39:57 1999 Matthew J Braun <mjb2@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 7 | ||||
| -rw-r--r-- | ace/Containers_T.h | 4 | ||||
| -rw-r--r-- | ace/Containers_T.i | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 0d39c677672..932298182eb 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,10 @@ +Tue Jul 13 10:39:57 1999 Matthew J Braun <mjb2@cs.wustl.edu> + + * ace/Containers_T.h,i: Altered private member list_ of + DLList_Iterator to be a pointer rather than a reference. This + allows the reset method to work because it was overwriting the + contents of list_ rather than iterating over a different list + Tue Jul 13 09:14:31 1999 Steve Huston <shuston@riverace.com> * ace/Cached_Connect_Strategy_T.cpp (dtor): Added ACE_TYPENAME diff --git a/ace/Containers_T.h b/ace/Containers_T.h index acfadb4c9b5..81e0e07e9c7 100644 --- a/ace/Containers_T.h +++ b/ace/Containers_T.h @@ -976,7 +976,7 @@ public: // Delegates to ACE_Double_Linked_List_Iterator. private: - ACE_DLList<T> &list_; + ACE_DLList<T> *list_; }; template <class T> @@ -1027,7 +1027,7 @@ public: // Delegates to ACE_Double_Linked_List_Iterator. private: - ACE_DLList<T> &list_; + ACE_DLList<T> *list_; }; template <class T> diff --git a/ace/Containers_T.i b/ace/Containers_T.i index b9ef057be2c..e39c2208bf1 100644 --- a/ace/Containers_T.i +++ b/ace/Containers_T.i @@ -491,14 +491,14 @@ ACE_DLList_Iterator<T>::remove (void) template <class T> ACE_INLINE ACE_DLList_Iterator<T>::ACE_DLList_Iterator (ACE_DLList<T> &l) : ACE_Double_Linked_List_Iterator <ACE_DLList_Node> ((ACE_DLList_Base &)l), - list_ (l) + list_ (&l) { } template <class T> ACE_INLINE void ACE_DLList_Iterator<T>::reset (ACE_DLList<T> &l) { - list_ = l; + list_ = &l; this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l); } @@ -543,14 +543,14 @@ ACE_DLList_Reverse_Iterator<T>::remove (void) template <class T> ACE_INLINE ACE_DLList_Reverse_Iterator<T>::ACE_DLList_Reverse_Iterator (ACE_DLList<T> &l) : ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node> ((ACE_DLList_Base &)l), - list_ (l) + list_ (&l) { } template <class T> ACE_INLINE void ACE_DLList_Reverse_Iterator<T>::reset (ACE_DLList<T> &l) { - list_ = l; + list_ = &l; this->ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::reset ((ACE_DLList_Base &)l); } |