Changes for HPUX
This commit is contained in:
+14
-10
@@ -1405,9 +1405,10 @@ bool cac::readExcep ( epicsGuard < callbackMutex > &, tcpiiu &,
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cac::writeExcep ( epicsGuard < callbackMutex > &cbLocker, tcpiiu &,
|
||||
const caHdrLargeArray &hdr,
|
||||
const char *pCtx, unsigned status )
|
||||
bool cac::writeExcep ( epicsGuard < callbackMutex > &cbLocker, // X aCC 431
|
||||
tcpiiu &,
|
||||
const caHdrLargeArray &hdr,
|
||||
const char *pCtx, unsigned status )
|
||||
{
|
||||
nciu * pChan = this->chanTable.lookup ( hdr.m_available );
|
||||
if ( pChan ) {
|
||||
@@ -1475,8 +1476,9 @@ bool cac::exceptionRespAction ( epicsGuard < callbackMutex > & cbMutexIn, tcpiiu
|
||||
return ( this->*pStub ) ( cbMutexIn, iiu, req, pCtx, hdr.m_available );
|
||||
}
|
||||
|
||||
bool cac::accessRightsRespAction ( epicsGuard < callbackMutex > & cbGuard, tcpiiu &,
|
||||
const caHdrLargeArray &hdr, void * /* pMsgBdy */ )
|
||||
bool cac::accessRightsRespAction (
|
||||
epicsGuard < callbackMutex > & cbGuard, tcpiiu &, // X aCC 431
|
||||
const caHdrLargeArray &hdr, void * /* pMsgBdy */ )
|
||||
{
|
||||
nciu * pChan;
|
||||
{
|
||||
@@ -1503,8 +1505,9 @@ bool cac::accessRightsRespAction ( epicsGuard < callbackMutex > & cbGuard, tcpii
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cac::claimCIURespAction ( epicsGuard < callbackMutex > &cbGuard, tcpiiu & iiu,
|
||||
const caHdrLargeArray & hdr, void * /*pMsgBdy */ )
|
||||
bool cac::claimCIURespAction (
|
||||
epicsGuard < callbackMutex > &cbGuard, tcpiiu & iiu, // X aCC 431
|
||||
const caHdrLargeArray & hdr, void * /* pMsgBdy */ )
|
||||
{
|
||||
nciu * pChan;
|
||||
|
||||
@@ -1553,9 +1556,10 @@ bool cac::verifyAndDisconnectChan (
|
||||
return true;
|
||||
}
|
||||
|
||||
void cac::disconnectChannel ( epicsGuard < callbackMutex > & cbLocker,
|
||||
epicsGuard < cacMutex > & locker,
|
||||
nciu & chan )
|
||||
void cac::disconnectChannel (
|
||||
epicsGuard < callbackMutex > & cbLocker, // X aCC 431
|
||||
epicsGuard < cacMutex > & locker,
|
||||
nciu & chan )
|
||||
{
|
||||
this->disconnectAllIO ( locker, chan, true );
|
||||
chan.disconnect ( *this->pudpiiu );
|
||||
|
||||
+1
-2
@@ -1,4 +1,3 @@
|
||||
|
||||
/*
|
||||
* $Id$
|
||||
*
|
||||
@@ -88,7 +87,7 @@ private:
|
||||
epicsMutex mutex;
|
||||
};
|
||||
|
||||
class cacDisconnectChannelPrivate {
|
||||
class cacDisconnectChannelPrivate { // X aCC 655
|
||||
public:
|
||||
virtual void disconnectChannel (
|
||||
epicsGuard < callbackMutex > &,
|
||||
|
||||
+1
-2
@@ -1,4 +1,3 @@
|
||||
|
||||
/*
|
||||
* $Id$
|
||||
*
|
||||
@@ -119,4 +118,4 @@ unsigned comBuf::push ( const epicsFloat64 *pValue, unsigned nElem )
|
||||
void comBuf::throwInsufficentBytesException ()
|
||||
{
|
||||
throw insufficentBytesAvailable ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,6 +201,7 @@ inline bool comBuf::push ( const epicsInt16 & value )
|
||||
static_cast < epicsUInt8 > ( value >> 8u );
|
||||
this->buf[this->nextWriteIndex++] =
|
||||
static_cast < epicsUInt8 > ( value >> 0u );
|
||||
return true;
|
||||
}
|
||||
|
||||
inline bool comBuf::push ( const epicsUInt16 & value )
|
||||
|
||||
+1
-2
@@ -1,4 +1,3 @@
|
||||
|
||||
/*
|
||||
* $Id$
|
||||
*
|
||||
@@ -33,7 +32,7 @@
|
||||
# define NETIO_PLACEMENT_DELETE
|
||||
#endif
|
||||
|
||||
class baseNMIU : public tsDLNode < baseNMIU >,
|
||||
class baseNMIU : public tsDLNode < baseNMIU >, // X aCC 655
|
||||
public chronIntIdRes < baseNMIU > {
|
||||
public:
|
||||
baseNMIU ( nciu &chan );
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
/* $Id$
|
||||
/*
|
||||
* $Id$
|
||||
*
|
||||
* L O S A L A M O S
|
||||
* Los Alamos National Laboratory
|
||||
@@ -27,7 +27,7 @@ netReadNotifyIO::~netReadNotifyIO ()
|
||||
{
|
||||
}
|
||||
|
||||
void netReadNotifyIO::show ( unsigned level ) const
|
||||
void netReadNotifyIO::show ( unsigned /* level */ ) const
|
||||
{
|
||||
::printf ( "read notify IO at %p\n",
|
||||
static_cast < const void * > ( this ) );
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
/* $Id$
|
||||
/*
|
||||
* $Id$
|
||||
*
|
||||
* L O S A L A M O S
|
||||
* Los Alamos National Laboratory
|
||||
@@ -49,7 +49,7 @@ class netSubscription * netSubscription::isSubscription ()
|
||||
return this;
|
||||
}
|
||||
|
||||
void netSubscription::show ( unsigned level ) const
|
||||
void netSubscription::show ( unsigned /* level */ ) const
|
||||
{
|
||||
::printf ( "event subscription IO at %p, type %s, element count %lu, mask %u\n",
|
||||
static_cast < const void * > ( this ),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
/* $Id$
|
||||
/*
|
||||
* $Id$
|
||||
*
|
||||
* L O S A L A M O S
|
||||
* Los Alamos National Laboratory
|
||||
@@ -27,7 +27,7 @@ netWriteNotifyIO::~netWriteNotifyIO ()
|
||||
{
|
||||
}
|
||||
|
||||
void netWriteNotifyIO::show ( unsigned level ) const
|
||||
void netWriteNotifyIO::show ( unsigned /* level */ ) const
|
||||
{
|
||||
::printf ( "read write notify IO at %p\n",
|
||||
static_cast < const void * > ( this ) );
|
||||
|
||||
+3
-3
@@ -528,9 +528,9 @@ bool udpiiu::noopAction ( epicsGuard < callbackMutex > &,
|
||||
return true;
|
||||
}
|
||||
|
||||
bool udpiiu::searchRespAction ( epicsGuard < callbackMutex > & cbLocker,
|
||||
const caHdr &msg, // X aCC 361
|
||||
const osiSockAddr &addr, const epicsTime ¤tTime )
|
||||
bool udpiiu::searchRespAction ( // X aCC 361
|
||||
epicsGuard < callbackMutex > & cbLocker, const caHdr &msg,
|
||||
const osiSockAddr &addr, const epicsTime ¤tTime )
|
||||
{
|
||||
osiSockAddr serverAddr;
|
||||
unsigned minorVersion;
|
||||
|
||||
Reference in New Issue
Block a user