epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

find should use the current version of the iterator

Browse Source
This commit is contained in:
Jeff Hill
2000-10-20 21:14:46 +00:00
parent 3e548bdd60
commit e9dbe33a14
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libCom/cxxTemplates/tsDLList.h
View File

@@ -75,9 +75,9 @@ private:
//
template <class T>
class tsDLList {
friend class tsDLIter<T>;
friend class tsDLFwdIter<T>;
friend class tsDLBwdIter<T>;
friend class tsDLIter<T>; // deprecated
friend class tsDLFwdIter<T>; // deprecated
friend class tsDLBwdIter<T>; // deprecated
public:
tsDLList (); // create empty list
@@ -108,7 +108,7 @@ public:
// returns -1 if the item isnt on the list and the node
// number (beginning with zero if it is)
//
int find (T &item) const;
int find (const T &item) const;
T *first (void) const; // ptr to first item on list
T *last (void) const; // ptr to last item on list
@@ -508,18 +508,19 @@ inline void tsDLList<T>::push (T &item)
// and the node number (beginning with zero if
// it is)
//
template <class T>
int tsDLList<T>::find (T &item) const
template < class T >
int tsDLList < T > :: find ( const T &item ) const
{
tsDLFwdIter<T> iter (*this);
tsDLNode<T> *pItem;
int itemNo=0;
tsDLIterConstBD < T > thisItem ( &item );
tsDLIterConstBD < T > iter ( this->first () );
int itemNo = 0;
while ( ( pItem = iter.next () ) ) {
if ( pItem == &item ) {
while ( iter.valid () ) {
if ( iter == thisItem ) {
return itemNo;
}
itemNo++;
iter++;
}
return -1;
}