fixed gnu warnings
This commit is contained in:
@@ -11,7 +11,6 @@ INC += caerr.h
|
||||
INC += caeventmask.h
|
||||
INC += caProto.h
|
||||
INC += db_access.h
|
||||
INC += pvAdapter.h
|
||||
INC += addrList.h
|
||||
INC += cacIO.h
|
||||
|
||||
|
||||
@@ -105,3 +105,7 @@ private:
|
||||
};
|
||||
|
||||
epicsShareExtern cacServiceList cacGlobalServiceList;
|
||||
|
||||
epicsShareFunc int epicsShareAPI ca_register_service ( struct cacServiceIO *pService );
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
#include "caerr.h"
|
||||
#include "db_access.h"
|
||||
#include "caeventmask.h"
|
||||
#include "pvAdapter.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -197,8 +196,6 @@ epicsShareFunc int epicsShareAPI ca_task_initialize (void);
|
||||
/************************************************************************/
|
||||
epicsShareFunc int epicsShareAPI ca_task_exit (void);
|
||||
|
||||
epicsShareFunc int epicsShareAPI ca_register_service ( struct cacServiceIO *pService );
|
||||
|
||||
/************************************************************************
|
||||
* anachronistic entry points *
|
||||
* **** Fetching a value while searching no longer supported**** *
|
||||
|
||||
@@ -825,8 +825,6 @@ int cac_select_io (cac *pcac, double maxDelay, int flags);
|
||||
|
||||
char *localHostName (void);
|
||||
|
||||
int ca_os_independent_init (cac *pcac, const pvAdapter *ppva);
|
||||
|
||||
bhe *lookupBeaconInetAddr(cac *pcac,
|
||||
const struct sockaddr_in *pnet_addr);
|
||||
|
||||
|
||||
+2
-2
@@ -48,7 +48,7 @@ extern "C" void dbSubscriptionEventCallback ( void *pPrivate, struct dbAddr *pad
|
||||
class dbSubscriptionIO : public cacNotifyIO {
|
||||
public:
|
||||
dbSubscriptionIO ( dbChannelIO &chanIO, cacNotify &, unsigned type, unsigned long count );
|
||||
int dbSubscriptionIO::begin ( struct dbAddr &addr, unsigned mask );
|
||||
int begin ( struct dbAddr &addr, unsigned mask );
|
||||
void destroy ();
|
||||
static void * operator new ( size_t size );
|
||||
static void operator delete ( void *pCadaver, size_t size );
|
||||
@@ -99,7 +99,7 @@ private:
|
||||
class dbServiceIO : public cacServiceIO {
|
||||
public:
|
||||
dbServiceIO ();
|
||||
~dbServiceIO ();
|
||||
virtual ~dbServiceIO ();
|
||||
cacChannelIO *createChannelIO ( cacChannel &chan, const char *pName );
|
||||
void subscriptionUpdate ( struct dbAddr &addr, unsigned type, unsigned long count,
|
||||
const struct db_field_log *pfl, cacNotifyIO ¬ify );
|
||||
|
||||
@@ -33,8 +33,8 @@ extern "C" unsigned short dbDBRnewToDBRold[DBR_ENUM+1];
|
||||
tsFreeList < dbChannelIO > dbChannelIO::freeList;
|
||||
|
||||
dbChannelIO::dbChannelIO ( cacChannel &chan, const dbAddr &addrIn, dbServiceIO &serviceIO ) :
|
||||
cacChannelIO ( chan ), serviceIO ( serviceIO ), addr ( addrIn ),
|
||||
pGetCallbackCache ( 0 ), getCallbackCacheSize ( 0ul )
|
||||
cacChannelIO ( chan ), serviceIO ( serviceIO ), pGetCallbackCache ( 0 ),
|
||||
getCallbackCacheSize ( 0ul ), addr ( addrIn )
|
||||
{
|
||||
this->connectNotify ();
|
||||
}
|
||||
|
||||
+1
-1
@@ -395,4 +395,4 @@ long dbtpn(char *pname,char *pvalue)
|
||||
errMessage(status, "dbtpn");
|
||||
}
|
||||
return(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ int dbPutNotifyIO::initiate ( struct dbAddr &addr, unsigned type,
|
||||
status = ::dbPutNotify ( &this->pn );
|
||||
if ( status && status != S_db_Pending ) {
|
||||
this->pn.status = status;
|
||||
putNotifyCallback ();
|
||||
this->cacNotifyIO::exceptionNotify ( ECA_PUTFAIL, "dbPutNotify() returned failure");
|
||||
}
|
||||
return ECA_NORMAL;
|
||||
}
|
||||
|
||||
@@ -27,16 +27,16 @@
|
||||
#include "db_access_routines.h"
|
||||
#include "dbCAC.h"
|
||||
|
||||
class loadTimeInit {
|
||||
class dbServiceIOLoadTimeInit {
|
||||
public:
|
||||
loadTimeInit ();
|
||||
dbServiceIOLoadTimeInit ();
|
||||
private:
|
||||
dbServiceIO dbio;
|
||||
};
|
||||
|
||||
static loadTimeInit lti;
|
||||
static dbServiceIOLoadTimeInit lti;
|
||||
|
||||
loadTimeInit::loadTimeInit ()
|
||||
dbServiceIOLoadTimeInit::dbServiceIOLoadTimeInit ()
|
||||
{
|
||||
cacGlobalServiceList.registerService ( this->dbio );
|
||||
}
|
||||
|
||||
@@ -54,7 +54,6 @@
|
||||
#include "errlog.h"
|
||||
#include "ellLib.h"
|
||||
#include "tsStamp.h"
|
||||
#include "pvAdapter.h"
|
||||
#include "dbStaticLib.h"
|
||||
#include "dbBase.h"
|
||||
#include "dbCommon.h"
|
||||
|
||||
Reference in New Issue
Block a user