various gnu compiler dialect issue fixes
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
#include "iocinf.h"
|
||||
#include "oldAccess.h"
|
||||
|
||||
tsFreeList < struct CASG > CASG::freeList;
|
||||
tsFreeList < struct CASG, 128 > CASG::freeList;
|
||||
|
||||
CASG::CASG (cac &cacIn) :
|
||||
client (cacIn), magic (CASG_MAGIC), opPendCount (0u), seqNo (0u)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "iocinf.h"
|
||||
|
||||
tsFreeList < class bhe > bhe::freeList;
|
||||
tsFreeList < class bhe, 1024 > bhe::freeList;
|
||||
|
||||
/*
|
||||
* update beacon period
|
||||
|
||||
@@ -3,4 +3,5 @@ enum appendNumberFlag {appendNumber, dontAppendNumber};
|
||||
|
||||
int catime (char *channelName, enum appendNumberFlag appNF);
|
||||
|
||||
int acctst (char *pname);
|
||||
int acctst (char *pname);
|
||||
|
||||
|
||||
@@ -723,7 +723,7 @@ epicsShareFunc void epicsShareAPI ca_signal_formated (long ca_status, const char
|
||||
*/
|
||||
epicsShareFunc const char * epicsShareAPI ca_host_name (chid channel);
|
||||
/* thread safe version */
|
||||
const void epicsShareAPI ca_get_host_name ( chid pChan, char *pBuf, unsigned bufLength );
|
||||
epicsShareFunc void epicsShareAPI ca_get_host_name ( chid pChan, char *pBuf, unsigned bufLength );
|
||||
|
||||
/*
|
||||
* CA_ADD_FD_REGISTRATION
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "iocinf.h"
|
||||
#include "oldAccess.h"
|
||||
|
||||
tsFreeList < class getCallback > getCallback::freeList;
|
||||
tsFreeList < class getCallback, 1024 > getCallback::freeList;
|
||||
|
||||
getCallback::getCallback (oldChannel &chanIn, caEventCallBackFunc *pFuncIn, void *pPrivateIn) :
|
||||
chan (chanIn), pFunc (pFuncIn), pPrivate (pPrivateIn)
|
||||
@@ -66,4 +66,4 @@ void * getCallback::operator new ( size_t size )
|
||||
void getCallback::operator delete ( void *pCadaver, size_t size )
|
||||
{
|
||||
getCallback::freeList.release ( pCadaver, size );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ private:
|
||||
unsigned short typeCode;
|
||||
unsigned f_connected:1;
|
||||
unsigned f_fullyConstructed:1;
|
||||
static tsFreeList < class nciu > freeList;
|
||||
static tsFreeList < class nciu, 1024 > freeList;
|
||||
~nciu (); // force pool allocation
|
||||
int nciu::issuePut ( ca_uint16_t cmd, unsigned id, chtype type,
|
||||
unsigned long count, const void *pvalue );
|
||||
@@ -267,7 +267,7 @@ private:
|
||||
unsigned long count;
|
||||
unsigned short mask;
|
||||
~netSubscription ();
|
||||
static tsFreeList < class netSubscription > freeList;
|
||||
static tsFreeList < class netSubscription, 1024 > freeList;
|
||||
};
|
||||
|
||||
class netReadCopyIO : public baseNMIU {
|
||||
@@ -288,7 +288,7 @@ private:
|
||||
void *pValue;
|
||||
unsigned seqNumber;
|
||||
~netReadCopyIO (); // must be allocated from pool
|
||||
static tsFreeList < class netReadCopyIO > freeList;
|
||||
static tsFreeList < class netReadCopyIO, 1024 > freeList;
|
||||
};
|
||||
|
||||
class netReadNotifyIO : public cacNotifyIO, public baseNMIU {
|
||||
@@ -304,7 +304,7 @@ public:
|
||||
static void operator delete ( void *pCadaver, size_t size );
|
||||
private:
|
||||
~netReadNotifyIO ();
|
||||
static tsFreeList < class netReadNotifyIO > freeList;
|
||||
static tsFreeList < class netReadNotifyIO, 1024 > freeList;
|
||||
};
|
||||
|
||||
class netWriteNotifyIO : public cacNotifyIO, public baseNMIU {
|
||||
@@ -320,7 +320,7 @@ public:
|
||||
static void operator delete ( void *pCadaver, size_t size );
|
||||
private:
|
||||
~netWriteNotifyIO ();
|
||||
static tsFreeList < class netWriteNotifyIO > freeList;
|
||||
static tsFreeList < class netWriteNotifyIO, 1024 > freeList;
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -621,7 +621,7 @@ private:
|
||||
osiTime timeStamp;
|
||||
double averagePeriod;
|
||||
|
||||
static tsFreeList < class bhe > freeList;
|
||||
static tsFreeList < class bhe, 1024 > freeList;
|
||||
~bhe (); // force allocation from freeList
|
||||
};
|
||||
|
||||
@@ -679,7 +679,7 @@ private:
|
||||
void *pValue;
|
||||
unsigned long seqNo;
|
||||
|
||||
static tsFreeList < class syncGroupNotify > freeList;
|
||||
static tsFreeList < class syncGroupNotify, 1024 > freeList;
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -709,7 +709,7 @@ private:
|
||||
osiMutex mutex;
|
||||
tsDLList <syncGroupNotify> ioList;
|
||||
|
||||
static tsFreeList < struct CASG > freeList;
|
||||
static tsFreeList < struct CASG, 128 > freeList;
|
||||
|
||||
~CASG ();
|
||||
friend class syncGroupNotify;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "iocinf.h"
|
||||
|
||||
tsFreeList < class nciu > nciu::freeList;
|
||||
tsFreeList < class nciu, 1024 > nciu::freeList;
|
||||
|
||||
struct putCvrtBuf {
|
||||
ELLNODE node;
|
||||
@@ -835,4 +835,4 @@ void nciu::decrementOutstandingIO ()
|
||||
void nciu::decrementOutstandingIO ( unsigned seqNumber )
|
||||
{
|
||||
this->piiu->pcas->decrementOutstandingIO ( seqNumber );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "iocinf.h"
|
||||
|
||||
tsFreeList < class netReadCopyIO > netReadCopyIO::freeList;
|
||||
tsFreeList < class netReadCopyIO, 1024 > netReadCopyIO::freeList;
|
||||
|
||||
netReadCopyIO::netReadCopyIO ( nciu &chanIn, unsigned typeIn, unsigned long countIn,
|
||||
void *pValueIn, unsigned seqNumberIn ) :
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "iocinf.h"
|
||||
|
||||
tsFreeList < class netReadNotifyIO > netReadNotifyIO::freeList;
|
||||
tsFreeList < class netReadNotifyIO, 1024 > netReadNotifyIO::freeList;
|
||||
|
||||
netReadNotifyIO::netReadNotifyIO ( nciu &chan, cacNotify ¬ifyIn ) :
|
||||
baseNMIU ( chan ), cacNotifyIO ( notifyIn )
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "iocinf.h"
|
||||
|
||||
tsFreeList < class netSubscription > netSubscription::freeList;
|
||||
tsFreeList < class netSubscription, 1024 > netSubscription::freeList;
|
||||
|
||||
netSubscription::netSubscription ( nciu &chan, chtype typeIn, unsigned long countIn,
|
||||
unsigned short maskIn, cacNotify ¬ifyIn ) :
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "iocinf.h"
|
||||
|
||||
tsFreeList < class netWriteNotifyIO > netWriteNotifyIO::freeList;
|
||||
tsFreeList < class netWriteNotifyIO, 1024 > netWriteNotifyIO::freeList;
|
||||
|
||||
netWriteNotifyIO::netWriteNotifyIO (nciu &chan, cacNotify ¬ifyIn) :
|
||||
baseNMIU (chan), cacNotifyIO (notifyIn)
|
||||
@@ -52,4 +52,4 @@ void netWriteNotifyIO::exceptionNotify ( int status, const char *pContext )
|
||||
void netWriteNotifyIO::exceptionNotify ( int status, const char *pContext, unsigned type, unsigned long count )
|
||||
{
|
||||
this->cacNotifyIO::exceptionNotify (status, pContext, type, count);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ private:
|
||||
void connectNotify ();
|
||||
void disconnectNotify ();
|
||||
void accessRightsNotify ( caar );
|
||||
static tsFreeList < struct oldChannel > freeList;
|
||||
static tsFreeList < struct oldChannel, 1024 > freeList;
|
||||
|
||||
friend int epicsShareAPI ca_array_get (chtype type, unsigned long count, chid pChan, void *pValue);
|
||||
};
|
||||
@@ -48,8 +48,6 @@ class getCallback : public cacNotify {
|
||||
public:
|
||||
getCallback (oldChannel &chan, caEventCallBackFunc *pFunc, void *pPrivate);
|
||||
void destroy ();
|
||||
virtual void completionNotify (unsigned type, unsigned long count, const void *pData);
|
||||
virtual void exceptionNotify (int status, const char *pContext);
|
||||
|
||||
static void * operator new ( size_t size );
|
||||
static void operator delete ( void *pCadaver, size_t size );
|
||||
@@ -59,15 +57,15 @@ private:
|
||||
caEventCallBackFunc *pFunc;
|
||||
void *pPrivate;
|
||||
~getCallback (); // allocate only out of pool
|
||||
static tsFreeList < class getCallback > freeList;
|
||||
virtual void completionNotify (unsigned type, unsigned long count, const void *pData);
|
||||
virtual void exceptionNotify (int status, const char *pContext);
|
||||
static tsFreeList < class getCallback, 1024 > freeList;
|
||||
};
|
||||
|
||||
class putCallback : public cacNotify {
|
||||
public:
|
||||
putCallback (oldChannel &chan, caEventCallBackFunc *pFunc, void *pPrivate );
|
||||
void destroy ();
|
||||
virtual void completionNotify ();
|
||||
virtual void exceptionNotify ( int status, const char *pContext );
|
||||
|
||||
static void * operator new ( size_t size );
|
||||
static void operator delete ( void *pCadaver, size_t size );
|
||||
@@ -77,7 +75,9 @@ private:
|
||||
caEventCallBackFunc *pFunc;
|
||||
void *pPrivate;
|
||||
~putCallback (); // allocate only out of pool
|
||||
static tsFreeList < class putCallback > freeList;
|
||||
virtual void completionNotify ();
|
||||
virtual void exceptionNotify ( int status, const char *pContext );
|
||||
static tsFreeList < class putCallback, 1024 > freeList;
|
||||
};
|
||||
|
||||
struct oldSubscription : public cacNotify {
|
||||
@@ -97,5 +97,5 @@ private:
|
||||
void exceptionNotify ( int status, const char *pContext );
|
||||
|
||||
~oldSubscription (); // must allocate from pool
|
||||
static tsFreeList < struct oldSubscription > freeList;
|
||||
};
|
||||
static tsFreeList < struct oldSubscription, 1024 > freeList;
|
||||
};
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "iocinf.h"
|
||||
#include "oldAccess.h"
|
||||
|
||||
tsFreeList < struct oldChannel > oldChannel::freeList;
|
||||
tsFreeList < struct oldChannel, 1024 > oldChannel::freeList;
|
||||
|
||||
oldChannel::oldChannel (caCh *pConnCallBackIn, void *pPrivateIn) :
|
||||
pConnCallBack (pConnCallBackIn), pPrivate (pPrivateIn), pAccessRightsFunc (0)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "iocinf.h"
|
||||
#include "oldAccess.h"
|
||||
|
||||
tsFreeList < struct oldSubscription > oldSubscription::freeList;
|
||||
tsFreeList < struct oldSubscription, 1024 > oldSubscription::freeList;
|
||||
|
||||
oldSubscription::oldSubscription ( oldChannel &chanIn, caEventCallBackFunc *pFuncIn, void *pPrivateIn ) :
|
||||
chan (chanIn), pFunc (pFuncIn), pPrivate (pPrivateIn)
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "iocinf.h"
|
||||
#include "oldAccess.h"
|
||||
|
||||
tsFreeList < class putCallback > putCallback::freeList;
|
||||
tsFreeList < class putCallback, 1024 > putCallback::freeList;
|
||||
|
||||
putCallback::putCallback (oldChannel &chanIn, caEventCallBackFunc *pFuncIn, void *pPrivateIn ) :
|
||||
chan (chanIn), pFunc (pFuncIn), pPrivate (pPrivateIn)
|
||||
@@ -68,4 +68,4 @@ void * putCallback::operator new ( size_t size )
|
||||
void putCallback::operator delete ( void *pCadaver, size_t size )
|
||||
{
|
||||
putCallback::freeList.release ( pCadaver, size );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
#include "iocinf.h"
|
||||
|
||||
tsFreeList < class syncGroupNotify > syncGroupNotify::freeList;
|
||||
tsFreeList < class syncGroupNotify, 1024 > syncGroupNotify::freeList;
|
||||
|
||||
syncGroupNotify::syncGroupNotify ( CASG &sgIn, void *pValueIn ) :
|
||||
sg (sgIn), magic (CASG_MAGIC), pValue (pValueIn), seqNo ( sgIn.seqNo )
|
||||
|
||||
Reference in New Issue
Block a user