merged remove-hpux-artifacts branch
This commit is contained in:
@@ -272,7 +272,6 @@
|
||||
cvsclean.pl Remove all .#* files in directory tree
|
||||
dos2unix.pl Converts text file from DOS CR/LF to unix ISO
|
||||
expandvars.pl Tool to expand @VAR@ variables while copying a file
|
||||
filterWarnings.pl Filters warning messages during HP builds
|
||||
fullpathName.pl Returns fullpath name of directory arg
|
||||
installEpics.pl Installs built files into install directories
|
||||
makeIncludeDbd.pl Creates *Include.dbd file from filename args files
|
||||
|
||||
@@ -284,7 +284,6 @@
|
||||
cvsclean.pl Remove all .#* files in directory tree
|
||||
dos2unix.pl Converts text file from DOS CR/LF to unix ISO
|
||||
expandvars.pl Tool to expand @VAR@ variables while copying a file
|
||||
filterWarnings.pl Filters warning messages during HP builds
|
||||
fullpathName.pl Returns fullpath name of directory arg
|
||||
installEpics.pl Installs built files into install directories
|
||||
makeIncludeDbd.pl Creates *Include.dbd file from filename args files
|
||||
|
||||
@@ -295,13 +295,6 @@ void CASG::exception (
|
||||
}
|
||||
}
|
||||
|
||||
void * CASG::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void CASG::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -433,7 +433,7 @@ chid epicsShareAPI ca_evid_to_chid ( evid pMon )
|
||||
}
|
||||
|
||||
// extern "C"
|
||||
int epicsShareAPI ca_pend ( ca_real timeout, int early ) // X aCC 361
|
||||
int epicsShareAPI ca_pend ( ca_real timeout, int early )
|
||||
{
|
||||
if ( early ) {
|
||||
return ca_pend_io ( timeout );
|
||||
@@ -516,7 +516,7 @@ int epicsShareAPI ca_flush_io ()
|
||||
/*
|
||||
* CA_TEST_IO ()
|
||||
*/
|
||||
int epicsShareAPI ca_test_io () // X aCC 361
|
||||
int epicsShareAPI ca_test_io ()
|
||||
{
|
||||
ca_client_context *pcac;
|
||||
int caStatus = fetchClientContext ( &pcac );
|
||||
@@ -551,7 +551,7 @@ void epicsShareAPI ca_signal ( long ca_status, const char *message )
|
||||
* (if they call this routine again).
|
||||
*/
|
||||
// extern "C"
|
||||
const char * epicsShareAPI ca_message ( long ca_status ) // X aCC 361
|
||||
const char * epicsShareAPI ca_message ( long ca_status )
|
||||
{
|
||||
unsigned msgNo = CA_EXTRACT_MSG_NO ( ca_status );
|
||||
|
||||
|
||||
@@ -332,13 +332,6 @@ void bhe::unregisterIIU (
|
||||
}
|
||||
}
|
||||
|
||||
void * bhe::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void bhe::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -87,7 +87,6 @@ private:
|
||||
const epicsTime & currentTime );
|
||||
bhe ( const bhe & );
|
||||
bhe & operator = ( const bhe & );
|
||||
void * operator new ( size_t size );
|
||||
epicsShareFunc void operator delete ( void * );
|
||||
};
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) :
|
||||
|
||||
{
|
||||
osiSockIoctl_t yes = true;
|
||||
int status = socket_ioctl ( this->sock, // X aCC 392
|
||||
int status = socket_ioctl ( this->sock,
|
||||
FIONBIO, & yes);
|
||||
if ( status < 0 ) {
|
||||
char sockErrBuf[64];
|
||||
@@ -126,7 +126,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) :
|
||||
memset ( (char *)&addr, 0 , sizeof ( addr ) );
|
||||
addr.ia.sin_family = AF_INET;
|
||||
addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
|
||||
addr.ia.sin_port = htons ( PORT_ANY ); // X aCC 818
|
||||
addr.ia.sin_port = htons ( PORT_ANY );
|
||||
int status = bind (this->sock, &addr.sa, sizeof (addr) );
|
||||
if ( status < 0 ) {
|
||||
char sockErrBuf[64];
|
||||
@@ -277,7 +277,7 @@ int ca_client_context :: printFormated (
|
||||
}
|
||||
|
||||
int ca_client_context :: varArgsPrintFormated (
|
||||
const char *pformat, va_list args ) const // X aCC 361
|
||||
const char *pformat, va_list args ) const
|
||||
{
|
||||
caPrintfFunc * pFunc;
|
||||
{
|
||||
|
||||
@@ -568,7 +568,7 @@ bool cac::findOrCreateVirtCircuit (
|
||||
}
|
||||
|
||||
void cac::transferChanToVirtCircuit (
|
||||
unsigned cid, unsigned sid, // X aCC 431
|
||||
unsigned cid, unsigned sid,
|
||||
ca_uint16_t typeCode, arrayElementCount count,
|
||||
unsigned minorVersionNumber, const osiSockAddr & addr,
|
||||
const epicsTime & currentTime )
|
||||
@@ -787,7 +787,7 @@ void cac::recycleSubscription (
|
||||
netSubscription & cac::subscriptionRequest (
|
||||
epicsGuard < epicsMutex > & guard,
|
||||
nciu & chan, privateInterfaceForIO & privChan,
|
||||
unsigned type, // X aCC 361
|
||||
unsigned type,
|
||||
arrayElementCount nElem, unsigned mask,
|
||||
cacStateNotify & notifyIn,
|
||||
bool chanIsInstalled )
|
||||
@@ -1021,7 +1021,7 @@ bool cac::readExcep ( callbackManager &, tcpiiu &,
|
||||
}
|
||||
|
||||
bool cac::writeExcep (
|
||||
callbackManager & mgr, // X aCC 431
|
||||
callbackManager & mgr,
|
||||
tcpiiu &, const caHdrLargeArray & hdr,
|
||||
const char * pCtx, unsigned status )
|
||||
{
|
||||
@@ -1093,7 +1093,7 @@ bool cac::exceptionRespAction ( callbackManager & cbMutexIn, tcpiiu & iiu,
|
||||
}
|
||||
|
||||
bool cac::accessRightsRespAction (
|
||||
callbackManager & mgr, tcpiiu &, // X aCC 431
|
||||
callbackManager & mgr, tcpiiu &,
|
||||
const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ )
|
||||
{
|
||||
epicsGuard < epicsMutex > guard ( this->mutex );
|
||||
@@ -1110,7 +1110,7 @@ bool cac::accessRightsRespAction (
|
||||
}
|
||||
|
||||
bool cac::createChannelRespAction (
|
||||
callbackManager & mgr, tcpiiu & iiu, // X aCC 431
|
||||
callbackManager & mgr, tcpiiu & iiu,
|
||||
const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ )
|
||||
{
|
||||
epicsGuard < epicsMutex > guard ( this->mutex );
|
||||
@@ -1157,7 +1157,7 @@ bool cac::verifyAndDisconnectChan (
|
||||
}
|
||||
|
||||
void cac::disconnectChannel (
|
||||
epicsGuard < epicsMutex > & cbGuard, // X aCC 431
|
||||
epicsGuard < epicsMutex > & cbGuard,
|
||||
epicsGuard < epicsMutex > & guard, nciu & chan )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
|
||||
@@ -55,7 +55,7 @@ class netSubscription;
|
||||
// used to control access to cac's recycle routines which
|
||||
// should only be indirectly invoked by CAC when its lock
|
||||
// is applied
|
||||
class cacRecycle { // X aCC 655
|
||||
class cacRecycle {
|
||||
public:
|
||||
virtual void recycleReadNotifyIO (
|
||||
epicsGuard < epicsMutex > &, netReadNotifyIO &io ) = 0;
|
||||
|
||||
@@ -69,7 +69,7 @@ typedef unsigned long arrayElementCount;
|
||||
|
||||
// 1) this should not be passing caerr.h status to the exception callback
|
||||
// 2) needless-to-say the data should be passed here using the new data access API
|
||||
class epicsShareClass cacWriteNotify { // X aCC 655
|
||||
class epicsShareClass cacWriteNotify {
|
||||
public:
|
||||
virtual ~cacWriteNotify () = 0;
|
||||
virtual void completion ( epicsGuard < epicsMutex > & ) = 0;
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
|
||||
// 1) this should not be passing caerr.h status to the exception callback
|
||||
// 2) needless-to-say the data should be passed here using the new data access API
|
||||
class epicsShareClass cacReadNotify { // X aCC 655
|
||||
class epicsShareClass cacReadNotify {
|
||||
public:
|
||||
virtual ~cacReadNotify () = 0;
|
||||
virtual void completion (
|
||||
@@ -97,7 +97,7 @@ public:
|
||||
|
||||
// 1) this should not be passing caerr.h status to the exception callback
|
||||
// 2) needless-to-say the data should be passed here using the new data access API
|
||||
class epicsShareClass cacStateNotify { // X aCC 655
|
||||
class epicsShareClass cacStateNotify {
|
||||
public:
|
||||
virtual ~cacStateNotify () = 0;
|
||||
virtual void current (
|
||||
@@ -131,7 +131,7 @@ private:
|
||||
bool f_operatorConfirmationRequest:1;
|
||||
};
|
||||
|
||||
class epicsShareClass cacChannelNotify { // X aCC 655
|
||||
class epicsShareClass cacChannelNotify {
|
||||
public:
|
||||
virtual ~cacChannelNotify () = 0;
|
||||
virtual void connectNotify ( epicsGuard < epicsMutex > & ) = 0;
|
||||
@@ -258,7 +258,7 @@ private:
|
||||
cacChannel & operator = ( const cacChannel & );
|
||||
};
|
||||
|
||||
class epicsShareClass cacContext { // X aCC 655
|
||||
class epicsShareClass cacContext {
|
||||
public:
|
||||
virtual ~cacContext ();
|
||||
virtual cacChannel & createChannel (
|
||||
@@ -277,7 +277,7 @@ public:
|
||||
epicsGuard < epicsMutex > &, unsigned level ) const = 0;
|
||||
};
|
||||
|
||||
class epicsShareClass cacContextNotify { // X aCC 655
|
||||
class epicsShareClass cacContextNotify {
|
||||
public:
|
||||
virtual ~cacContextNotify () = 0;
|
||||
virtual cacContext & createNetworkContext (
|
||||
@@ -297,7 +297,7 @@ public:
|
||||
// **** Lock Hierarchy ****
|
||||
// callbackControl must be taken before mutualExclusion if both are held at
|
||||
// the same time
|
||||
class epicsShareClass cacService { // X aCC 655
|
||||
class epicsShareClass cacService {
|
||||
public:
|
||||
virtual ~cacService () = 0;
|
||||
virtual cacContext & contextCreate (
|
||||
|
||||
@@ -131,7 +131,7 @@ int main ( int argc, char ** argv )
|
||||
}
|
||||
|
||||
osiSockIoctl_t yes = true;
|
||||
status = socket_ioctl ( sock, FIONBIO, &yes ); // X aCC 392
|
||||
status = socket_ioctl ( sock, FIONBIO, &yes );
|
||||
if ( status < 0 ) {
|
||||
char sockErrBuf[64];
|
||||
epicsSocketConvertErrnoToString (
|
||||
@@ -166,7 +166,7 @@ int main ( int argc, char ** argv )
|
||||
}
|
||||
|
||||
osiSockIoctl_t no = false;
|
||||
status = socket_ioctl ( sock, FIONBIO, &no ); // X aCC 392
|
||||
status = socket_ioctl ( sock, FIONBIO, &no );
|
||||
if ( status < 0 ) {
|
||||
char sockErrBuf[64];
|
||||
epicsSocketConvertErrnoToString (
|
||||
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
virtual void release ( void * ) = 0;
|
||||
};
|
||||
|
||||
class wireSendAdapter { // X aCC 655
|
||||
class wireSendAdapter {
|
||||
public:
|
||||
virtual unsigned sendBytes ( const void * pBuf,
|
||||
unsigned nBytesInBuf,
|
||||
@@ -65,7 +65,7 @@ struct statusWireIO {
|
||||
swioCircuitState circuitState;
|
||||
};
|
||||
|
||||
class wireRecvAdapter { // X aCC 655
|
||||
class wireRecvAdapter {
|
||||
public:
|
||||
virtual void recvBytes ( void * pBuf,
|
||||
unsigned nBytesInBuf, statusWireIO & ) = 0;
|
||||
@@ -114,7 +114,6 @@ private:
|
||||
unsigned nextWriteIndex;
|
||||
unsigned nextReadIndex;
|
||||
epicsUInt8 buf [ comBufSize ];
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
template < class T >
|
||||
bool push ( const T * ); // disabled
|
||||
|
||||
@@ -155,7 +155,7 @@ epicsUInt32 comQueRecv::multiBufferPopUInt32 ()
|
||||
unsigned byte3 = this->popUInt8();
|
||||
unsigned byte4 = this->popUInt8();
|
||||
tmp = static_cast <epicsUInt32>
|
||||
( ( byte1 << 24u ) | ( byte2 << 16u ) | //X aCC 392
|
||||
( ( byte1 << 24u ) | ( byte2 << 16u ) |
|
||||
( byte3 << 8u ) | byte4 );
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -368,7 +368,7 @@ void comQueSend::insertRequestWithPayLoad (
|
||||
// the above checks verify that the total size
|
||||
// is lest that 0xffffffff
|
||||
size = static_cast < ca_uint32_t >
|
||||
( dbr_size_n ( dataType, nElem ) ); // X aCC 392
|
||||
( dbr_size_n ( dataType, nElem ) );
|
||||
payloadSize = CA_MESSAGE_ALIGN ( size );
|
||||
this->insertRequestHeader ( request, payloadSize,
|
||||
static_cast <ca_uint16_t> ( dataType ),
|
||||
|
||||
@@ -65,7 +65,7 @@ void disconnectGovernorTimer::shutdown (
|
||||
}
|
||||
|
||||
epicsTimerNotify::expireStatus disconnectGovernorTimer::expire (
|
||||
const epicsTime & /* currentTime */ ) // X aCC 361
|
||||
const epicsTime & /* currentTime */ )
|
||||
{
|
||||
epicsGuard < epicsMutex > guard ( this->mutex );
|
||||
while ( nciu * pChan = chanList.get () ) {
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
#include "caProto.h"
|
||||
#include "netiiu.h"
|
||||
|
||||
class disconnectGovernorNotify { // X aCC 655
|
||||
class disconnectGovernorNotify {
|
||||
public:
|
||||
virtual ~disconnectGovernorNotify () = 0;
|
||||
virtual void govExpireNotify (
|
||||
|
||||
@@ -90,13 +90,6 @@ void getCallback::exception (
|
||||
}
|
||||
}
|
||||
|
||||
void * getCallback::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void getCallback::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -105,13 +105,6 @@ void getCopy::show ( unsigned level ) const
|
||||
}
|
||||
}
|
||||
|
||||
void * getCopy::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void getCopy::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -133,7 +133,7 @@ extern "C" void epicsShareAPI removeDuplicateAddresses
|
||||
|
||||
if ( pNode->addr.sa.sa_family == AF_INET ) {
|
||||
|
||||
pTmpNode = (osiSockAddrNode *) ellFirst (pDestList); // X aCC 749
|
||||
pTmpNode = (osiSockAddrNode *) ellFirst (pDestList);
|
||||
while ( pTmpNode ) {
|
||||
if (pTmpNode->addr.sa.sa_family == AF_INET) {
|
||||
if ( pNode->addr.ia.sin_addr.s_addr == pTmpNode->addr.ia.sin_addr.s_addr &&
|
||||
@@ -149,7 +149,7 @@ extern "C" void epicsShareAPI removeDuplicateAddresses
|
||||
break;
|
||||
}
|
||||
}
|
||||
pTmpNode = (osiSockAddrNode *) ellNext (&pTmpNode->node); // X aCC 749
|
||||
pTmpNode = (osiSockAddrNode *) ellNext (&pTmpNode->node);
|
||||
}
|
||||
if (pNode) {
|
||||
ellAdd (pDestList, &pNode->node);
|
||||
@@ -168,12 +168,12 @@ static void forcePort ( ELLLIST *pList, unsigned short port )
|
||||
{
|
||||
osiSockAddrNode *pNode;
|
||||
|
||||
pNode = ( osiSockAddrNode * ) ellFirst ( pList ); // X aCC 749
|
||||
pNode = ( osiSockAddrNode * ) ellFirst ( pList );
|
||||
while ( pNode ) {
|
||||
if ( pNode->addr.sa.sa_family == AF_INET ) {
|
||||
pNode->addr.ia.sin_port = htons ( port );
|
||||
}
|
||||
pNode = ( osiSockAddrNode * ) ellNext ( &pNode->node ); // X aCC 749
|
||||
pNode = ( osiSockAddrNode * ) ellNext ( &pNode->node );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -192,9 +192,9 @@ extern "C" void epicsShareAPI configureChannelAccessAddressList
|
||||
/*
|
||||
* dont load the list twice
|
||||
*/
|
||||
assert ( ellCount (pList) == 0 ); // X aCC 392
|
||||
assert ( ellCount (pList) == 0 );
|
||||
|
||||
ellInit ( &tmpList ); // X aCC 392
|
||||
ellInit ( &tmpList );
|
||||
|
||||
/*
|
||||
* Check to see if the user has disabled
|
||||
@@ -217,12 +217,12 @@ extern "C" void epicsShareAPI configureChannelAccessAddressList
|
||||
if (yes) {
|
||||
ELLLIST bcastList;
|
||||
osiSockAddr addr;
|
||||
ellInit ( &bcastList ); // X aCC 392
|
||||
ellInit ( &bcastList );
|
||||
addr.ia.sin_family = AF_UNSPEC;
|
||||
osiSockDiscoverBroadcastAddresses ( &bcastList, sock, &addr );
|
||||
forcePort ( &bcastList, port );
|
||||
removeDuplicateAddresses ( &tmpList, &bcastList, 1 );
|
||||
if ( ellCount ( &tmpList ) == 0 ) { // X aCC 392
|
||||
if ( ellCount ( &tmpList ) == 0 ) {
|
||||
osiSockAddrNode *pNewNode;
|
||||
pNewNode = (osiSockAddrNode *) calloc ( 1, sizeof (*pNewNode) );
|
||||
if ( pNewNode ) {
|
||||
@@ -254,11 +254,11 @@ extern "C" void epicsShareAPI printChannelAccessAddressList ( const ELLLIST *pLi
|
||||
osiSockAddrNode *pNode;
|
||||
|
||||
::printf ( "Channel Access Address List\n" );
|
||||
pNode = (osiSockAddrNode *) ellFirst ( pList ); // X aCC 749
|
||||
pNode = (osiSockAddrNode *) ellFirst ( pList );
|
||||
while (pNode) {
|
||||
char buf[64];
|
||||
ipAddrToA ( &pNode->addr.ia, buf, sizeof ( buf ) );
|
||||
::printf ( "%s\n", buf );
|
||||
pNode = (osiSockAddrNode *) ellNext ( &pNode->node ); // X aCC 749
|
||||
pNode = (osiSockAddrNode *) ellNext ( &pNode->node );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,13 +73,6 @@ void msgForMultiplyDefinedPV::operator delete ( void *pCadaver,
|
||||
}
|
||||
#endif
|
||||
|
||||
void * msgForMultiplyDefinedPV::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void msgForMultiplyDefinedPV::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
# define epicsExportSharedSymbols
|
||||
#endif
|
||||
|
||||
class callbackForMultiplyDefinedPV { // X aCC 655
|
||||
class callbackForMultiplyDefinedPV {
|
||||
public:
|
||||
virtual ~callbackForMultiplyDefinedPV () = 0;
|
||||
virtual void pvMultiplyDefinedNotify (
|
||||
@@ -64,7 +64,6 @@ private:
|
||||
void transactionComplete ( const char * pHostName );
|
||||
msgForMultiplyDefinedPV ( const msgForMultiplyDefinedPV & );
|
||||
msgForMultiplyDefinedPV & operator = ( const msgForMultiplyDefinedPV & );
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
|
||||
@@ -94,13 +94,6 @@ void nciu::destroy (
|
||||
this->cacCtx.destroyChannel ( guard, *this );
|
||||
}
|
||||
|
||||
void * nciu::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void nciu::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -121,7 +121,7 @@ private:
|
||||
friend class disconnectGovernorTimer;
|
||||
};
|
||||
|
||||
class privateInterfaceForIO { // X aCC 655
|
||||
class privateInterfaceForIO {
|
||||
public:
|
||||
virtual void ioCompletionNotify (
|
||||
epicsGuard < epicsMutex > &, class baseNMIU & ) = 0;
|
||||
@@ -270,7 +270,6 @@ private:
|
||||
epicsGuard < epicsMutex > & guard ) const throw ();
|
||||
nciu ( const nciu & );
|
||||
nciu & operator = ( const nciu & );
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
class privateInterfaceForIO;
|
||||
|
||||
class baseNMIU : public tsDLNode < baseNMIU >, // X aCC 655
|
||||
class baseNMIU : public tsDLNode < baseNMIU >,
|
||||
public chronIntIdRes < baseNMIU > {
|
||||
public:
|
||||
virtual void destroy (
|
||||
@@ -106,7 +106,6 @@ private:
|
||||
const unsigned mask;
|
||||
bool subscribed;
|
||||
class netSubscription * isSubscription ();
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
void * operator new ( size_t,
|
||||
tsFreeList < class netSubscription, 1024, epicsMutexNOOP > & );
|
||||
@@ -147,7 +146,6 @@ protected:
|
||||
private:
|
||||
cacReadNotify & notify;
|
||||
class privateInterfaceForIO & privateChanForIO;
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
void * operator new ( size_t,
|
||||
tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & );
|
||||
@@ -190,7 +188,6 @@ protected:
|
||||
private:
|
||||
cacWriteNotify & notify;
|
||||
privateInterfaceForIO & privateChanForIO;
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
void * operator new ( size_t,
|
||||
tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & );
|
||||
@@ -237,12 +234,12 @@ inline netSubscription * netSubscription::factory (
|
||||
class privateInterfaceForIO & chan, unsigned type, arrayElementCount count,
|
||||
unsigned mask, cacStateNotify ¬ify )
|
||||
{
|
||||
return new ( freeList ) netSubscription ( chan, type, // X aCC 930
|
||||
return new ( freeList ) netSubscription ( chan, type,
|
||||
count, mask, notify );
|
||||
}
|
||||
|
||||
inline arrayElementCount netSubscription::getCount (
|
||||
epicsGuard < epicsMutex > & guard, bool allow_zero ) const // X aCC 361
|
||||
epicsGuard < epicsMutex > & guard, bool allow_zero ) const
|
||||
{
|
||||
//guard.assertIdenticalMutex ( this->mutex );
|
||||
arrayElementCount nativeCount = this->privateChanForIO.nativeElementCount ( guard );
|
||||
@@ -268,7 +265,7 @@ inline netReadNotifyIO * netReadNotifyIO::factory (
|
||||
tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & freeList,
|
||||
privateInterfaceForIO & ioComplNotifIntf, cacReadNotify & notify )
|
||||
{
|
||||
return new ( freeList ) netReadNotifyIO ( ioComplNotifIntf, notify ); // X aCC 930
|
||||
return new ( freeList ) netReadNotifyIO ( ioComplNotifIntf, notify );
|
||||
}
|
||||
|
||||
inline void * netReadNotifyIO::operator new ( size_t size,
|
||||
@@ -289,7 +286,7 @@ inline netWriteNotifyIO * netWriteNotifyIO::factory (
|
||||
tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & freeList,
|
||||
privateInterfaceForIO & ioComplNotifyIntf, cacWriteNotify & notify )
|
||||
{
|
||||
return new ( freeList ) netWriteNotifyIO ( ioComplNotifyIntf, notify ); // X aCC 930
|
||||
return new ( freeList ) netWriteNotifyIO ( ioComplNotifyIntf, notify );
|
||||
}
|
||||
|
||||
inline void * netWriteNotifyIO::operator new ( size_t size,
|
||||
|
||||
@@ -119,13 +119,6 @@ void netReadNotifyIO::forceSubscriptionUpdate (
|
||||
{
|
||||
}
|
||||
|
||||
void * netReadNotifyIO::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void netReadNotifyIO::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -170,13 +170,6 @@ void netSubscription::forceSubscriptionUpdate (
|
||||
guard, chan, *this );
|
||||
}
|
||||
|
||||
void * netSubscription::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void netSubscription::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -117,14 +117,6 @@ void netWriteNotifyIO::forceSubscriptionUpdate (
|
||||
{
|
||||
}
|
||||
|
||||
void * netWriteNotifyIO::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error (
|
||||
"why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void netWriteNotifyIO::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -35,7 +35,7 @@ union osiSockAddr;
|
||||
class cac;
|
||||
class nciu;
|
||||
|
||||
class netiiu { // X aCC 655
|
||||
class netiiu {
|
||||
public:
|
||||
virtual ~netiiu () = 0;
|
||||
virtual unsigned getHostName (
|
||||
|
||||
@@ -162,7 +162,6 @@ private:
|
||||
unsigned type, arrayElementCount count );
|
||||
oldChannelNotify ( const oldChannelNotify & );
|
||||
oldChannelNotify & operator = ( const oldChannelNotify & );
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
@@ -195,7 +194,6 @@ private:
|
||||
const char *pContext, unsigned type, arrayElementCount count );
|
||||
getCopy ( const getCopy & );
|
||||
getCopy & operator = ( const getCopy & );
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
@@ -221,7 +219,6 @@ private:
|
||||
const char * pContext, unsigned type, arrayElementCount count );
|
||||
getCallback ( const getCallback & );
|
||||
getCallback & operator = ( const getCallback & );
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
@@ -245,7 +242,6 @@ private:
|
||||
unsigned type, arrayElementCount count );
|
||||
putCallback ( const putCallback & );
|
||||
putCallback & operator = ( const putCallback & );
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
@@ -278,7 +274,6 @@ private:
|
||||
const char *pContext, unsigned type, arrayElementCount count );
|
||||
oldSubscription ( const oldSubscription & );
|
||||
oldSubscription & operator = ( const oldSubscription & );
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
|
||||
@@ -159,13 +159,6 @@ void oldChannelNotify::writeException (
|
||||
__FILE__, __LINE__, *this, type, count, CA_OP_PUT );
|
||||
}
|
||||
|
||||
void * oldChannelNotify::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void oldChannelNotify::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
@@ -638,7 +631,7 @@ arrayElementCount epicsShareAPI ca_element_count ( chid pChan )
|
||||
/*
|
||||
* ca_state ()
|
||||
*/
|
||||
enum channel_state epicsShareAPI ca_state ( chid pChan ) // X aCC 361
|
||||
enum channel_state epicsShareAPI ca_state ( chid pChan )
|
||||
{
|
||||
epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
|
||||
if ( pChan->io.connected ( guard ) ) {
|
||||
|
||||
@@ -90,13 +90,6 @@ void putCallback::exception (
|
||||
}
|
||||
}
|
||||
|
||||
void * putCallback::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void putCallback::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -178,7 +178,7 @@ bool repeaterClient::connect ()
|
||||
return true;
|
||||
}
|
||||
|
||||
bool repeaterClient::sendConfirm () // X aCC 361
|
||||
bool repeaterClient::sendConfirm ()
|
||||
{
|
||||
int status;
|
||||
|
||||
@@ -204,7 +204,7 @@ bool repeaterClient::sendConfirm () // X aCC 361
|
||||
}
|
||||
}
|
||||
|
||||
bool repeaterClient::sendMessage ( const void *pBuf, unsigned bufSize ) // X aCC 361
|
||||
bool repeaterClient::sendMessage ( const void *pBuf, unsigned bufSize )
|
||||
{
|
||||
int status;
|
||||
|
||||
@@ -245,13 +245,6 @@ repeaterClient::~repeaterClient ()
|
||||
#endif
|
||||
}
|
||||
|
||||
void * repeaterClient::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void repeaterClient::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
@@ -304,7 +297,7 @@ inline bool repeaterClient::identicalPort ( const osiSockAddr &fromIn )
|
||||
return false;
|
||||
}
|
||||
|
||||
bool repeaterClient::verify () // X aCC 361
|
||||
bool repeaterClient::verify ()
|
||||
{
|
||||
SOCKET tmpSock;
|
||||
bool success = makeSocket ( this->port (), false, & tmpSock );
|
||||
|
||||
@@ -64,7 +64,6 @@ private:
|
||||
osiSockAddr from;
|
||||
SOCKET sock;
|
||||
unsigned short port () const;
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ void repeaterSubscribeTimer::shutdown (
|
||||
}
|
||||
|
||||
epicsTimerNotify::expireStatus repeaterSubscribeTimer::
|
||||
expire ( const epicsTime & /* currentTime */ ) // X aCC 361
|
||||
expire ( const epicsTime & /* currentTime */ )
|
||||
{
|
||||
static const unsigned nTriesToMsg = 50;
|
||||
if ( this->attempts > nTriesToMsg && ! this->once ) {
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
class epicsMutex;
|
||||
class cacContextNotify;
|
||||
|
||||
class repeaterTimerNotify { // X aCC 655
|
||||
class repeaterTimerNotify {
|
||||
public:
|
||||
virtual ~repeaterTimerNotify () = 0;
|
||||
virtual void repeaterRegistrationMessage (
|
||||
|
||||
@@ -124,7 +124,7 @@ void searchTimer::moveChannels (
|
||||
// searchTimer::expire ()
|
||||
//
|
||||
epicsTimerNotify::expireStatus searchTimer::expire (
|
||||
const epicsTime & currentTime ) // X aCC 361
|
||||
const epicsTime & currentTime )
|
||||
{
|
||||
epicsGuard < epicsMutex > guard ( this->mutex );
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
#include "caProto.h"
|
||||
#include "netiiu.h"
|
||||
|
||||
class searchTimerNotify { // X aCC 655
|
||||
class searchTimerNotify {
|
||||
public:
|
||||
virtual ~searchTimerNotify () = 0;
|
||||
virtual void boostChannel (
|
||||
|
||||
@@ -49,7 +49,7 @@ static const unsigned CASG_MAGIC = 0xFAB4CAFE;
|
||||
// used to control access to CASG's recycle routines which
|
||||
// should only be indirectly invoked by CASG when its lock
|
||||
// is applied
|
||||
class casgRecycle { // X aCC 655
|
||||
class casgRecycle {
|
||||
public:
|
||||
virtual void recycleSyncGroupWriteNotify (
|
||||
epicsGuard < epicsMutex > &, class syncGroupWriteNotify & io ) = 0;
|
||||
@@ -104,7 +104,6 @@ private:
|
||||
cacChannel::ioid id;
|
||||
bool idIsValid;
|
||||
bool ioComplete;
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
void * operator new ( size_t,
|
||||
tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & );
|
||||
@@ -145,7 +144,6 @@ private:
|
||||
cacChannel::ioid id;
|
||||
bool idIsValid;
|
||||
bool ioComplete;
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
void * operator new ( size_t,
|
||||
tsFreeList < class syncGroupWriteNotify, 128, epicsMutexNOOP > & );
|
||||
@@ -215,7 +213,6 @@ private:
|
||||
CASG ( const CASG & );
|
||||
CASG & operator = ( const CASG & );
|
||||
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
|
||||
~CASG ();
|
||||
|
||||
@@ -58,7 +58,7 @@ syncGroupReadNotify * syncGroupReadNotify::factory (
|
||||
tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & freeList,
|
||||
struct CASG & sg, chid chan, void * pValueIn )
|
||||
{
|
||||
return new ( freeList ) // X aCC 930
|
||||
return new ( freeList )
|
||||
syncGroupReadNotify ( sg, chan, pValueIn );
|
||||
}
|
||||
|
||||
@@ -122,13 +122,6 @@ void syncGroupReadNotify::show (
|
||||
}
|
||||
}
|
||||
|
||||
void * syncGroupReadNotify::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void syncGroupReadNotify::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -112,13 +112,6 @@ void syncGroupWriteNotify::show (
|
||||
}
|
||||
}
|
||||
|
||||
void * syncGroupWriteNotify::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void syncGroupWriteNotify::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
/*
|
||||
* ca_sg_create()
|
||||
*/
|
||||
extern "C" int epicsShareAPI ca_sg_create ( CA_SYNC_GID * pgid ) // X aCC 361
|
||||
extern "C" int epicsShareAPI ca_sg_create ( CA_SYNC_GID * pgid )
|
||||
{
|
||||
ca_client_context * pcac;
|
||||
int caStatus;
|
||||
@@ -143,7 +143,7 @@ extern "C" int epicsShareAPI ca_sg_stat ( const CA_SYNC_GID gid )
|
||||
/*
|
||||
* ca_sg_test
|
||||
*/
|
||||
extern "C" int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid ) // X aCC 361
|
||||
extern "C" int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid )
|
||||
{
|
||||
ca_client_context * pcac;
|
||||
int caStatus = fetchClientContext ( &pcac );
|
||||
|
||||
@@ -45,7 +45,7 @@ tcpRecvWatchdog::~tcpRecvWatchdog ()
|
||||
}
|
||||
|
||||
epicsTimerNotify::expireStatus
|
||||
tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ ) // X aCC 361
|
||||
tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ )
|
||||
{
|
||||
epicsGuard < epicsMutex > guard ( this->mutex );
|
||||
if ( this->shuttingDown ) {
|
||||
|
||||
@@ -1135,7 +1135,7 @@ void tcpiiu::show ( unsigned level ) const
|
||||
}
|
||||
}
|
||||
|
||||
bool tcpiiu::setEchoRequestPending ( epicsGuard < epicsMutex > & guard ) // X aCC 361
|
||||
bool tcpiiu::setEchoRequestPending ( epicsGuard < epicsMutex > & guard )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
|
||||
@@ -1275,12 +1275,9 @@ bool tcpiiu::processIncoming (
|
||||
this->msgHeaderAvailable = false;
|
||||
this->curDataBytes = 0u;
|
||||
}
|
||||
# if defined ( __HP_aCC ) && _HP_aCC <= 033300
|
||||
return false; // to make hpux compiler happy...
|
||||
# endif
|
||||
}
|
||||
|
||||
void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431
|
||||
void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
|
||||
@@ -1310,7 +1307,7 @@ void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 4
|
||||
/*
|
||||
* tcpiiu::userNameSetRequest ()
|
||||
*/
|
||||
void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431
|
||||
void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
|
||||
@@ -1338,7 +1335,7 @@ void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 4
|
||||
}
|
||||
|
||||
void tcpiiu::disableFlowControlRequest (
|
||||
epicsGuard < epicsMutex > & guard ) // X aCC 431
|
||||
epicsGuard < epicsMutex > & guard )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
|
||||
@@ -1354,7 +1351,7 @@ void tcpiiu::disableFlowControlRequest (
|
||||
}
|
||||
|
||||
void tcpiiu::enableFlowControlRequest (
|
||||
epicsGuard < epicsMutex > & guard ) // X aCC 431
|
||||
epicsGuard < epicsMutex > & guard )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
|
||||
@@ -1369,7 +1366,7 @@ void tcpiiu::enableFlowControlRequest (
|
||||
minder.commit ();
|
||||
}
|
||||
|
||||
void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard,
|
||||
const cacChannel::priLev & priority )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
@@ -1389,7 +1386,7 @@ void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
minder.commit ();
|
||||
}
|
||||
|
||||
void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431
|
||||
void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
|
||||
@@ -1410,7 +1407,7 @@ void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431
|
||||
minder.commit ();
|
||||
}
|
||||
|
||||
void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard,
|
||||
nciu &chan, unsigned type, arrayElementCount nElem, const void *pValue )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
@@ -1425,7 +1422,7 @@ void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
}
|
||||
|
||||
|
||||
void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard,
|
||||
nciu &chan, netWriteNotifyIO &io, unsigned type,
|
||||
arrayElementCount nElem, const void *pValue )
|
||||
{
|
||||
@@ -1444,7 +1441,7 @@ void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 43
|
||||
minder.commit ();
|
||||
}
|
||||
|
||||
void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard,
|
||||
nciu & chan, netReadNotifyIO & io,
|
||||
unsigned dataType, arrayElementCount nElem )
|
||||
{
|
||||
@@ -1477,7 +1474,7 @@ void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
}
|
||||
|
||||
void tcpiiu::createChannelRequest (
|
||||
nciu & chan, epicsGuard < epicsMutex > & guard ) // X aCC 431
|
||||
nciu & chan, epicsGuard < epicsMutex > & guard )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
|
||||
@@ -1525,7 +1522,7 @@ void tcpiiu::createChannelRequest (
|
||||
minder.commit ();
|
||||
}
|
||||
|
||||
void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard,
|
||||
ca_uint32_t sid, ca_uint32_t cid )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
@@ -1547,7 +1544,7 @@ void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard, // X aCC 4
|
||||
// is to try again the next time that we reconnect
|
||||
//
|
||||
void tcpiiu::subscriptionRequest (
|
||||
epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
epicsGuard < epicsMutex > & guard,
|
||||
nciu & chan, netSubscription & subscr )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
@@ -1599,7 +1596,7 @@ void tcpiiu::subscriptionRequest (
|
||||
// is to try again the next time that we reconnect
|
||||
//
|
||||
void tcpiiu::subscriptionUpdateRequest (
|
||||
epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
epicsGuard < epicsMutex > & guard,
|
||||
nciu & chan, netSubscription & subscr )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
@@ -1634,7 +1631,7 @@ void tcpiiu::subscriptionUpdateRequest (
|
||||
minder.commit ();
|
||||
}
|
||||
|
||||
void tcpiiu::subscriptionCancelRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431
|
||||
void tcpiiu::subscriptionCancelRequest ( epicsGuard < epicsMutex > & guard,
|
||||
nciu & chan, netSubscription & subscr )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
@@ -2052,7 +2049,7 @@ bool tcpiiu::bytesArePendingInOS () const
|
||||
return false;
|
||||
#else
|
||||
osiSockIoctl_t bytesPending = 0; /* shut up purifys yapping */
|
||||
int status = socket_ioctl ( this->sock, // X aCC 392
|
||||
int status = socket_ioctl ( this->sock,
|
||||
FIONREAD, & bytesPending );
|
||||
if ( status >= 0 ) {
|
||||
if ( bytesPending > 0 ) {
|
||||
|
||||
@@ -78,7 +78,7 @@ extern "C" void epicsShareAPI ca_dump_dbr (
|
||||
dbr_short_t *pvalue = (dbr_short_t *)pbuffer;
|
||||
for (i = 0; i < count; i++,pvalue++){
|
||||
if(count!=1 && (i%10 == 0)) printf("\n");
|
||||
printf("%d ",* (short *)pvalue); // X aCC 392
|
||||
printf("%d ",* (short *)pvalue);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -96,7 +96,7 @@ extern "C" void epicsShareAPI ca_dump_dbr (
|
||||
dbr_float_t *pvalue = (dbr_float_t *)pbuffer;
|
||||
for (i = 0; i < count; i++,pvalue++){
|
||||
if(count!=1 && (i%10 == 0)) printf("\n");
|
||||
printf("%6.4f ",*(float *)pvalue); // X aCC 392
|
||||
printf("%6.4f ",*(float *)pvalue);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -201,7 +201,7 @@ udpiiu::udpiiu (
|
||||
memset ( (char *)&addr, 0 , sizeof (addr) );
|
||||
addr.ia.sin_family = AF_INET;
|
||||
addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
|
||||
addr.ia.sin_port = htons ( PORT_ANY ); // X aCC 818
|
||||
addr.ia.sin_port = htons ( PORT_ANY );
|
||||
status = bind (this->sock, &addr.sa, sizeof (addr) );
|
||||
if ( status < 0 ) {
|
||||
char sockErrBuf[64];
|
||||
@@ -471,7 +471,7 @@ void epicsShareAPI caRepeaterRegistrationMessage (
|
||||
}
|
||||
|
||||
memset ( (char *) &msg, 0, sizeof (msg) );
|
||||
AlignedWireRef < epicsUInt16 > ( msg.m_cmmd ) = REPEATER_REGISTER; // X aCC 818
|
||||
AlignedWireRef < epicsUInt16 > ( msg.m_cmmd ) = REPEATER_REGISTER;
|
||||
msg.m_available = saddr.ia.sin_addr.s_addr;
|
||||
|
||||
/*
|
||||
|
||||
@@ -335,7 +335,6 @@ private:
|
||||
|
||||
tcpiiu ( const tcpiiu & );
|
||||
tcpiiu & operator = ( const tcpiiu & );
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
@@ -372,7 +371,7 @@ inline bool tcpiiu::ca_v49_ok (
|
||||
}
|
||||
|
||||
inline bool tcpiiu::alive (
|
||||
epicsGuard < epicsMutex > & ) const // X aCC 361
|
||||
epicsGuard < epicsMutex > & ) const
|
||||
{
|
||||
return ( this->state == iiucs_connecting ||
|
||||
this->state == iiucs_connected );
|
||||
|
||||
@@ -114,15 +114,15 @@ inline void aitFromNetOrder32(aitUint32* dest,aitUint32* src)
|
||||
inline void aitToNetOrder64(aitUint64* dest, aitUint64* src)
|
||||
{
|
||||
aitUint32 ait_temp_var_;
|
||||
ait_temp_var_=(aitUint32)htonl(src[1]); // X aCC 392
|
||||
dest[1]=(aitUint32)htonl(src[0]); // X aCC 392
|
||||
ait_temp_var_=(aitUint32)htonl(src[1]);
|
||||
dest[1]=(aitUint32)htonl(src[0]);
|
||||
dest[0]=ait_temp_var_;
|
||||
}
|
||||
inline void aitFromNetOrder64(aitUint64* dest, aitUint64* src)
|
||||
{
|
||||
aitUint32 ait_temp_var_;
|
||||
ait_temp_var_=(aitUint32)ntohl(src[1]); // X aCC 392
|
||||
dest[1]=(aitUint32)ntohl(src[0]); // X aCC 392
|
||||
ait_temp_var_=(aitUint32)ntohl(src[1]);
|
||||
dest[1]=(aitUint32)ntohl(src[0]);
|
||||
dest[0]=ait_temp_var_;
|
||||
}
|
||||
|
||||
|
||||
@@ -61,21 +61,6 @@ gddApplicationTypeTable::gddApplicationTypeTable(aitUint32 tot)
|
||||
GenerateTypes();
|
||||
}
|
||||
|
||||
#if 0
|
||||
void* operator new(size_t x)
|
||||
{
|
||||
void* v = (void*)malloc(x);
|
||||
fprintf(stderr,"%8.8x In operator new %d\n",v,(int)x);
|
||||
return v;
|
||||
}
|
||||
|
||||
void operator delete(void* x)
|
||||
{
|
||||
fprintf(stderr,"%8.8x In operator delete\n",x);
|
||||
free((char*)x);
|
||||
}
|
||||
#endif
|
||||
|
||||
gddApplicationTypeTable::~gddApplicationTypeTable(void)
|
||||
{
|
||||
unsigned i,j;
|
||||
|
||||
@@ -79,12 +79,12 @@ inline int gdd::isLocalDataFormat(void) const { return !(flags&GDD_NET_MASK); }
|
||||
inline int gdd::isNetworkDataFormat(void) const
|
||||
{ return !isLocalDataFormat() || aitLocalNetworkDataFormatSame; }
|
||||
|
||||
inline void gdd::markConstant(void) { flags|=GDD_CONSTANT_MASK; } // X aCC 818
|
||||
inline void gdd::markFlat(void) { flags|=GDD_FLAT_MASK; } // X aCC 818
|
||||
inline void gdd::markManaged(void) { flags|=GDD_MANAGED_MASK; } // X aCC 818
|
||||
inline void gdd::markUnmanaged(void) { flags&=~GDD_MANAGED_MASK; } // X aCC 818
|
||||
inline void gdd::markLocalDataFormat(void) { flags&=~GDD_NET_MASK; } // X aCC 818
|
||||
inline void gdd::markNotLocalDataFormat(void) { flags|=GDD_NET_MASK; } // X aCC 818
|
||||
inline void gdd::markConstant(void) { flags|=GDD_CONSTANT_MASK; }
|
||||
inline void gdd::markFlat(void) { flags|=GDD_FLAT_MASK; }
|
||||
inline void gdd::markManaged(void) { flags|=GDD_MANAGED_MASK; }
|
||||
inline void gdd::markUnmanaged(void) { flags&=~GDD_MANAGED_MASK; }
|
||||
inline void gdd::markLocalDataFormat(void) { flags&=~GDD_NET_MASK; }
|
||||
inline void gdd::markNotLocalDataFormat(void) { flags|=GDD_NET_MASK; }
|
||||
|
||||
inline void gdd::getTimeStamp(struct timespec* const ts) const { time_stamp.get(*ts); }
|
||||
inline void gdd::setTimeStamp(const struct timespec* const ts) { time_stamp=*ts; }
|
||||
@@ -132,7 +132,7 @@ inline gddStatus gdd::noReferencing(void)
|
||||
gddAutoPrint("gdd::noReferencing()",gddErrorNotAllowed);
|
||||
rc=gddErrorNotAllowed;
|
||||
}
|
||||
else flags|=GDD_NOREF_MASK; // X aCC 818
|
||||
else flags|=GDD_NOREF_MASK;
|
||||
return rc;
|
||||
}
|
||||
inline gddStatus gdd::reference(void) const
|
||||
@@ -148,7 +148,7 @@ inline gddStatus gdd::reference(void) const
|
||||
rc = gddErrorNotAllowed;
|
||||
}
|
||||
else if ( this->ref_cnt < 0xffffffff ) {
|
||||
this->ref_cnt++; // X aCC 818
|
||||
this->ref_cnt++;
|
||||
}
|
||||
else {
|
||||
fprintf(stderr,"gdd reference count overflow!!\n");
|
||||
@@ -399,10 +399,10 @@ inline void gdd::get(aitInt8* d) const
|
||||
if(primitiveType()==aitEnumString && dim==0)
|
||||
{
|
||||
aitString* str = (aitString*)dataAddress();
|
||||
strcpy((char*)d,str->string()); // X aCC 392
|
||||
strcpy((char*)d,str->string());
|
||||
}
|
||||
else if(primitiveType()==aitEnumFixedString && dim==0)
|
||||
strcpy((char*)d,data.FString->fixed_string); // X aCC 392
|
||||
strcpy((char*)d,data.FString->fixed_string);
|
||||
else
|
||||
aitConvert(aitEnumInt8,d,primitiveType(),dataPointer(),
|
||||
getDataSizeElements());
|
||||
|
||||
@@ -30,7 +30,7 @@ inline aitIndex gddBounds::first(void) const { return start; }
|
||||
|
||||
inline gddDestructor::gddDestructor(void) { ref_cnt=0; arg=NULL; }
|
||||
inline gddDestructor::gddDestructor(void* usr_arg) { ref_cnt=0; arg=usr_arg; }
|
||||
inline void gddDestructor::reference(void) { ref_cnt++; } // X aCC 818
|
||||
inline void gddDestructor::reference(void) { ref_cnt++; }
|
||||
inline int gddDestructor::refCount(void) const { return ref_cnt; }
|
||||
|
||||
#endif
|
||||
|
||||
@@ -157,13 +157,13 @@ inline T & smartGDDPointerTemplate < T > :: operator * () const
|
||||
}
|
||||
|
||||
template < class T >
|
||||
inline bool smartGDDPointerTemplate < T > :: operator ! () const // X aCC 361
|
||||
inline bool smartGDDPointerTemplate < T > :: operator ! () const
|
||||
{
|
||||
return this->pValue ? false : true;
|
||||
}
|
||||
|
||||
template < class T >
|
||||
inline bool smartGDDPointerTemplate < T > :: valid () const // X aCC 361
|
||||
inline bool smartGDDPointerTemplate < T > :: valid () const
|
||||
{
|
||||
return this->pValue ? true : false;
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@ private:
|
||||
// for this breaking out into a seperate class
|
||||
// from pvInfo)
|
||||
//
|
||||
class pvEntry // X aCC 655
|
||||
class pvEntry
|
||||
: public stringId, public tsSLNode<pvEntry> {
|
||||
public:
|
||||
pvEntry (const pvInfo &infoIn, directoryServer &casIn,
|
||||
|
||||
@@ -206,7 +206,4 @@ static int parseDirectoryFP (FILE *pf, const char *pFileName)
|
||||
}
|
||||
nPV++;
|
||||
}
|
||||
#if defined ( __HP_aCC ) && ( _HP_aCC <= 033300 )
|
||||
return 0; // Make HP compiler happy
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ bool caNetAddr::isValid () const
|
||||
return this->type != casnaUDF;
|
||||
}
|
||||
|
||||
bool caNetAddr::operator == (const caNetAddr &rhs) const // X aCC 361
|
||||
bool caNetAddr::operator == (const caNetAddr &rhs) const
|
||||
{
|
||||
if ( this->type != rhs.type ) {
|
||||
return false;
|
||||
|
||||
@@ -65,7 +65,7 @@ pvAttachReturn caServer::pvAttach ( const casCtx &ctx, const char *pAliasName )
|
||||
return this->createPV ( ctx, pAliasName );
|
||||
}
|
||||
|
||||
casEventMask caServer::registerEvent (const char *pName) // X aCC 361
|
||||
casEventMask caServer::registerEvent (const char *pName)
|
||||
{
|
||||
if (this->pCAS) {
|
||||
return this->pCAS->registerEvent(pName);
|
||||
@@ -97,7 +97,7 @@ void caServer::setDebugLevel (unsigned level)
|
||||
}
|
||||
}
|
||||
|
||||
unsigned caServer::getDebugLevel () const // X aCC 361
|
||||
unsigned caServer::getDebugLevel () const
|
||||
{
|
||||
if (pCAS) {
|
||||
return this->pCAS->getDebugLevel();
|
||||
@@ -108,7 +108,7 @@ unsigned caServer::getDebugLevel () const // X aCC 361
|
||||
}
|
||||
}
|
||||
|
||||
casEventMask caServer::valueEventMask () const // X aCC 361
|
||||
casEventMask caServer::valueEventMask () const
|
||||
{
|
||||
if (pCAS) {
|
||||
return this->pCAS->valueEventMask();
|
||||
@@ -119,7 +119,7 @@ casEventMask caServer::valueEventMask () const // X aCC 361
|
||||
}
|
||||
}
|
||||
|
||||
casEventMask caServer::logEventMask () const // X aCC 361
|
||||
casEventMask caServer::logEventMask () const
|
||||
{
|
||||
if (pCAS) {
|
||||
return this->pCAS->logEventMask();
|
||||
@@ -130,7 +130,7 @@ casEventMask caServer::logEventMask () const // X aCC 361
|
||||
}
|
||||
}
|
||||
|
||||
casEventMask caServer::alarmEventMask () const // X aCC 361
|
||||
casEventMask caServer::alarmEventMask () const
|
||||
{
|
||||
if ( pCAS ) {
|
||||
return this->pCAS->alarmEventMask ();
|
||||
@@ -146,7 +146,7 @@ class epicsTimer & caServer::createTimer ()
|
||||
return fileDescriptorManager.createTimer ();
|
||||
}
|
||||
|
||||
unsigned caServer::subscriptionEventsProcessed () const // X aCC 361
|
||||
unsigned caServer::subscriptionEventsProcessed () const
|
||||
{
|
||||
if ( pCAS ) {
|
||||
return this->pCAS->subscriptionEventsProcessed ();
|
||||
@@ -156,7 +156,7 @@ unsigned caServer::subscriptionEventsProcessed () const // X aCC 361
|
||||
}
|
||||
}
|
||||
|
||||
unsigned caServer::subscriptionEventsPosted () const // X aCC 361
|
||||
unsigned caServer::subscriptionEventsPosted () const
|
||||
{
|
||||
if ( pCAS ) {
|
||||
return this->pCAS->subscriptionEventsPosted ();
|
||||
|
||||
@@ -37,7 +37,7 @@ void casChannel::destroyRequest ()
|
||||
this->destroy ();
|
||||
}
|
||||
|
||||
casPV * casChannel::getPV () // X aCC 361
|
||||
casPV * casChannel::getPV ()
|
||||
{
|
||||
if ( this->pChanI ) {
|
||||
casPVI & pvi = this->pChanI->getPVI ();
|
||||
|
||||
@@ -448,7 +448,7 @@ outBufClient::flushCondition casDGClient::xSend ( char *pBufIn,
|
||||
//
|
||||
// casDGClient::xRecv ()
|
||||
//
|
||||
inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRecv, // X aCC 361
|
||||
inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRecv,
|
||||
fillParameter parm, bufSizeT &nByesRecv)
|
||||
{
|
||||
const char *pAfter = pBufIn + nBytesToRecv;
|
||||
|
||||
@@ -57,13 +57,6 @@ void casMonEvent::operator delete ( void * pCadaver,
|
||||
}
|
||||
#endif
|
||||
|
||||
void * casMonEvent::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void casMonEvent::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -49,7 +49,6 @@ public:
|
||||
private:
|
||||
class casMonitor & monitor;
|
||||
smartConstGDDPointer pValue;
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
caStatus cbFunc (
|
||||
casCoreClient &,
|
||||
|
||||
@@ -77,7 +77,7 @@ void casMonitor::installNewEventLog (
|
||||
this->overFlowEvent.swapValues ( *pLog );
|
||||
eventLogQue.insertAfter ( *pLog, this->overFlowEvent );
|
||||
assert ( this->nPend != UCHAR_MAX );
|
||||
this->nPend++; // X aCC 818
|
||||
this->nPend++;
|
||||
}
|
||||
else {
|
||||
// replace the old OVF value with the current one
|
||||
@@ -97,7 +97,7 @@ void casMonitor::installNewEventLog (
|
||||
}
|
||||
pLog->assign ( event );
|
||||
assert ( this->nPend != UCHAR_MAX );
|
||||
this->nPend++; // X aCC 818
|
||||
this->nPend++;
|
||||
}
|
||||
eventLogQue.add ( *pLog );
|
||||
}
|
||||
@@ -117,7 +117,7 @@ caStatus casMonitor::executeEvent ( casCoreClient & client,
|
||||
|
||||
client.getCAS().incrEventsProcessedCounter ();
|
||||
assert ( this->nPend != 0u );
|
||||
this->nPend--; // X aCC 818
|
||||
this->nPend--;
|
||||
|
||||
// delete event object if it isnt a cache entry
|
||||
// saved in the call back object
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
class casMonitor;
|
||||
class casClientMutex;
|
||||
|
||||
class casMonitorCallbackInterface { // X aCC 655
|
||||
class casMonitorCallbackInterface {
|
||||
public:
|
||||
virtual caStatus casMonitorCallBack (
|
||||
epicsGuard < casClientMutex > &, casMonitor &,
|
||||
@@ -87,7 +87,6 @@ private:
|
||||
unsigned char nPend;
|
||||
bool destroyPending;
|
||||
bool ovf;
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
casMonitor ( const casMonitor & );
|
||||
casMonitor & operator = ( const casMonitor & );
|
||||
|
||||
@@ -317,7 +317,7 @@ casMonitor * casPVI::removeMonitor (
|
||||
return pMon;
|
||||
}
|
||||
|
||||
caServer *casPVI::getExtServer () const // X aCC 361
|
||||
caServer *casPVI::getExtServer () const
|
||||
{
|
||||
epicsGuard < epicsMutex > guard ( this->mutex );
|
||||
if ( this->pCAS ) {
|
||||
@@ -415,7 +415,7 @@ void casPVI::uninstallIO (
|
||||
this->ioBlockedList::signal();
|
||||
}
|
||||
|
||||
caStatus casPVI::bestDBRType ( unsigned & dbrType ) // X aCC 361
|
||||
caStatus casPVI::bestDBRType ( unsigned & dbrType )
|
||||
{
|
||||
epicsGuard < epicsMutex > guard ( this->mutex );
|
||||
aitEnum bestAIT = this->bestExternalType ();
|
||||
|
||||
@@ -1629,7 +1629,7 @@ caStatus casStrmClient::createChanResponse (
|
||||
if ( ! pvar.getPV()->pPVI ) {
|
||||
// @#$!* Tornado 2 Cygnus GNU compiler bugs
|
||||
# if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 )
|
||||
pvar.getPV()->pPVI = new ( std::nothrow ) // X aCC 930
|
||||
pvar.getPV()->pPVI = new ( std::nothrow )
|
||||
casPVI ( *pvar.getPV() );
|
||||
# else
|
||||
try {
|
||||
@@ -1678,7 +1678,7 @@ caStatus casStrmClient::createChanResponse (
|
||||
if ( ! pChan->pChanI ) {
|
||||
// @#$!* Tornado 2 Cygnus GNU compiler bugs
|
||||
# if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 )
|
||||
pChan->pChanI = new ( std::nothrow ) // X aCC 930
|
||||
pChan->pChanI = new ( std::nothrow )
|
||||
casChannelI ( * this, *pChan,
|
||||
* pvar.getPV()->pPVI, hdr.m_cid );
|
||||
# else
|
||||
@@ -1848,7 +1848,7 @@ caStatus casStrmClient::privateCreateChanResponse (
|
||||
assert ( hdr.m_cid == chan.getCID() );
|
||||
status = this->out.copyInHeader ( CA_PROTO_CREATE_CHAN, 0,
|
||||
static_cast <ca_uint16_t> ( nativeTypeDBR ),
|
||||
static_cast <ca_uint32_t> ( nativeCount ), // X aCC 392
|
||||
static_cast <ca_uint32_t> ( nativeCount ),
|
||||
chan.getCID(), chan.getSID(), 0 );
|
||||
if ( status != S_cas_success ) {
|
||||
this->out.popCtx ( outctx );
|
||||
@@ -2150,7 +2150,7 @@ void casStrmClient::casChannelDestroyFromInterfaceNotify (
|
||||
}
|
||||
|
||||
class channelDestroyEvent * pEvent =
|
||||
new ( std::nothrow ) class channelDestroyEvent ( // X aCC 930
|
||||
new ( std::nothrow ) class channelDestroyEvent (
|
||||
immediateUninstallNeeded ? & chan : 0,
|
||||
chan.getSID() );
|
||||
if ( pEvent ) {
|
||||
|
||||
@@ -113,7 +113,7 @@ class casPVI;
|
||||
class casCtx;
|
||||
class casChannel;
|
||||
|
||||
class epicsShareClass pvExistReturn { // X aCC 361
|
||||
class epicsShareClass pvExistReturn {
|
||||
public:
|
||||
// most server tools will use this
|
||||
pvExistReturn ( pvExistReturnEnum s = pverDoesNotExistHere );
|
||||
|
||||
@@ -41,7 +41,7 @@ class casPVI;
|
||||
class casEventMask;
|
||||
class gdd;
|
||||
|
||||
class casChannelDestroyFromPV { // X aCC 655
|
||||
class casChannelDestroyFromPV {
|
||||
public:
|
||||
virtual void postDestroyEvent () = 0;
|
||||
protected:
|
||||
|
||||
@@ -117,7 +117,7 @@ inBufClient::fillCondition inBuf::fill ( inBufClient::fillParameter parm )
|
||||
//
|
||||
// inBuf::pushCtx ()
|
||||
//
|
||||
const inBufCtx inBuf::pushCtx ( bufSizeT headerSize, // X aCC 361
|
||||
const inBufCtx inBuf::pushCtx ( bufSizeT headerSize,
|
||||
bufSizeT bodySize )
|
||||
{
|
||||
if ( headerSize + bodySize > ( this->bytesInBuffer - this->nextReadIndex ) ||
|
||||
@@ -140,7 +140,7 @@ const inBufCtx inBuf::pushCtx ( bufSizeT headerSize, // X aCC 361
|
||||
//
|
||||
// inBuf::popCtx ()
|
||||
//
|
||||
bufSizeT inBuf::popCtx ( const inBufCtx &ctx ) // X aCC 361
|
||||
bufSizeT inBuf::popCtx ( const inBufCtx &ctx )
|
||||
{
|
||||
if ( ctx.stat==inBufCtx::pushCtxSuccess ) {
|
||||
bufSizeT bytesRemoved = this->nextReadIndex;
|
||||
|
||||
@@ -44,7 +44,7 @@ private:
|
||||
bufSizeT nextReadIndex;
|
||||
};
|
||||
|
||||
class inBufClient { // X aCC 655
|
||||
class inBufClient {
|
||||
public:
|
||||
enum fillCondition { casFillNone, casFillProgress,
|
||||
casFillDisconnect };
|
||||
|
||||
@@ -265,7 +265,7 @@ outBufClient::flushCondition outBuf :: flush ()
|
||||
//
|
||||
// outBuf::pushCtx ()
|
||||
//
|
||||
const outBufCtx outBuf::pushCtx ( bufSizeT headerSize, // X aCC 361
|
||||
const outBufCtx outBuf::pushCtx ( bufSizeT headerSize,
|
||||
bufSizeT maxBodySize,
|
||||
void *&pHeader )
|
||||
{
|
||||
@@ -292,7 +292,7 @@ const outBufCtx outBuf::pushCtx ( bufSizeT headerSize, // X aCC 361
|
||||
//
|
||||
// outBuf::popCtx ()
|
||||
//
|
||||
bufSizeT outBuf::popCtx (const outBufCtx &ctx) // X aCC 361
|
||||
bufSizeT outBuf::popCtx (const outBufCtx &ctx)
|
||||
{
|
||||
if (ctx.stat==outBufCtx::pushCtxSuccess) {
|
||||
bufSizeT bytesAdded = this->stack;
|
||||
|
||||
@@ -45,7 +45,7 @@ private:
|
||||
bufSizeT stack;
|
||||
};
|
||||
|
||||
class outBufClient { // X aCC 655
|
||||
class outBufClient {
|
||||
public:
|
||||
enum flushCondition {
|
||||
flushNone = 0,
|
||||
|
||||
@@ -167,7 +167,7 @@ void caServerIO::show (unsigned /* level */) const
|
||||
//
|
||||
// getToken()
|
||||
//
|
||||
static char *getToken(const char **ppString, // X aCC 361
|
||||
static char *getToken(const char **ppString,
|
||||
char *pBuf, unsigned bufSIze)
|
||||
{
|
||||
const char *pToken;
|
||||
|
||||
@@ -297,7 +297,7 @@ void casDGIntfIO::xSetNonBlocking()
|
||||
{
|
||||
osiSockIoctl_t yes = true;
|
||||
|
||||
int status = socket_ioctl ( this->sock, FIONBIO, &yes ); // X aCC 392
|
||||
int status = socket_ioctl ( this->sock, FIONBIO, &yes );
|
||||
if ( status < 0 ) {
|
||||
char sockErrBuf[64];
|
||||
epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
|
||||
@@ -307,7 +307,7 @@ void casDGIntfIO::xSetNonBlocking()
|
||||
|
||||
if ( this->bcastRecvSock != INVALID_SOCKET ) {
|
||||
yes = true;
|
||||
int status = socket_ioctl ( this->bcastRecvSock, // X aCC 392
|
||||
int status = socket_ioctl ( this->bcastRecvSock,
|
||||
FIONBIO, &yes );
|
||||
if ( status < 0 ) {
|
||||
char sockErrBuf[64];
|
||||
@@ -319,7 +319,7 @@ void casDGIntfIO::xSetNonBlocking()
|
||||
}
|
||||
|
||||
inBufClient::fillCondition
|
||||
casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size, // X aCC 361
|
||||
casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size,
|
||||
fillParameter parm, bufSizeT & actualSize, caNetAddr & fromOut )
|
||||
{
|
||||
int status;
|
||||
@@ -366,7 +366,7 @@ casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size, // X aCC 361
|
||||
}
|
||||
|
||||
outBufClient::flushCondition
|
||||
casDGIntfIO::osdSend ( const char * pBufIn, bufSizeT size, // X aCC 361
|
||||
casDGIntfIO::osdSend ( const char * pBufIn, bufSizeT size,
|
||||
const caNetAddr & to )
|
||||
{
|
||||
int status;
|
||||
|
||||
@@ -198,7 +198,7 @@ void casIntfIO::setNonBlocking()
|
||||
int status;
|
||||
osiSockIoctl_t yes = true;
|
||||
|
||||
status = socket_ioctl(this->sock, FIONBIO, &yes); // X aCC 392
|
||||
status = socket_ioctl(this->sock, FIONBIO, &yes);
|
||||
if ( status < 0 ) {
|
||||
char sockErrBuf[64];
|
||||
epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
|
||||
|
||||
@@ -168,7 +168,7 @@ outBufClient::flushCondition casStreamIO::osdSend ( const char *pInBuf, bufSizeT
|
||||
|
||||
// casStreamIO::osdRecv()
|
||||
inBufClient::fillCondition
|
||||
casStreamIO::osdRecv ( char * pInBuf, bufSizeT nBytes, // X aCC 361
|
||||
casStreamIO::osdRecv ( char * pInBuf, bufSizeT nBytes,
|
||||
bufSizeT & nBytesActual )
|
||||
{
|
||||
int nchars;
|
||||
@@ -250,7 +250,7 @@ void casStreamIO::xSetNonBlocking()
|
||||
int status;
|
||||
osiSockIoctl_t yes = true;
|
||||
|
||||
status = socket_ioctl(this->sock, FIONBIO, &yes); // X aCC 392
|
||||
status = socket_ioctl(this->sock, FIONBIO, &yes);
|
||||
if (status>=0) {
|
||||
this->blockingFlag = xIsntBlocking;
|
||||
}
|
||||
|
||||
@@ -67,13 +67,6 @@ void ipIgnoreEntry::operator delete ( void * pCadaver,
|
||||
}
|
||||
#endif
|
||||
|
||||
void * ipIgnoreEntry::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void ipIgnoreEntry::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -44,7 +44,6 @@ private:
|
||||
unsigned ipAddr;
|
||||
ipIgnoreEntry ( const ipIgnoreEntry & );
|
||||
ipIgnoreEntry & operator = ( const ipIgnoreEntry & );
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ class dbChannelIO;
|
||||
class dbPutNotifyBlocker;
|
||||
class dbSubscriptionIO;
|
||||
|
||||
class dbBaseIO // X aCC 655
|
||||
class dbBaseIO
|
||||
: public chronIntIdRes < dbBaseIO > {
|
||||
public:
|
||||
virtual dbSubscriptionIO * isSubscription () = 0;
|
||||
@@ -110,7 +110,6 @@ private:
|
||||
dbSubscriptionIO ( const dbSubscriptionIO & );
|
||||
dbSubscriptionIO & operator = ( const dbSubscriptionIO & );
|
||||
virtual ~dbSubscriptionIO ();
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
|
||||
@@ -204,13 +204,6 @@ void * dbChannelIO::operator new ( size_t size,
|
||||
return freeList.allocate ( size );
|
||||
}
|
||||
|
||||
void * dbChannelIO::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
#ifdef CXX_PLACEMENT_DELETE
|
||||
void dbChannelIO::operator delete ( void *pCadaver,
|
||||
tsFreeList < dbChannelIO, 256, epicsMutexNOOP > & freeList )
|
||||
|
||||
@@ -111,7 +111,6 @@ private:
|
||||
epicsGuard < epicsMutex > & ) const;
|
||||
dbChannelIO ( const dbChannelIO & );
|
||||
dbChannelIO & operator = ( const dbChannelIO & );
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ dbContext::~dbContext ()
|
||||
}
|
||||
}
|
||||
|
||||
cacChannel & dbContext::createChannel ( // X aCC 361
|
||||
cacChannel & dbContext::createChannel (
|
||||
epicsGuard < epicsMutex > & guard, const char * pName,
|
||||
cacChannelNotify & notifyIn, cacChannel::priLev priority )
|
||||
{
|
||||
|
||||
@@ -212,13 +212,6 @@ void * dbPutNotifyBlocker::operator new ( size_t size,
|
||||
return freeList.allocate ( size );
|
||||
}
|
||||
|
||||
void * dbPutNotifyBlocker::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
#ifdef CXX_PLACEMENT_DELETE
|
||||
void dbPutNotifyBlocker::operator delete ( void *pCadaver,
|
||||
tsFreeList < dbPutNotifyBlocker, 64, epicsMutexNOOP > & freeList )
|
||||
|
||||
@@ -82,7 +82,6 @@ private:
|
||||
dbPutNotifyBlocker ( const dbPutNotifyBlocker & );
|
||||
dbPutNotifyBlocker & operator = ( const dbPutNotifyBlocker & );
|
||||
virtual ~dbPutNotifyBlocker ();
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
};
|
||||
|
||||
|
||||
@@ -94,13 +94,6 @@ void dbSubscriptionIO::channelDeleteException (
|
||||
this->chan.pName(guard), this->type, this->count );
|
||||
}
|
||||
|
||||
void * dbSubscriptionIO::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void dbSubscriptionIO::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -296,7 +296,7 @@ inline unsigned resTable<T,ID>::resTableBitMask ( const unsigned nBits )
|
||||
// remove a res from the resTable
|
||||
//
|
||||
template <class T, class ID>
|
||||
T * resTable<T,ID>::remove ( const ID & idIn ) // X aCC 361
|
||||
T * resTable<T,ID>::remove ( const ID & idIn )
|
||||
{
|
||||
if ( this->pTable ) {
|
||||
// search list for idIn and remove the first match
|
||||
@@ -341,7 +341,7 @@ void resTable<T,ID>::removeAll ( tsSLList<T> & destination )
|
||||
// resTable::lookup ()
|
||||
//
|
||||
template <class T, class ID>
|
||||
inline T * resTable<T,ID>::lookup ( const ID & idIn ) const // X aCC 361
|
||||
inline T * resTable<T,ID>::lookup ( const ID & idIn ) const
|
||||
{
|
||||
if ( this->pTable ) {
|
||||
tsSLList<T> & list = this->pTable [ this->hash ( idIn ) ];
|
||||
@@ -514,7 +514,7 @@ inline unsigned resTable<T,ID>::numEntriesInstalled () const
|
||||
}
|
||||
|
||||
template <class T, class ID>
|
||||
inline unsigned resTable<T,ID>::tableSize () const // X aCC 361
|
||||
inline unsigned resTable<T,ID>::tableSize () const
|
||||
{
|
||||
if ( this->pTable ) {
|
||||
return ( this->hashIxMask + 1 ) + this->nextSplitIndex;
|
||||
@@ -1010,7 +1010,7 @@ intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::intId (const T &idIn)
|
||||
// intId::operator == ()
|
||||
//
|
||||
template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
|
||||
inline bool intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::operator == // X aCC 361
|
||||
inline bool intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::operator ==
|
||||
(const intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH> &idIn) const
|
||||
{
|
||||
return this->id == idIn.id;
|
||||
@@ -1020,7 +1020,7 @@ inline bool intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::operator == // X aCC 361
|
||||
// intId::getId ()
|
||||
//
|
||||
template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
|
||||
inline const T intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::getId () const // X aCC 361
|
||||
inline const T intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::getId () const
|
||||
{
|
||||
return this->id;
|
||||
}
|
||||
@@ -1067,7 +1067,7 @@ inline resTableIndex integerHash ( unsigned MIN_INDEX_WIDTH,
|
||||
// intId::hash()
|
||||
//
|
||||
template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
|
||||
inline resTableIndex intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::hash () const // X aCC 361
|
||||
inline resTableIndex intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::hash () const
|
||||
{
|
||||
return integerHash ( MIN_INDEX_WIDTH, MAX_ID_WIDTH, this->id );
|
||||
}
|
||||
|
||||
@@ -228,7 +228,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_timeout (fdctx *pfdctx,
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback ( // X aCC 361
|
||||
extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback (
|
||||
fdctx *pfdctx, SOCKET fd, enum fdi_type fdi, pCallBackFDMgr pFunc, void *pParam)
|
||||
{
|
||||
oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
|
||||
@@ -270,7 +270,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback ( // X aCC 361
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback ( // X aCC 361
|
||||
extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback (
|
||||
fdctx *pfdctx, SOCKET fd, enum fdi_type fdi)
|
||||
{
|
||||
oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
|
||||
|
||||
@@ -61,7 +61,6 @@ private:
|
||||
bool pending;
|
||||
void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & );
|
||||
void release ();
|
||||
void * operator new ( size_t );
|
||||
void operator delete ( void * );
|
||||
friend class ipAddrToAsciiEnginePrivate;
|
||||
ipAddrToAsciiTransactionPrivate & operator = ( const ipAddrToAsciiTransactionPrivate & );
|
||||
@@ -272,13 +271,6 @@ inline void ipAddrToAsciiTransactionPrivate::operator delete ( void * pTrans, ts
|
||||
}
|
||||
#endif
|
||||
|
||||
void * ipAddrToAsciiTransactionPrivate::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void ipAddrToAsciiTransactionPrivate::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -36,7 +36,7 @@ public:
|
||||
virtual ~ipAddrToAsciiCallBack () = 0;
|
||||
};
|
||||
|
||||
class epicsShareClass ipAddrToAsciiTransaction { // X aCC 655
|
||||
class epicsShareClass ipAddrToAsciiTransaction {
|
||||
public:
|
||||
virtual void release () = 0;
|
||||
virtual void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & ) = 0;
|
||||
@@ -46,7 +46,7 @@ protected:
|
||||
virtual ~ipAddrToAsciiTransaction () = 0;
|
||||
};
|
||||
|
||||
class epicsShareClass ipAddrToAsciiEngine { // X aCC 655
|
||||
class epicsShareClass ipAddrToAsciiEngine {
|
||||
public:
|
||||
virtual void release () = 0;
|
||||
virtual ipAddrToAsciiTransaction & createTransaction () = 0;
|
||||
|
||||
@@ -239,7 +239,7 @@ void epicsMutex::lock ()
|
||||
}
|
||||
}
|
||||
|
||||
bool epicsMutex::tryLock () // X aCC 361
|
||||
bool epicsMutex::tryLock ()
|
||||
{
|
||||
epicsMutexLockStatus status = epicsMutexTryLock ( this->id );
|
||||
if ( status == epicsMutexLockOK ) {
|
||||
|
||||
@@ -60,7 +60,7 @@ static int timeRegister(void)
|
||||
static int done = timeRegister();
|
||||
|
||||
|
||||
int epicsTime_gmtime ( const time_t *pAnsiTime, // X aCC 361
|
||||
int epicsTime_gmtime ( const time_t *pAnsiTime,
|
||||
struct tm *pTM )
|
||||
{
|
||||
struct tm * pRet = gmtime_r ( pAnsiTime, pTM );
|
||||
@@ -72,7 +72,7 @@ int epicsTime_gmtime ( const time_t *pAnsiTime, // X aCC 361
|
||||
}
|
||||
}
|
||||
|
||||
int epicsTime_localtime ( const time_t *clock, // X aCC 361
|
||||
int epicsTime_localtime ( const time_t *clock,
|
||||
struct tm *result )
|
||||
{
|
||||
struct tm * pRet = localtime_r ( clock, result );
|
||||
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
virtual void show ( unsigned int level ) const;
|
||||
};
|
||||
|
||||
class epicsShareClass epicsTimer { /* X aCC 655 */
|
||||
class epicsShareClass epicsTimer {
|
||||
public:
|
||||
/* calls cancel (see warning below) and then destroys the timer */
|
||||
virtual void destroy () = 0;
|
||||
@@ -70,7 +70,7 @@ protected:
|
||||
virtual ~epicsTimer () = 0; /* protected => delete() must not be called */
|
||||
};
|
||||
|
||||
class epicsTimerQueue { /* X aCC 655 */
|
||||
class epicsTimerQueue {
|
||||
public:
|
||||
virtual epicsTimer & createTimer () = 0;
|
||||
virtual void show ( unsigned int level ) const = 0;
|
||||
@@ -78,7 +78,7 @@ protected:
|
||||
epicsShareFunc virtual ~epicsTimerQueue () = 0;
|
||||
};
|
||||
|
||||
class epicsTimerQueueActive /* X aCC 655 */
|
||||
class epicsTimerQueueActive
|
||||
: public epicsTimerQueue {
|
||||
public:
|
||||
static epicsShareFunc epicsTimerQueueActive & allocate (
|
||||
@@ -88,7 +88,7 @@ protected:
|
||||
epicsShareFunc virtual ~epicsTimerQueueActive () = 0;
|
||||
};
|
||||
|
||||
class epicsTimerQueueNotify { /* X aCC 655 */
|
||||
class epicsTimerQueueNotify {
|
||||
public:
|
||||
/* called when a new timer is inserted into the queue and the */
|
||||
/* delay to the next expire has changed */
|
||||
@@ -100,7 +100,7 @@ protected:
|
||||
epicsShareFunc virtual ~epicsTimerQueueNotify () = 0;
|
||||
};
|
||||
|
||||
class epicsTimerQueuePassive /* X aCC 655 */
|
||||
class epicsTimerQueuePassive
|
||||
: public epicsTimerQueue {
|
||||
public:
|
||||
static epicsShareFunc epicsTimerQueuePassive & create ( epicsTimerQueueNotify & );
|
||||
|
||||
@@ -221,13 +221,6 @@ void timer::show ( unsigned int level ) const
|
||||
}
|
||||
}
|
||||
|
||||
void * timer::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void timer::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
@@ -239,13 +232,6 @@ void timer::operator delete ( void * )
|
||||
__FILE__, __LINE__ );
|
||||
}
|
||||
|
||||
void * epicsTimerForC::operator new ( size_t ) // X aCC 361
|
||||
{
|
||||
// The HPUX compiler seems to require this even though no code
|
||||
// calls it directly
|
||||
throw std::logic_error ( "why is the compiler calling private operator new" );
|
||||
}
|
||||
|
||||
void epicsTimerForC::operator delete ( void * )
|
||||
{
|
||||
// Visual C++ .net appears to require operator delete if
|
||||
|
||||
@@ -60,7 +60,6 @@ private:
|
||||
// because if I declare placement new and delete, but
|
||||
// comment out the placement delete definition there are
|
||||
// no undefined symbols.
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
friend class timerQueue;
|
||||
};
|
||||
@@ -83,7 +82,6 @@ private:
|
||||
// because if I declare placement new and delete, but
|
||||
// comment out the placement delete definition there are
|
||||
// no undefined symbols.
|
||||
void * operator new ( size_t size );
|
||||
void operator delete ( void * );
|
||||
friend class timerQueue;
|
||||
};
|
||||
@@ -118,7 +116,7 @@ private:
|
||||
friend struct epicsTimerForC;
|
||||
};
|
||||
|
||||
class timerQueueActiveMgrPrivate { // X aCC 655
|
||||
class timerQueueActiveMgrPrivate {
|
||||
public:
|
||||
timerQueueActiveMgrPrivate ();
|
||||
protected:
|
||||
|
||||
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
softIoc_registerRecordDeviceDriver(pdbbase);
|
||||
registryFunctionAdd("exit", (REGISTRYFUNCTION) exitSubroutine); // X aCC 331
|
||||
registryFunctionAdd("exit", (REGISTRYFUNCTION) exitSubroutine);
|
||||
|
||||
while (argc>1 && **argv == '-') {
|
||||
switch ((*argv)[1]) {
|
||||
|
||||
@@ -107,7 +107,7 @@ caStatus exPV::update ( const gdd & valueIn )
|
||||
// exScanTimer::expire ()
|
||||
//
|
||||
epicsTimerNotify::expireStatus
|
||||
exPV::expire ( const epicsTime & /*currentTime*/ ) // X aCC 361
|
||||
exPV::expire ( const epicsTime & /*currentTime*/ )
|
||||
{
|
||||
this->scan();
|
||||
if ( this->scanOn && this->getScanPeriod() > 0.0 ) {
|
||||
|
||||
@@ -167,7 +167,7 @@ pvExistReturn exServer::pvExistTest
|
||||
//
|
||||
// exServer::pvExistTest()
|
||||
//
|
||||
pvExistReturn exServer::pvExistTest // X aCC 361
|
||||
pvExistReturn exServer::pvExistTest
|
||||
( const casCtx& ctxIn, const char * pPVName )
|
||||
{
|
||||
//
|
||||
@@ -214,7 +214,7 @@ pvExistReturn exServer::pvExistTest // X aCC 361
|
||||
//
|
||||
// exServer::pvAttach()
|
||||
//
|
||||
pvAttachReturn exServer::pvAttach // X aCC 361
|
||||
pvAttachReturn exServer::pvAttach
|
||||
(const casCtx &ctx, const char *pName)
|
||||
{
|
||||
//
|
||||
|
||||
@@ -103,7 +103,7 @@ private:
|
||||
// for this breaking out into a seperate class
|
||||
// from pvInfo)
|
||||
//
|
||||
class pvEntry // X aCC 655
|
||||
class pvEntry
|
||||
: public stringId, public tsSLNode < pvEntry > {
|
||||
public:
|
||||
pvEntry ( pvInfo &infoIn, exServer & casIn,
|
||||
|
||||
@@ -45,7 +45,7 @@ unsigned exVectorPV::maxDimension() const
|
||||
//
|
||||
// exVectorPV::maxBound()
|
||||
//
|
||||
aitIndex exVectorPV::maxBound (unsigned dimension) const // X aCC 361
|
||||
aitIndex exVectorPV::maxBound (unsigned dimension) const
|
||||
{
|
||||
if (dimension==0u) {
|
||||
return this->info.getElementCount();
|
||||
|
||||
@@ -36,7 +36,6 @@ PERL_SCRIPTS += convertRelease.pl
|
||||
PERL_SCRIPTS += cvsclean.pl
|
||||
PERL_SCRIPTS += dos2unix.pl
|
||||
PERL_SCRIPTS += expandVars.pl
|
||||
PERL_SCRIPTS += filterWarnings.pl
|
||||
PERL_SCRIPTS += fullPathName.pl
|
||||
PERL_SCRIPTS += installEpics.pl
|
||||
PERL_SCRIPTS += makeDbDepends.pl
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
|
||||
if $running_under_some_shell; # filterWarnings.pl
|
||||
#*************************************************************************
|
||||
# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
|
||||
# National Laboratory.
|
||||
# Copyright (c) 2002 The Regents of the University of California, as
|
||||
# Operator of Los Alamos National Laboratory.
|
||||
# Copyright (c) 2002 Berliner Elektronenspeicherringgesellschaft fuer
|
||||
# Synchrotronstrahlung.
|
||||
# EPICS BASE Versions 3.13.7
|
||||
# and higher are distributed subject to a Software License Agreement found
|
||||
# in file LICENSE that is included with this distribution.
|
||||
#*************************************************************************
|
||||
|
||||
# $Revision-Id$
|
||||
#
|
||||
# Author: Ralph Lange
|
||||
#
|
||||
|
||||
use Text::Wrap;
|
||||
|
||||
my ($errline, $errno, $codeline, $pointline);
|
||||
|
||||
$Text::Wrap::columns = $ENV{COLUMNS} if $ENV{COLUMNS};
|
||||
|
||||
sub Usage
|
||||
{
|
||||
print "Usage:\n";
|
||||
print "<compile line> 2>&1 | $0\n";
|
||||
|
||||
exit 2;
|
||||
}
|
||||
|
||||
# Invalid whit space filter on solaris not implemented
|
||||
#if ( $ENV{"EPICS_HOST_ARCH"} =~ m/solaris-sparc/ ) {
|
||||
# while ( $errline = <> ) {
|
||||
# if ( $errline !~ m/invalid white space character in directive/ ) {
|
||||
# print $errline;
|
||||
# }
|
||||
# }
|
||||
#} else {
|
||||
while ( $errline = <> ) {
|
||||
if ( $errline =~ m/^(Warning|Error)/ ) {
|
||||
($errno) = ($errline =~ m/.* ([0-9]+):/);
|
||||
$codeline = <>;
|
||||
$pointline = <>;
|
||||
next if $codeline =~ m|/[/*]\s*X.*aCC[^a-zA-Z]*$errno|;
|
||||
|
||||
print wrap ("", " ", $errline);
|
||||
print $codeline;
|
||||
print $pointline;
|
||||
}
|
||||
}
|
||||
#}
|
||||
Reference in New Issue
Block a user