diff --git a/src/ca/CASG.cpp b/src/ca/CASG.cpp index 69410961d..e5f47653d 100644 --- a/src/ca/CASG.cpp +++ b/src/ca/CASG.cpp @@ -159,13 +159,13 @@ void CASG::show ( unsigned level ) const if ( level ) { epicsGuard < casgMutex > locker ( this->mutex ); ::printf ( "\tPending" ); - tsDLIterConstBD < syncGroupNotify > notifyPending = this->ioPendingList.firstIter (); + tsDLIterConst < syncGroupNotify > notifyPending = this->ioPendingList.firstIter (); while ( notifyPending.valid () ) { notifyPending->show ( level - 1u ); notifyPending++; } ::printf ( "\tCompleted" ); - tsDLIterConstBD < syncGroupNotify > notifyCompleted = this->ioCompletedList.firstIter (); + tsDLIterConst < syncGroupNotify > notifyCompleted = this->ioCompletedList.firstIter (); while ( notifyCompleted.valid () ) { notifyCompleted->show ( level - 1u ); notifyCompleted++; diff --git a/src/ca/bhe.cpp b/src/ca/bhe.cpp index d07a4e850..62eb65f5a 100644 --- a/src/ca/bhe.cpp +++ b/src/ca/bhe.cpp @@ -75,7 +75,7 @@ bhe::~bhe () void bhe::beaconAnomalyNotify () { - tsDLIterBD < tcpiiu > iter = this->iiuList.firstIter (); + tsDLIter < tcpiiu > iter = this->iiuList.firstIter (); while ( iter.valid() ) { iter->beaconAnomalyNotify (); iter++; @@ -195,7 +195,7 @@ bool bhe::updatePeriod ( const epicsTime & programBeginTime, * update state of health for active virtual circuits * if the beacon looks ok */ - tsDLIterBD < tcpiiu > iter = this->iiuList.firstIter (); + tsDLIter < tcpiiu > iter = this->iiuList.firstIter (); while ( iter.valid() ) { iter->beaconArrivalNotify (); iter++; diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index ecd6548e1..a56ec28e1 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -991,10 +991,10 @@ void cac::ioExceptionNotifyAndDestroy ( unsigned id, int status, // (always called from a udp thread) void cac::connectAllIO ( epicsGuard < cacMutex > & guard, nciu & chan ) { - tsDLIterBD < baseNMIU > pNetIO = + tsDLIter < baseNMIU > pNetIO = chan.cacPrivateListOfIO::eventq.firstIter (); while ( pNetIO.valid () ) { - tsDLIterBD < baseNMIU > next = pNetIO; + tsDLIter < baseNMIU > next = pNetIO; next++; class netSubscription *pSubscr = pNetIO->isSubscription (); // disconnected channels should have only subscription IO attached @@ -1014,9 +1014,9 @@ void cac::connectAllIO ( epicsGuard < cacMutex > & guard, nciu & chan ) // -- callback lock and cac lock must be applied here void cac::disconnectAllIO ( epicsGuard < cacMutex > &locker, nciu & chan, bool enableCallbacks ) { - tsDLIterBD pNetIO = chan.cacPrivateListOfIO::eventq.firstIter(); + tsDLIter pNetIO = chan.cacPrivateListOfIO::eventq.firstIter(); while ( pNetIO.valid() ) { - tsDLIterBD pNext = pNetIO; + tsDLIter pNext = pNetIO; pNext++; if ( ! pNetIO->isSubscription() ) { // no use after disconnected - so uninstall it diff --git a/src/ca/cacServiceList.cpp b/src/ca/cacServiceList.cpp index 8b3105beb..66eb9bc82 100644 --- a/src/ca/cacServiceList.cpp +++ b/src/ca/cacServiceList.cpp @@ -48,7 +48,7 @@ cacChannel * cacServiceList::createChannel ( cacChannel *pChanIO = 0; epicsGuard < epicsMutex > locker ( this->mutex ); - tsDLIterBD < cacService > iter = this->services.firstIter (); + tsDLIter < cacService > iter = this->services.firstIter (); while ( iter.valid () ) { pChanIO = iter->createChannel ( pName, chan, pri ); if ( pChanIO ) { @@ -63,7 +63,7 @@ cacChannel * cacServiceList::createChannel ( void cacServiceList::show ( unsigned level ) const { epicsGuard < epicsMutex > locker ( this->mutex ); - tsDLIterConstBD < cacService > iter = this->services.firstIter (); + tsDLIterConst < cacService > iter = this->services.firstIter (); while ( iter.valid () ) { iter->show ( level ); iter++; diff --git a/src/ca/comQueSend.cpp b/src/ca/comQueSend.cpp index 68c68a315..6ddd4c2f6 100644 --- a/src/ca/comQueSend.cpp +++ b/src/ca/comQueSend.cpp @@ -98,14 +98,14 @@ void comQueSend::clear () this->nBytesPending -= pBuf->occupiedBytes (); pBuf->destroy (); } - this->pFirstUncommited = tsDLIterBD < comBuf > (); + this->pFirstUncommited = tsDLIter < comBuf > (); assert ( this->nBytesPending == 0 ); } void comQueSend::clearUncommitted () { while ( this->pFirstUncommited.valid() ) { - tsDLIterBD < comBuf > next = this->pFirstUncommited; + tsDLIter < comBuf > next = this->pFirstUncommited; next++; this->pFirstUncommited->clearUncommittedIncomming (); if ( this->pFirstUncommited->occupiedBytes() == 0u ) { diff --git a/src/ca/comQueSend.h b/src/ca/comQueSend.h index 88a042757..f2f1aeecb 100644 --- a/src/ca/comQueSend.h +++ b/src/ca/comQueSend.h @@ -65,7 +65,7 @@ public: comBuf * popNextComBufToSend (); private: tsDLList < comBuf > bufs; - tsDLIterBD < comBuf > pFirstUncommited; + tsDLIter < comBuf > pFirstUncommited; wireSendAdapter & wire; unsigned nBytesPending; void copy_dbr_string ( const void *pValue, unsigned nElem ); diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp index ffff4bc86..8f2673dd1 100644 --- a/src/ca/repeater.cpp +++ b/src/ca/repeater.cpp @@ -415,7 +415,7 @@ static void register_new_client ( osiSockAddr &from ) } } - tsDLIterBD < repeaterClient > pclient = client_list.firstIter (); + tsDLIter < repeaterClient > pclient = client_list.firstIter (); while ( pclient.valid () ) { if ( pclient->identicalPort ( from ) ) { break; diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp index 7e08a0b99..050a42330 100644 --- a/src/ca/tcpiiu.cpp +++ b/src/ca/tcpiiu.cpp @@ -701,7 +701,7 @@ void tcpiiu::show ( unsigned level ) const this->recvThread.show ( level-2u ); ::printf ("\techo pending bool = %u\n", this->echoRequestPending ); ::printf ( "IO identifier hash table:\n" ); - tsDLIterConstBD < nciu > pChan = this->channelList.firstIter (); + tsDLIterConst < nciu > pChan = this->channelList.firstIter (); while ( pChan.valid () ) { pChan->show ( level - 2u ); pChan++; diff --git a/src/ca/udpiiu.cpp b/src/ca/udpiiu.cpp index f8766c6e8..149202310 100644 --- a/src/ca/udpiiu.cpp +++ b/src/ca/udpiiu.cpp @@ -951,7 +951,7 @@ void udpiiu::show ( unsigned level ) const this->pSearchTmr->show ( level - 2u ); ::printf ( "repeater subscribee timer:\n" ); this->pRepeaterSubscribeTmr->show ( level - 2u ); - tsDLIterConstBD < nciu > pChan = this->channelList.firstIter (); + tsDLIterConst < nciu > pChan = this->channelList.firstIter (); while ( pChan.valid () ) { pChan->show ( level - 2u ); pChan++; @@ -1003,7 +1003,7 @@ void udpiiu::beaconAnomalyNotify () { epicsGuard guard ( this->mutex ); - tsDLIterBD < nciu > chan = this->channelList.firstIter (); + tsDLIter < nciu > chan = this->channelList.firstIter (); while ( chan.valid () ) { chan->beaconAnomalyNotify (); chan++; diff --git a/src/cas/generic/caServerI.cc b/src/cas/generic/caServerI.cc index c9d4110ba..b5647453e 100644 --- a/src/cas/generic/caServerI.cc +++ b/src/cas/generic/caServerI.cc @@ -97,9 +97,9 @@ caServerI::~caServerI() // // delete all clients // - tsDLIterBD iter = this->clientList.firstIter (); + tsDLIter iter = this->clientList.firstIter (); while ( iter.valid () ) { - tsDLIterBD tmp = iter; + tsDLIter tmp = iter; ++tmp; // // destructor takes client out of list @@ -225,7 +225,7 @@ void caServerI::sendBeacon() // { epicsGuard < epicsMutex > locker ( this->mutex ); - tsDLIterBD iter = this->intfList.firstIter (); + tsDLIter iter = this->intfList.firstIter (); while ( iter.valid () ) { iter->sendBeacon ( this->beaconCounter ); iter++; @@ -262,13 +262,13 @@ void caServerI::show (unsigned level) const { epicsGuard < epicsMutex > locker ( this->mutex ); - tsDLIterConstBD iterCl = this->clientList.firstIter (); + tsDLIterConst iterCl = this->clientList.firstIter (); while ( iterCl.valid () ) { iterCl->show (level); ++iterCl; } - tsDLIterConstBD iterIF = this->intfList.firstIter (); + tsDLIterConst iterIF = this->intfList.firstIter (); while ( iterIF.valid () ) { iterIF->casIntfOS::show ( level ); ++iterIF; diff --git a/src/cas/generic/casChannelI.cc b/src/cas/generic/casChannelI.cc index 332fcd7f3..ea64ca536 100644 --- a/src/cas/generic/casChannelI.cc +++ b/src/cas/generic/casChannelI.cc @@ -46,12 +46,12 @@ casChannelI::~casChannelI() // // cancel any pending asynchronous IO // - tsDLIterBD iterAIO = this->ioInProgList.firstIter (); + tsDLIter iterAIO = this->ioInProgList.firstIter (); while ( iterAIO.valid () ) { // // destructor removes from this list // - tsDLIterBD tmpAIO = iterAIO; + tsDLIter tmpAIO = iterAIO; ++tmpAIO; iterAIO->serverDestroy (); iterAIO = tmpAIO; @@ -60,12 +60,12 @@ casChannelI::~casChannelI() // // cancel the monitors // - tsDLIterBD iterMon = this->monitorList.firstIter (); + tsDLIter iterMon = this->monitorList.firstIter (); while ( iterMon.valid () ) { // // destructor removes from this list // - tsDLIterBD tmpMon = iterMon; + tsDLIter tmpMon = iterMon; ++tmpMon; iterMon->destroy (); iterMon = tmpMon; @@ -91,12 +91,12 @@ void casChannelI::clearOutstandingReads() // // cancel any pending asynchronous IO // - tsDLIterBD iterIO = this->ioInProgList.firstIter (); + tsDLIter iterIO = this->ioInProgList.firstIter (); while ( iterIO.valid () ) { // // destructor removes from this list // - tsDLIterBD tmp = iterIO; + tsDLIter tmp = iterIO; ++tmp; iterIO->serverDestroyIfReadOP(); iterIO = tmp; @@ -112,7 +112,7 @@ void casChannelI::show ( unsigned level ) const { this->lock (); - tsDLIterConstBD iter = this->monitorList.firstIter (); + tsDLIterConst iter = this->monitorList.firstIter (); if ( iter.valid () ) { printf("List of CA events (monitors) for \"%s\".\n", this->pv.getName()); @@ -197,10 +197,10 @@ void casChannelI::destroyClientNotify () // sane clients will require only one or two monitors // per channel) // -tsDLIterBD casChannelI::findMonitor (const caResId clientIdIn) +tsDLIter casChannelI::findMonitor (const caResId clientIdIn) { this->lock (); - tsDLIterBD iter = this->monitorList.firstIter (); + tsDLIter iter = this->monitorList.firstIter (); while ( iter.valid () ) { if ( clientIdIn == iter->getClientId () ) { break; diff --git a/src/cas/generic/casChannelIIL.h b/src/cas/generic/casChannelIIL.h index b020b3a93..67c1e4c62 100644 --- a/src/cas/generic/casChannelIIL.h +++ b/src/cas/generic/casChannelIIL.h @@ -45,7 +45,7 @@ inline void casChannelI::postEvent (const casEventMask &select, const gdd &event { this->lock(); - tsDLIterBD iter = this->monitorList.firstIter (); + tsDLIter iter = this->monitorList.firstIter (); while ( iter.valid () ) { iter->post (select, event); ++iter; diff --git a/src/cas/generic/casCoreClient.cc b/src/cas/generic/casCoreClient.cc index 428c28be2..6aed67dd6 100644 --- a/src/cas/generic/casCoreClient.cc +++ b/src/cas/generic/casCoreClient.cc @@ -44,7 +44,7 @@ casCoreClient::~casCoreClient() } this->lock(); - tsDLIterBD iterIO = this->ioInProgList.firstIter (); + tsDLIter iterIO = this->ioInProgList.firstIter (); // // cancel any pending asynchronous IO @@ -53,7 +53,7 @@ casCoreClient::~casCoreClient() // // destructor removes from this list // - tsDLIterBD tmpIO = iterIO; + tsDLIter tmpIO = iterIO; ++tmpIO; iterIO->serverDestroy (); iterIO = tmpIO; diff --git a/src/cas/generic/casInternal.h b/src/cas/generic/casInternal.h index c757b506a..ad4a19725 100644 --- a/src/cas/generic/casInternal.h +++ b/src/cas/generic/casInternal.h @@ -312,7 +312,7 @@ public: // sane clients will require only one or two monitors // per channel) // - tsDLIterBD findMonitor (const caResId clientIdIn); + tsDLIter findMonitor (const caResId clientIdIn); casPVI &getPVI () const { diff --git a/src/cas/generic/casPVI.cc b/src/cas/generic/casPVI.cc index 38e516187..25fec3c52 100644 --- a/src/cas/generic/casPVI.cc +++ b/src/cas/generic/casPVI.cc @@ -53,9 +53,9 @@ casPVI::~casPVI() // // delete any attached channels // - tsDLIterBD iter = this->chanList.firstIter (); + tsDLIter iter = this->chanList.firstIter (); while ( iter.valid () ) { - tsDLIterBD tmp = iter; + tsDLIter tmp = iter; ++tmp; iter->destroyClientNotify (); iter = tmp; diff --git a/src/cas/generic/casPVIIL.h b/src/cas/generic/casPVIIL.h index 7db356017..84b9d64bb 100644 --- a/src/cas/generic/casPVIIL.h +++ b/src/cas/generic/casPVIIL.h @@ -122,7 +122,7 @@ inline void casPVI::postEvent (const casEventMask &select, const gdd &event) } this->lock(); - tsDLIterBD iter = this->chanList.firstIter (); + tsDLIter iter = this->chanList.firstIter (); while ( iter.valid () ) { iter->postEvent ( select, event ); ++iter; diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc index 1a0edb3e1..0fca36869 100644 --- a/src/cas/generic/casStrmClient.cc +++ b/src/cas/generic/casStrmClient.cc @@ -73,12 +73,12 @@ casStrmClient::~casStrmClient() // // delete all channel attached // - tsDLIterBD iter = this->chanList.firstIter (); + tsDLIter iter = this->chanList.firstIter (); while ( iter.valid () ) { // // destroying the channel removes it from the list // - tsDLIterBD tmp = iter; + tsDLIter tmp = iter; ++tmp; iter->destroyNoClientNotify(); iter = tmp; @@ -862,7 +862,7 @@ caStatus casStrmClient::hostNameAction() } this->pHostName = pMalloc; - tsDLIterBD iter = this->chanList.firstIter (); + tsDLIter iter = this->chanList.firstIter (); while ( iter.valid () ) { iter->setOwner(this->pUserName, this->pHostName); ++iter; @@ -910,7 +910,7 @@ caStatus casStrmClient::clientNameAction() } this->pUserName = pMalloc; - tsDLIterBD iter = this->chanList.firstIter (); + tsDLIter iter = this->chanList.firstIter (); while ( iter.valid () ) { iter->setOwner ( this->pUserName, this->pHostName ); ++iter; @@ -1386,7 +1386,7 @@ caStatus casStrmClient::eventCancelAction () /* * verify the event (monitor) */ - tsDLIterBD pMon = pciu->findMonitor ( mp->m_available ); + tsDLIter pMon = pciu->findMonitor ( mp->m_available ); if ( ! pMon.valid () ) { // // this indicates client or server library corruption so a @@ -1478,7 +1478,7 @@ caStatus casStrmClient::readSyncAction() // a read. // this->lock(); - tsDLIterBD iter = this->chanList.firstIter (); + tsDLIter iter = this->chanList.firstIter (); while ( iter.valid () ) { iter->clearOutstandingReads (); ++iter; diff --git a/src/db/dbServiceIO.cpp b/src/db/dbServiceIO.cpp index d9b4b3cd8..1aa5ac90a 100644 --- a/src/db/dbServiceIO.cpp +++ b/src/db/dbServiceIO.cpp @@ -264,7 +264,7 @@ void dbServiceIO::ioShow ( const cacChannel::ioid &id, unsigned level ) const void dbServiceIO::showAllIO ( const dbChannelIO &chan, unsigned level ) const { epicsGuard < epicsMutex > locker ( this->mutex ); - tsDLIterConstBD < dbSubscriptionIO > pItem = + tsDLIterConst < dbSubscriptionIO > pItem = chan.dbServicePrivateListOfIO::eventq.firstIter (); while ( pItem.valid () ) { pItem->show ( level ); diff --git a/src/libCom/Makefile b/src/libCom/Makefile index f768af0cc..6896337d7 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -57,7 +57,6 @@ SRCS += epicsListBase.cpp SRC_DIRS += $(LIBCOM)/cxxTemplates INC += resourceLib.h INC += tsDLList.h -INC += tsDLListDeprecated.h INC += tsSLList.h INC += tsMinMax.h INC += tsBTree.h diff --git a/src/libCom/cxxTemplates/tsDLList.h b/src/libCom/cxxTemplates/tsDLList.h index 133b569e8..53086d6f4 100644 --- a/src/libCom/cxxTemplates/tsDLList.h +++ b/src/libCom/cxxTemplates/tsDLList.h @@ -21,11 +21,8 @@ #define tsDLListH_include template class tsDLList; -template class tsDLIterConstBD; -template class tsDLIterBD; -template class tsDLIter; // deprecated -template class tsDLFwdIter; // deprecated -template class tsDLBwdIter; // deprecated +template class tsDLIterConst; +template class tsDLIter; // // class tsDLNode @@ -40,14 +37,11 @@ public: tsDLNode ( const tsDLNode & ); const tsDLNode & operator = ( const tsDLNode & ); private: - T *pNext; - T *pPrev; + T * pNext; + T * pPrev; friend class tsDLList; - friend class tsDLIterBD; - friend class tsDLIterConstBD; - friend class tsDLIter; // deprecated - friend class tsDLFwdIter; // deprecated - friend class tsDLBwdIter; // deprecated + friend class tsDLIter; + friend class tsDLIterConst; }; // @@ -72,12 +66,12 @@ public: int find ( const T & item ) const; // returns -1 if not present, node number if present T * first ( void ) const; // ptr to first item on list T * last ( void ) const; // ptr to last item on list - tsDLIterConstBD firstIter () const; - tsDLIterBD firstIter (); - tsDLIterConstBD lastIter () const; - tsDLIterBD lastIter (); - static tsDLIterConstBD invalidConstIter (); - static tsDLIterBD invalidIter (); + tsDLIterConst firstIter () const; + tsDLIter firstIter (); + tsDLIterConst lastIter () const; + tsDLIter lastIter (); + static tsDLIterConst invalidConstIter (); + static tsDLIter invalidIter (); private: T * pFirst; T * pLast; @@ -85,60 +79,57 @@ private: void clear (); tsDLList ( const tsDLList & ); // not allowed const tsDLList & operator = ( const tsDLList & ); // not allowed - friend class tsDLIter; // deprecated - friend class tsDLFwdIter; // deprecated - friend class tsDLBwdIter; // deprecated }; // -// class tsDLIterConstBD +// class tsDLIterConst // // bi-directional iterator for a const doubly linked list // template -class tsDLIterConstBD { +class tsDLIterConst { public: - tsDLIterConstBD (); + tsDLIterConst (); bool valid () const; - bool operator == ( const tsDLIterConstBD & rhs ) const; - bool operator != ( const tsDLIterConstBD & rhs ) const; - tsDLIterConstBD & operator = ( const tsDLIterConstBD & ); + bool operator == ( const tsDLIterConst & rhs ) const; + bool operator != ( const tsDLIterConst & rhs ) const; + tsDLIterConst & operator = ( const tsDLIterConst & ); const T & operator * () const; const T * operator -> () const; - tsDLIterConstBD & operator ++ (); - tsDLIterConstBD operator ++ (int); - tsDLIterConstBD & operator -- (); - tsDLIterConstBD operator -- (int); + tsDLIterConst & operator ++ (); + tsDLIterConst operator ++ (int); + tsDLIterConst & operator -- (); + tsDLIterConst operator -- (int); const T * pointer () const; private: const T * pEntry; - tsDLIterConstBD ( const T * pInitialEntry ); + tsDLIterConst ( const T * pInitialEntry ); friend class tsDLList ; }; // -// class tsDLIterBD +// class tsDLIter // // bi-directional iterator for a doubly linked list // template -class tsDLIterBD { +class tsDLIter { public: - tsDLIterBD (); + tsDLIter (); bool valid () const; - bool operator == ( const tsDLIterBD & rhs ) const; - bool operator != ( const tsDLIterBD & rhs ) const; - tsDLIterBD & operator = ( const tsDLIterBD & ); + bool operator == ( const tsDLIter & rhs ) const; + bool operator != ( const tsDLIter & rhs ) const; + tsDLIter & operator = ( const tsDLIter & ); T & operator * () const; T * operator -> () const; - tsDLIterBD & operator ++ (); - tsDLIterBD operator ++ ( int ); - tsDLIterBD & operator -- (); - tsDLIterBD operator -- ( int ); + tsDLIter & operator ++ (); + tsDLIter operator ++ ( int ); + tsDLIter & operator -- (); + tsDLIter operator -- ( int ); T * pointer () const; private: T * pEntry; - tsDLIterBD ( T *pInitialEntry ); + tsDLIter ( T *pInitialEntry ); friend class tsDLList ; }; @@ -410,8 +401,8 @@ inline void tsDLList::push (T &item) template < class T > int tsDLList < T > :: find ( const T &item ) const { - tsDLIterConstBD < T > thisItem ( &item ); - tsDLIterConstBD < T > iter ( this->first () ); + tsDLIterConst < T > thisItem ( &item ); + tsDLIterConst < T > iter ( this->first () ); int itemNo = 0; while ( iter.valid () ) { @@ -425,85 +416,85 @@ int tsDLList < T > :: find ( const T &item ) const } template < class T > -inline tsDLIterConstBD tsDLList < T > :: firstIter () const +inline tsDLIterConst tsDLList < T > :: firstIter () const { - return tsDLIterConstBD < T > ( this->pFirst ); + return tsDLIterConst < T > ( this->pFirst ); } template < class T > -inline tsDLIterBD tsDLList < T > :: firstIter () +inline tsDLIter tsDLList < T > :: firstIter () { - return tsDLIterBD < T > ( this->pFirst ); + return tsDLIter < T > ( this->pFirst ); } template < class T > -inline tsDLIterConstBD tsDLList < T > :: lastIter () const +inline tsDLIterConst tsDLList < T > :: lastIter () const { - return tsDLIterConstBD < T > ( this->pLast ); + return tsDLIterConst < T > ( this->pLast ); } template < class T > -inline tsDLIterBD tsDLList < T > :: lastIter () +inline tsDLIter tsDLList < T > :: lastIter () { - return tsDLIterBD < T > ( this->pLast ); + return tsDLIter < T > ( this->pLast ); } template < class T > -inline tsDLIterConstBD tsDLList < T > :: invalidConstIter () +inline tsDLIterConst tsDLList < T > :: invalidConstIter () { - return tsDLIterConstBD < T > ( 0 ); + return tsDLIterConst < T > ( 0 ); } template < class T > -inline tsDLIterBD tsDLList < T > :: invalidIter () +inline tsDLIter tsDLList < T > :: invalidIter () { - return tsDLIterBD < T > ( 0 ); + return tsDLIter < T > ( 0 ); } ////////////////////////////////////////// -// tsDLIterConstBD member functions +// tsDLIterConst member functions ////////////////////////////////////////// template -inline tsDLIterConstBD::tsDLIterConstBD ( const T *pInitialEntry ) : +inline tsDLIterConst::tsDLIterConst ( const T *pInitialEntry ) : pEntry ( pInitialEntry ) {} template -inline tsDLIterConstBD::tsDLIterConstBD () : +inline tsDLIterConst::tsDLIterConst () : pEntry ( 0 ) {} template -inline bool tsDLIterConstBD::valid () const +inline bool tsDLIterConst::valid () const { return this->pEntry != 0; } template -inline bool tsDLIterConstBD::operator == (const tsDLIterConstBD &rhs) const +inline bool tsDLIterConst::operator == (const tsDLIterConst &rhs) const { return this->pEntry == rhs.pEntry; } template -inline bool tsDLIterConstBD::operator != (const tsDLIterConstBD &rhs) const +inline bool tsDLIterConst::operator != (const tsDLIterConst &rhs) const { return this->pEntry != rhs.pEntry; } template -inline tsDLIterConstBD & tsDLIterConstBD::operator = ( const tsDLIterConstBD & rhs ) +inline tsDLIterConst & tsDLIterConst::operator = ( const tsDLIterConst & rhs ) { this->pEntry = rhs.pEntry; return *this; } template -inline const T & tsDLIterConstBD::operator * () const +inline const T & tsDLIterConst::operator * () const { return *this->pEntry; } template -inline const T * tsDLIterConstBD::operator -> () const +inline const T * tsDLIterConst::operator -> () const { return this->pEntry; } @@ -512,7 +503,7 @@ inline const T * tsDLIterConstBD::operator -> () const // prefix ++ // template -inline tsDLIterConstBD & tsDLIterConstBD::operator ++ () +inline tsDLIterConst & tsDLIterConst::operator ++ () { const tsDLNode &node = *this->pEntry; this->pEntry = node.pNext; @@ -523,9 +514,9 @@ inline tsDLIterConstBD & tsDLIterConstBD::operator ++ () // postfix ++ // template -inline tsDLIterConstBD tsDLIterConstBD::operator ++ (int) +inline tsDLIterConst tsDLIterConst::operator ++ (int) { - const tsDLIterConstBD tmp = *this; + const tsDLIterConst tmp = *this; const tsDLNode &node = *this->pEntry; this->pEntry = node.pNext; return tmp; @@ -535,7 +526,7 @@ inline tsDLIterConstBD tsDLIterConstBD::operator ++ (int) // prefix -- // template -inline tsDLIterConstBD & tsDLIterConstBD::operator -- () +inline tsDLIterConst & tsDLIterConst::operator -- () { const tsDLNode &entryNode = *this->pEntry; this->pEntry = entryNode.pPrev; @@ -546,71 +537,71 @@ inline tsDLIterConstBD & tsDLIterConstBD::operator -- () // postfix -- // template -inline tsDLIterConstBD tsDLIterConstBD::operator -- (int) +inline tsDLIterConst tsDLIterConst::operator -- (int) { - const tsDLIterConstBD tmp = *this; + const tsDLIterConst tmp = *this; const tsDLNode &entryNode = *this->pEntry; this->pEntry = entryNode.pPrev; return tmp; } template -inline const T * tsDLIterConstBD::pointer () const +inline const T * tsDLIterConst::pointer () const { return this->pEntry; } ////////////////////////////////////////// -// tsDLIterBD member functions +// tsDLIter member functions ////////////////////////////////////////// template -inline tsDLIterBD::tsDLIterBD ( T * pInitialEntry ) : +inline tsDLIter::tsDLIter ( T * pInitialEntry ) : pEntry ( pInitialEntry ) {} template -inline tsDLIterBD::tsDLIterBD () : +inline tsDLIter::tsDLIter () : pEntry ( 0 ) {} template -inline bool tsDLIterBD::valid () const +inline bool tsDLIter::valid () const { return this->pEntry != 0; } template -inline bool tsDLIterBD::operator == (const tsDLIterBD &rhs) const +inline bool tsDLIter::operator == (const tsDLIter &rhs) const { return this->pEntry == rhs.pEntry; } template -inline bool tsDLIterBD::operator != (const tsDLIterBD &rhs) const +inline bool tsDLIter::operator != (const tsDLIter &rhs) const { return this->pEntry != rhs.pEntry; } template -inline tsDLIterBD & tsDLIterBD::operator = ( const tsDLIterBD & rhs ) +inline tsDLIter & tsDLIter::operator = ( const tsDLIter & rhs ) { this->pEntry = rhs.pEntry; return *this; } template -inline T & tsDLIterBD::operator * () const +inline T & tsDLIter::operator * () const { return *this->pEntry; } template -inline T * tsDLIterBD::operator -> () const +inline T * tsDLIter::operator -> () const { return this->pEntry; } template -inline tsDLIterBD & tsDLIterBD::operator ++ () // prefix ++ +inline tsDLIter & tsDLIter::operator ++ () // prefix ++ { const tsDLNode &entryNode = *this->pEntry; this->pEntry = entryNode.pNext; @@ -618,16 +609,16 @@ inline tsDLIterBD & tsDLIterBD::operator ++ () // prefix ++ } template -inline tsDLIterBD tsDLIterBD::operator ++ (int) // postfix ++ +inline tsDLIter tsDLIter::operator ++ (int) // postfix ++ { - const tsDLIterBD tmp = *this; + const tsDLIter tmp = *this; const tsDLNode &entryNode = *this->pEntry; this->pEntry = entryNode.pNext; return tmp; } template -inline tsDLIterBD & tsDLIterBD::operator -- () // prefix -- +inline tsDLIter & tsDLIter::operator -- () // prefix -- { const tsDLNode &entryNode = *this->pEntry; this->pEntry = entryNode.pPrev; @@ -635,21 +626,19 @@ inline tsDLIterBD & tsDLIterBD::operator -- () // prefix -- } template -inline tsDLIterBD tsDLIterBD::operator -- (int) // postfix -- +inline tsDLIter tsDLIter::operator -- (int) // postfix -- { - const tsDLIterBD tmp = *this; + const tsDLIter tmp = *this; const tsDLNode &entryNode = *this->pEntry; this->pEntry = entryNode.pPrev; return tmp; } template -inline T * tsDLIterBD::pointer () const +inline T * tsDLIter::pointer () const { return this->pEntry; } -#include "tsDLListDeprecated.h" - #endif // tsDLListH_include diff --git a/src/libCom/fdmgr/fdManager.cpp b/src/libCom/fdmgr/fdManager.cpp index 8d29b5d9d..a75e6fb7d 100644 --- a/src/libCom/fdmgr/fdManager.cpp +++ b/src/libCom/fdmgr/fdManager.cpp @@ -110,7 +110,7 @@ epicsShareFunc void fdManager::process (double delay) minDelay = delay; } - tsDLIterBD < fdReg > iter = this->regList.firstIter (); + tsDLIter < fdReg > iter = this->regList.firstIter (); while ( iter.valid () ) { FD_SET(iter->getFD(), &this->fdSets[iter->getType()]); ioPending = 1; @@ -165,7 +165,7 @@ epicsShareFunc void fdManager::process (double delay) // iter=this->regList.firstIter (); while ( iter.valid () ) { - tsDLIterBD tmp = iter; + tsDLIter tmp = iter; tmp++; if (FD_ISSET(iter->getFD(), &this->fdSets[iter->getType()])) { FD_CLR(iter->getFD(), &this->fdSets[iter->getType()]); diff --git a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp index f22a6f193..c1ab2e007 100644 --- a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp +++ b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp @@ -122,7 +122,7 @@ void ipAddrToAsciiEngine::show ( unsigned level ) const printf ( "ipAddrToAsciiEngine at %p with %u requests pending\n", static_cast (this), this->labor.count () ); if ( level > 0u ) { - tsDLIterConstBD < ipAddrToAsciiAsynchronous > pItem = this->labor.firstIter (); + tsDLIterConst < ipAddrToAsciiAsynchronous > pItem = this->labor.firstIter (); while ( pItem.valid () ) { pItem->show ( level - 1u ); pItem++; diff --git a/src/libCom/timer/timer.cpp b/src/libCom/timer/timer.cpp index 836fb745a..a907ae0f2 100644 --- a/src/libCom/timer/timer.cpp +++ b/src/libCom/timer/timer.cpp @@ -80,7 +80,7 @@ void timer::privateStart ( epicsTimerNotify & notify, const epicsTime & expire ) // // **** this should use a binary tree ???? // - tsDLIterBD < timer > pTmr = this->queue.timerList.lastIter (); + tsDLIter < timer > pTmr = this->queue.timerList.lastIter (); while ( true ) { if ( ! pTmr.valid () ) { // diff --git a/src/libCom/timer/timerQueue.cpp b/src/libCom/timer/timerQueue.cpp index d9f9cac46..6cea226c4 100644 --- a/src/libCom/timer/timerQueue.cpp +++ b/src/libCom/timer/timerQueue.cpp @@ -167,7 +167,7 @@ void timerQueue::show ( unsigned level ) const epicsGuard < epicsMutex > locker ( this->mutex ); printf ( "epicsTimerQueue with %u items pending\n", this->timerList.count () ); if ( level >= 1u ) { - tsDLIterConstBD < timer > iter = this->timerList.firstIter (); + tsDLIterConst < timer > iter = this->timerList.firstIter (); while ( iter.valid () ) { iter->show ( level - 1u ); ++iter; diff --git a/src/libCom/timer/timerQueueActiveMgr.cpp b/src/libCom/timer/timerQueueActiveMgr.cpp index 1df731994..9e315a2a6 100644 --- a/src/libCom/timer/timerQueueActiveMgr.cpp +++ b/src/libCom/timer/timerQueueActiveMgr.cpp @@ -35,7 +35,7 @@ epicsTimerQueueActiveForC & timerQueueActiveMgr::allocate ( { epicsGuard < epicsMutex > locker ( this->mutex ); if ( okToShare ) { - tsDLIterBD < epicsTimerQueueActiveForC > iter = this->sharedQueueList.firstIter (); + tsDLIter < epicsTimerQueueActiveForC > iter = this->sharedQueueList.firstIter (); while ( iter.valid () ) { if ( iter->threadPriority () == threadPriority ) { assert ( iter->timerQueueActiveMgrPrivate::referenceCount < UINT_MAX );