From 0fb1bfaee9f24b9f0054d373c1aa0d45f61e1a54 Mon Sep 17 00:00:00 2001 From: mjb2 Date: Tue, 13 Jul 1999 15:42:04 +0000 Subject: See Tue Jul 13 10:39:57 1999 Matthew J Braun --- ChangeLog-99b | 7 +++++++ ace/Containers_T.h | 4 ++-- 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 + + * 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 * 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 &list_; + ACE_DLList *list_; }; template @@ -1027,7 +1027,7 @@ public: // Delegates to ACE_Double_Linked_List_Iterator. private: - ACE_DLList &list_; + ACE_DLList *list_; }; template 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::remove (void) template ACE_INLINE ACE_DLList_Iterator::ACE_DLList_Iterator (ACE_DLList &l) : ACE_Double_Linked_List_Iterator ((ACE_DLList_Base &)l), - list_ (l) + list_ (&l) { } template ACE_INLINE void ACE_DLList_Iterator::reset (ACE_DLList &l) { - list_ = l; + list_ = &l; this->ACE_Double_Linked_List_Iterator ::reset ((ACE_DLList_Base &)l); } @@ -543,14 +543,14 @@ ACE_DLList_Reverse_Iterator::remove (void) template ACE_INLINE ACE_DLList_Reverse_Iterator::ACE_DLList_Reverse_Iterator (ACE_DLList &l) : ACE_Double_Linked_List_Reverse_Iterator ((ACE_DLList_Base &)l), - list_ (l) + list_ (&l) { } template ACE_INLINE void ACE_DLList_Reverse_Iterator::reset (ACE_DLList &l) { - list_ = l; + list_ = &l; this->ACE_Double_Linked_List_Reverse_Iterator ::reset ((ACE_DLList_Base &)l); } -- cgit v1.2.1