Compare commits

...

1 Commits
7.0 ... 3.14

Author SHA1 Message Date
Ralph Lange
612d57a9b3 PCAS: fix scope of tsDLList when used in other classes
Use ::tsDLList to avoid resolving to privately inherited
name (which was breaking builds on newer clang compilers)

- Cherry-picked from 3.15 branch
2023-02-08 18:55:20 +01:00
3 changed files with 25 additions and 25 deletions

View File

@@ -88,8 +88,8 @@ public:
private: private:
clientBufMemoryManager clientBufMemMgr; clientBufMemoryManager clientBufMemMgr;
tsFreeList < casMonitor, 1024 > casMonitorFreeList; tsFreeList < casMonitor, 1024 > casMonitorFreeList;
tsDLList < casStrmClient > clientList; ::tsDLList < casStrmClient > clientList;
tsDLList < casIntfOS > intfList; ::tsDLList < casIntfOS > intfList;
mutable epicsMutex mutex; mutable epicsMutex mutex;
mutable epicsMutex diagnosticCountersMutex; mutable epicsMutex diagnosticCountersMutex;
caServer & adapter; caServer & adapter;

View File

@@ -286,7 +286,7 @@ void casPVI::postEvent ( const casEventMask & select, const gdd & event )
} }
caStatus casPVI::installMonitor ( caStatus casPVI::installMonitor (
casMonitor & mon, tsDLList < casMonitor > & monitorList ) casMonitor & mon, ::tsDLList < casMonitor > & monitorList )
{ {
epicsGuard < epicsMutex > guard ( this->mutex ); epicsGuard < epicsMutex > guard ( this->mutex );
assert ( this->nMonAttached < UINT_MAX ); assert ( this->nMonAttached < UINT_MAX );
@@ -302,7 +302,7 @@ caStatus casPVI::installMonitor (
} }
casMonitor * casPVI::removeMonitor ( casMonitor * casPVI::removeMonitor (
tsDLList < casMonitor > & list, ca_uint32_t clientIdIn ) ::tsDLList < casMonitor > & list, ca_uint32_t clientIdIn )
{ {
epicsGuard < epicsMutex > guard ( this->mutex ); epicsGuard < epicsMutex > guard ( this->mutex );
casMonitor * pMon = 0; casMonitor * pMon = 0;
@@ -359,8 +359,8 @@ void casPVI::installChannel ( chanIntfForPV & chan )
} }
void casPVI::removeChannel ( void casPVI::removeChannel (
chanIntfForPV & chan, tsDLList < casMonitor > & src, chanIntfForPV & chan, ::tsDLList < casMonitor > & src,
tsDLList < casMonitor > & dest ) ::tsDLList < casMonitor > & dest )
{ {
epicsGuard < epicsMutex > guard ( this->mutex ); epicsGuard < epicsMutex > guard ( this->mutex );
src.removeAll ( dest ); 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 ); 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 ); epicsGuard < epicsMutex > guard ( this->mutex );
while ( casAsyncIOI * pIO = ioList.get() ) { while ( casAsyncIOI * pIO = ioList.get() ) {
@@ -406,7 +406,7 @@ void casPVI::destroyAllIO ( tsDLList < casAsyncIOI > & ioList )
} }
void casPVI::installIO ( void casPVI::installIO (
tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io ) ::tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
{ {
epicsGuard < epicsMutex > guard ( this->mutex ); epicsGuard < epicsMutex > guard ( this->mutex );
ioList.add ( io ); ioList.add ( io );
@@ -415,7 +415,7 @@ void casPVI::installIO (
} }
void casPVI::uninstallIO ( void casPVI::uninstallIO (
tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io ) ::tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
{ {
{ {
epicsGuard < epicsMutex > guard ( this->mutex ); epicsGuard < epicsMutex > guard ( this->mutex );

View File

@@ -49,21 +49,21 @@ public:
caStatus attachToServer ( caServerI & cas ); caStatus attachToServer ( caServerI & cas );
aitIndex nativeCount (); aitIndex nativeCount ();
bool ioIsPending () const; bool ioIsPending () const;
void clearOutstandingReads ( tsDLList < class casAsyncIOI > &); void clearOutstandingReads ( ::tsDLList < class casAsyncIOI > &);
void destroyAllIO ( void destroyAllIO (
tsDLList < casAsyncIOI > & ); ::tsDLList < casAsyncIOI > & );
void installIO ( void installIO (
tsDLList < casAsyncIOI > &, casAsyncIOI & ); ::tsDLList < casAsyncIOI > &, casAsyncIOI & );
void uninstallIO ( void uninstallIO (
tsDLList < casAsyncIOI > &, casAsyncIOI & ); ::tsDLList < casAsyncIOI > &, casAsyncIOI & );
void installChannel ( chanIntfForPV & chan ); void installChannel ( chanIntfForPV & chan );
void removeChannel ( void removeChannel (
chanIntfForPV & chan, tsDLList < casMonitor > & src, chanIntfForPV & chan, ::tsDLList < casMonitor > & src,
tsDLList < casMonitor > & dest ); ::tsDLList < casMonitor > & dest );
caStatus installMonitor ( caStatus installMonitor (
casMonitor & mon, tsDLList < casMonitor > & monitorList ); casMonitor & mon, ::tsDLList < casMonitor > & monitorList );
casMonitor * removeMonitor ( casMonitor * removeMonitor (
tsDLList < casMonitor > & list, ca_uint32_t clientIdIn ); ::tsDLList < casMonitor > & list, ca_uint32_t clientIdIn );
void deleteSignal (); void deleteSignal ();
void postEvent ( const casEventMask & select, const gdd & event ); void postEvent ( const casEventMask & select, const gdd & event );
caServer * getExtServer () const; caServer * getExtServer () const;
@@ -84,7 +84,7 @@ public:
private: private:
mutable epicsMutex mutex; mutable epicsMutex mutex;
tsDLList < chanIntfForPV > chanList; ::tsDLList < chanIntfForPV > chanList;
gddEnumStringTable enumStrTbl; gddEnumStringTable enumStrTbl;
caServerI * pCAS; caServerI * pCAS;
casPV * pPV; casPV * pPV;