diff --git a/src/cas/generic/caServerI.h b/src/cas/generic/caServerI.h index b45d9373a..e31b210a7 100644 --- a/src/cas/generic/caServerI.h +++ b/src/cas/generic/caServerI.h @@ -88,8 +88,8 @@ public: private: clientBufMemoryManager clientBufMemMgr; tsFreeList < casMonitor, 1024 > casMonitorFreeList; - tsDLList < casStrmClient > clientList; - tsDLList < casIntfOS > intfList; + ::tsDLList < casStrmClient > clientList; + ::tsDLList < casIntfOS > intfList; mutable epicsMutex mutex; mutable epicsMutex diagnosticCountersMutex; caServer & adapter; diff --git a/src/cas/generic/casPVI.cc b/src/cas/generic/casPVI.cc index 0b02a6cbf..09c7192be 100644 --- a/src/cas/generic/casPVI.cc +++ b/src/cas/generic/casPVI.cc @@ -285,8 +285,8 @@ void casPVI::postEvent ( const casEventMask & select, const gdd & event ) } } -caStatus casPVI::installMonitor ( - casMonitor & mon, tsDLList < casMonitor > & monitorList ) +caStatus casPVI::installMonitor ( + casMonitor & mon, ::tsDLList < casMonitor > & monitorList ) { epicsGuard < epicsMutex > guard ( this->mutex ); assert ( this->nMonAttached < UINT_MAX ); @@ -301,8 +301,8 @@ caStatus casPVI::installMonitor ( } } -casMonitor * casPVI::removeMonitor ( - tsDLList < casMonitor > & list, ca_uint32_t clientIdIn ) +casMonitor * casPVI::removeMonitor ( + ::tsDLList < casMonitor > & list, ca_uint32_t clientIdIn ) { epicsGuard < epicsMutex > guard ( this->mutex ); casMonitor * pMon = 0; @@ -357,10 +357,10 @@ void casPVI::installChannel ( chanIntfForPV & chan ) epicsGuard < epicsMutex > guard ( this->mutex ); this->chanList.add ( chan ); } - -void casPVI::removeChannel ( - chanIntfForPV & chan, tsDLList < casMonitor > & src, - tsDLList < casMonitor > & dest ) + +void casPVI::removeChannel ( + chanIntfForPV & chan, ::tsDLList < casMonitor > & src, + ::tsDLList < casMonitor > & dest ) { epicsGuard < epicsMutex > guard ( this->mutex ); src.removeAll ( dest ); @@ -374,7 +374,7 @@ void casPVI::removeChannel ( } } -void casPVI::clearOutstandingReads ( tsDLList < casAsyncIOI > & ioList ) +void casPVI::clearOutstandingReads ( ::tsDLList < casAsyncIOI > & ioList ) { epicsGuard < epicsMutex > guard ( this->mutex ); @@ -394,7 +394,7 @@ void casPVI::clearOutstandingReads ( tsDLList < casAsyncIOI > & ioList ) } } -void casPVI::destroyAllIO ( tsDLList < casAsyncIOI > & ioList ) +void casPVI::destroyAllIO ( ::tsDLList < casAsyncIOI > & ioList ) { epicsGuard < epicsMutex > guard ( this->mutex ); while ( casAsyncIOI * pIO = ioList.get() ) { @@ -405,8 +405,8 @@ void casPVI::destroyAllIO ( tsDLList < casAsyncIOI > & ioList ) } } -void casPVI::installIO ( - tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io ) +void casPVI::installIO ( + ::tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io ) { epicsGuard < epicsMutex > guard ( this->mutex ); ioList.add ( io ); @@ -414,8 +414,8 @@ void casPVI::installIO ( this->nIOAttached++; } -void casPVI::uninstallIO ( - tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io ) +void casPVI::uninstallIO ( + ::tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io ) { { epicsGuard < epicsMutex > guard ( this->mutex ); diff --git a/src/cas/generic/casPVI.h b/src/cas/generic/casPVI.h index feea79d23..9732119da 100644 --- a/src/cas/generic/casPVI.h +++ b/src/cas/generic/casPVI.h @@ -49,21 +49,21 @@ public: caStatus attachToServer ( caServerI & cas ); aitIndex nativeCount (); bool ioIsPending () const; - void clearOutstandingReads ( tsDLList < class casAsyncIOI > &); + void clearOutstandingReads ( ::tsDLList < class casAsyncIOI > &); void destroyAllIO ( - tsDLList < casAsyncIOI > & ); + ::tsDLList < casAsyncIOI > & ); void installIO ( - tsDLList < casAsyncIOI > &, casAsyncIOI & ); + ::tsDLList < casAsyncIOI > &, casAsyncIOI & ); void uninstallIO ( - tsDLList < casAsyncIOI > &, casAsyncIOI & ); + ::tsDLList < casAsyncIOI > &, casAsyncIOI & ); void installChannel ( chanIntfForPV & chan ); void removeChannel ( - chanIntfForPV & chan, tsDLList < casMonitor > & src, - tsDLList < casMonitor > & dest ); + chanIntfForPV & chan, ::tsDLList < casMonitor > & src, + ::tsDLList < casMonitor > & dest ); caStatus installMonitor ( - casMonitor & mon, tsDLList < casMonitor > & monitorList ); + casMonitor & mon, ::tsDLList < casMonitor > & monitorList ); casMonitor * removeMonitor ( - tsDLList < casMonitor > & list, ca_uint32_t clientIdIn ); + ::tsDLList < casMonitor > & list, ca_uint32_t clientIdIn ); void deleteSignal (); void postEvent ( const casEventMask & select, const gdd & event ); caServer * getExtServer () const; @@ -84,7 +84,7 @@ public: private: mutable epicsMutex mutex; - tsDLList < chanIntfForPV > chanList; + ::tsDLList < chanIntfForPV > chanList; gddEnumStringTable enumStrTbl; caServerI * pCAS; casPV * pPV;