diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc index 5389424ec..11398c684 100644 --- a/src/cas/generic/casStrmClient.cc +++ b/src/cas/generic/casStrmClient.cc @@ -1834,7 +1834,6 @@ caStatus casStrmClient::accessRightsResponse ( caStatus casStrmClient::write() { const caHdrLargeArray *pHdr = this->ctx.getMsg(); - casPVI * pPV = this->ctx.getPV(); caStatus status; // diff --git a/src/cas/generic/casStrmClient.h b/src/cas/generic/casStrmClient.h index 74429a9b5..a09ada069 100644 --- a/src/cas/generic/casStrmClient.h +++ b/src/cas/generic/casStrmClient.h @@ -127,7 +127,7 @@ private: casChannelI & chan, const caHdrLargeArray & hdr, unsigned dbrType ); caStatus channelCreateFailedResp ( epicsGuard < casClientMutex > &, const caHdrLargeArray &, const caStatus createStatus ); - caStatus casStrmClient::channelDestroyNotify ( + caStatus channelDestroyNotify ( epicsGuard < casClientMutex > & guard, casChannelI &, bool uninstallNeeded ); diff --git a/src/cas/generic/chanIntfForPV.h b/src/cas/generic/chanIntfForPV.h index 503bd5459..d01669ae5 100644 --- a/src/cas/generic/chanIntfForPV.h +++ b/src/cas/generic/chanIntfForPV.h @@ -44,7 +44,7 @@ class gdd; class chanIntfForPV : public tsDLNode < chanIntfForPV > { public: chanIntfForPV ( class casCoreClient & ); - ~chanIntfForPV (); + virtual ~chanIntfForPV (); class casCoreClient & client () const; virtual void casChannelDestroyNotify ( bool immediateUninstall ) = 0; void installMonitor ( casPVI & pv, casMonitor & mon ); diff --git a/src/cas/io/bsdSocket/casStreamIO.cc b/src/cas/io/bsdSocket/casStreamIO.cc index 4897a519b..e4d08b122 100644 --- a/src/cas/io/bsdSocket/casStreamIO.cc +++ b/src/cas/io/bsdSocket/casStreamIO.cc @@ -182,7 +182,7 @@ casStreamIO::osdRecv ( char * pInBuf, bufSizeT nBytes, // X aCC 361 void casStreamIO::forceDisconnect () { if ( ! this->sockHasBeenClosed ) { - this->sockHasBeenClosed; + this->sockHasBeenClosed = true; int status = ::shutdown ( this->sock, SD_BOTH ); if ( status ) { errlogPrintf ("CAC TCP socket shutdown error was %s\n",