fixed Borland build issues

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 );
     }
 }
 

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 );
     }
 }

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 );

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;

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++;
         }
     }

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 ) {

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 & );

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 &, 

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;