From ed80ec6650940e7ab18b7d5a1b80982f6ae40b27 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 19 Mar 2003 18:00:33 +0000 Subject: [PATCH] fixed Borland build issues --- src/cas/generic/casChannel.cc | 2 +- src/cas/generic/casChannelI.h | 6 +++--- src/cas/generic/casCoreClient.cc | 4 ++-- src/cas/generic/casCoreClient.h | 4 ++-- src/cas/generic/casPVI.cc | 2 +- src/cas/generic/casStrmClient.cc | 10 +++++----- src/cas/generic/casStrmClient.h | 4 ++-- src/cas/generic/chanIntfForPV.h | 2 +- src/cas/generic/channelDestroyEvent.cpp | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/cas/generic/casChannel.cc b/src/cas/generic/casChannel.cc index 480325d33..7a256ff3e 100644 --- a/src/cas/generic/casChannel.cc +++ b/src/cas/generic/casChannel.cc @@ -27,7 +27,7 @@ casChannel::casChannel ( const casCtx & ctx ) : casChannel::~casChannel () { if ( this->pChanI ) { - this->pChanI->casChannelDestroyNotify ( true ); + this->pChanI->casChannelDestroyFromInterfaceNotify ( true ); } } diff --git a/src/cas/generic/casChannelI.h b/src/cas/generic/casChannelI.h index 05ca9f58e..e06feaca3 100644 --- a/src/cas/generic/casChannelI.h +++ b/src/cas/generic/casChannelI.h @@ -34,7 +34,7 @@ public: casChannelI ( casCoreClient & clientIn, casChannel & chanIn, casPVI & pvIn, ca_uint32_t cidIn ); ~casChannelI (); - void casChannelDestroyNotify ( bool immediateUninstall ); + void casChannelDestroyFromInterfaceNotify ( bool immediateUninstall ); const caResId getCID (); const caResId getSID (); void uninstallFromPV ( casEventSys & eventSys ); @@ -135,11 +135,11 @@ inline void casChannelI::uninstallIO ( casAsyncIOI & io ) this->pv.uninstallIO ( this->ioList, io ); } -inline void casChannelI::casChannelDestroyNotify ( +inline void casChannelI::casChannelDestroyFromInterfaceNotify ( bool immediateUninstall ) { if ( ! this->serverDeletePending ) { - this->client().casChannelDestroyNotify ( + this->client().casChannelDestroyFromInterfaceNotify ( *this, immediateUninstall ); } } diff --git a/src/cas/generic/casCoreClient.cc b/src/cas/generic/casCoreClient.cc index d5c6db5fa..e6025ef89 100644 --- a/src/cas/generic/casCoreClient.cc +++ b/src/cas/generic/casCoreClient.cc @@ -122,14 +122,14 @@ caStatus casCoreClient::channelCreateFailedResp ( { return S_casApp_noSupport; } -caStatus casCoreClient::channelDestroyEvent ( +caStatus casCoreClient::channelDestroyEventNotify ( epicsGuard < casClientMutex > &, casChannelI * const, ca_uint32_t ) { return S_casApp_noSupport; } -void casCoreClient::casChannelDestroyNotify ( +void casCoreClient::casChannelDestroyFromInterfaceNotify ( casChannelI &, bool immediatedSestroyNeeded ) { assert ( 0 ); diff --git a/src/cas/generic/casCoreClient.h b/src/cas/generic/casCoreClient.h index 513c48f4a..f574044c9 100644 --- a/src/cas/generic/casCoreClient.h +++ b/src/cas/generic/casCoreClient.h @@ -85,10 +85,10 @@ public: virtual caStatus channelCreateFailedResp ( epicsGuard < casClientMutex > &, const caHdrLargeArray &, const caStatus createStatus ); - virtual caStatus channelDestroyEvent ( + virtual caStatus channelDestroyEventNotify ( epicsGuard < casClientMutex > & guard, casChannelI * const pChan, ca_uint32_t sid ); - virtual void casChannelDestroyNotify ( + virtual void casChannelDestroyFromInterfaceNotify ( casChannelI & chan, bool immediateDestroyNeeded ); virtual ca_uint16_t protocolRevision () const = 0; diff --git a/src/cas/generic/casPVI.cc b/src/cas/generic/casPVI.cc index f9b264b46..90432fd99 100644 --- a/src/cas/generic/casPVI.cc +++ b/src/cas/generic/casPVI.cc @@ -72,7 +72,7 @@ void casPVI::casPVDestroyNotify () if ( ! this->deletePending ) { tsDLIter < chanIntfForPV > iter = this->chanList.firstIter (); while ( iter.valid() ) { - iter->casChannelDestroyNotify ( false ); + iter->casChannelDestroyFromInterfaceNotify ( false ); iter++; } } diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc index f268fd5b4..c58fc239a 100644 --- a/src/cas/generic/casStrmClient.cc +++ b/src/cas/generic/casStrmClient.cc @@ -1041,7 +1041,7 @@ caStatus casStrmClient::writeNotifyResponse ( epicsGuard < casClientMutex > & gu * casStrmClient::writeNotifyResponseECA_XXX() */ caStatus casStrmClient::writeNotifyResponseECA_XXX ( - epicsGuard < casClientMutex > & guard, + epicsGuard < casClientMutex > &, const caHdrLargeArray & msg, const caStatus ecaStatus ) { caStatus status = out.copyInHeader ( msg.m_cmmd, 0, @@ -1644,8 +1644,8 @@ caStatus casStrmClient::clearChannelAction ( // disconnect message to the client and destroy the // channel. // -caStatus casStrmClient::channelDestroyEvent ( - epicsGuard < casClientMutex > & guard, +caStatus casStrmClient::channelDestroyEventNotify ( + epicsGuard < casClientMutex > &, casChannelI * const pChan, ca_uint32_t sid ) { casChannelI * pChanFound; @@ -1685,11 +1685,11 @@ caStatus casStrmClient::channelDestroyEvent ( return S_cas_success; } -// casStrmClient::casChannelDestroyNotify() +// casStrmClient::casChannelDestroyFromInterfaceNotify() // immediateUninstallNeeded is false when we must avoid // taking the lock insituations where we would compromise // the lock hierarchy -void casStrmClient::casChannelDestroyNotify ( +void casStrmClient::casChannelDestroyFromInterfaceNotify ( casChannelI & chan, bool immediateUninstallNeeded ) { if ( immediateUninstallNeeded ) { diff --git a/src/cas/generic/casStrmClient.h b/src/cas/generic/casStrmClient.h index 423e1ce06..a4dfc67a1 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 channelDestroyEvent ( + caStatus channelDestroyEventNotify ( epicsGuard < casClientMutex > & guard, casChannelI * const pChan, ca_uint32_t sid ); caStatus accessRightsResponse ( @@ -160,7 +160,7 @@ private: epicsGuard < casClientMutex > & guard, const caHdrLargeArray * mp, const void * dp, const int cacStatus, const char * pFileName, const unsigned lineno, const unsigned idIn ); - void casChannelDestroyNotify ( casChannelI & chan, + void casChannelDestroyFromInterfaceNotify ( casChannelI & chan, bool immediatedSestroyNeeded ); casStrmClient ( const casStrmClient & ); diff --git a/src/cas/generic/chanIntfForPV.h b/src/cas/generic/chanIntfForPV.h index d01669ae5..d1f2b0c0f 100644 --- a/src/cas/generic/chanIntfForPV.h +++ b/src/cas/generic/chanIntfForPV.h @@ -46,7 +46,7 @@ public: chanIntfForPV ( class casCoreClient & ); virtual ~chanIntfForPV (); class casCoreClient & client () const; - virtual void casChannelDestroyNotify ( bool immediateUninstall ) = 0; + virtual void casChannelDestroyFromInterfaceNotify ( bool immediateUninstall ) = 0; void installMonitor ( casPVI & pv, casMonitor & mon ); casMonitor * removeMonitor ( casPVI &, ca_uint32_t monId ); void removeSelfFromPV ( casPVI &, diff --git a/src/cas/generic/channelDestroyEvent.cpp b/src/cas/generic/channelDestroyEvent.cpp index 284c07320..d925494a7 100644 --- a/src/cas/generic/channelDestroyEvent.cpp +++ b/src/cas/generic/channelDestroyEvent.cpp @@ -25,7 +25,7 @@ caStatus channelDestroyEvent::cbFunc ( epicsGuard < casClientMutex > & clientGuard, epicsGuard < evSysMutex > & ) { - caStatus status = client.channelDestroyEvent ( + caStatus status = client.channelDestroyEventNotify ( clientGuard, this->pChan, this->sid ); if ( status != S_cas_sendBlocked ) { delete this;