From ae7f98ede70419bfb085476139cd963aed7c6096 Mon Sep 17 00:00:00 2001 From: sailer Date: Mon, 19 May 2003 16:05:41 +0000 Subject: [PATCH] First try to make it compile with both EPICS versions. Comiled but does not the right thing in any case. -- Benjamin Sailer --- allParam/ca/server/paramBlobRecord.h | 2 +- allParam/ca/server/paramFilenameRecord.h | 2 +- allParam/ca/server/paramIntRecord.h | 3 +-- allParam/ca/server/paramRecordSet.cc | 16 ++++++++++++++-- allParam/ca/server/paramRecordSet.h | 9 +++++++-- allParam/ca/server/paramServer.cc | 5 ++--- allParam/ca/server/paramStringRecord.h | 2 +- allParam/config.h.in | 4 ++++ 8 files changed, 31 insertions(+), 12 deletions(-) diff --git a/allParam/ca/server/paramBlobRecord.h b/allParam/ca/server/paramBlobRecord.h index 7a8c931..70f4d3a 100644 --- a/allParam/ca/server/paramBlobRecord.h +++ b/allParam/ca/server/paramBlobRecord.h @@ -1,7 +1,7 @@ #ifndef PARAMBLOBRECORD_H #define PARAMBLOBRECORD_H -#include "paramRecord.h" +#include "record.h" class ParamBlobRecord : public Record { private: diff --git a/allParam/ca/server/paramFilenameRecord.h b/allParam/ca/server/paramFilenameRecord.h index ce75662..059bed7 100644 --- a/allParam/ca/server/paramFilenameRecord.h +++ b/allParam/ca/server/paramFilenameRecord.h @@ -1,7 +1,7 @@ #ifndef PARAMFILENAMERECORD_H #define PARAMFILENAMERECORD_H -#include "paramRecord.h" +#include "record.h" class ParamFilenameRecord : public Record { private: diff --git a/allParam/ca/server/paramIntRecord.h b/allParam/ca/server/paramIntRecord.h index 40ca087..d9292b1 100644 --- a/allParam/ca/server/paramIntRecord.h +++ b/allParam/ca/server/paramIntRecord.h @@ -1,8 +1,7 @@ #ifndef PARAMINTRECORD_H #define PARAMINTRECORD_H -#include "paramRecord.h" -#include "arrayDest.h" +#include "record.h" class ParamIntRecord : public Record { private: diff --git a/allParam/ca/server/paramRecordSet.cc b/allParam/ca/server/paramRecordSet.cc index f486990..56d6c5f 100644 --- a/allParam/ca/server/paramRecordSet.cc +++ b/allParam/ca/server/paramRecordSet.cc @@ -1,4 +1,4 @@ -static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramRecordSet.cc,v 1.10 2003-01-31 12:25:32 hadaq Exp $"; +static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramRecordSet.cc,v 1.11 2003-05-19 16:05:41 sailer Exp $"; #define _POSIX_C_SOURCE 199509L #if HAVE_CONFIG_H @@ -21,8 +21,12 @@ extern "C" { #include "paramFilenameRecord.h" #include "paramBlobRecord.h" +#if EPICS_RELEASE >= 314 +ParamRecordSet::ParamRecordSet(unsigned int pvCountEstimate) +#else ParamRecordSet::ParamRecordSet(unsigned int pvCountEstimate) : - caServer(pvCountEstimate) + caServer(pvCountEstimate) +#endif { numParamSrc = 0; numPv = 0; @@ -109,7 +113,11 @@ pvExistReturn ParamRecordSet::pvExistTest(const casCtx &ctx, const char *pPVName return pverDoesNotExistHere; } +#if EPICS_RELEASE >= 314 +pvAttachReturn ParamRecordSet::pvAttach(const casCtx &ctx, const char *pPVName) +#else pvCreateReturn ParamRecordSet::createPV(const casCtx &ctx, const char *pPVName) +#endif { char *setup; char type; @@ -117,7 +125,11 @@ pvCreateReturn ParamRecordSet::createPV(const casCtx &ctx, const char *pPVName) char buf2[PARAM_MAX_NAME_LEN]; char buf3[PARAM_MAX_NAME_LEN]; +#if EPICS_RELEASE >= 314 + pvAttachReturn retVal(S_casApp_pvNotFound); +#else pvCreateReturn retVal(S_casApp_pvNotFound); +#endif for (int i = 0 ; i < numPv ; i++) { if(strcmp(pPVName, pvs[i]->getPVName()) == 0) { diff --git a/allParam/ca/server/paramRecordSet.h b/allParam/ca/server/paramRecordSet.h index 400c062..f8ffd15 100644 --- a/allParam/ca/server/paramRecordSet.h +++ b/allParam/ca/server/paramRecordSet.h @@ -7,7 +7,7 @@ extern "C" { #include } -#include "paramRecord.h" +#include "record.h" #define MAX_PARAM_SRC 128 #define MAX_NUM_PV 1024 @@ -25,7 +25,12 @@ class ParamRecordSet : public caServer { ParamRecordSet(unsigned int); ~ParamRecordSet(); pvExistReturn pvExistTest(const casCtx &, const char *); - pvCreateReturn createPV(const casCtx &, const char *); +#if EPICS_RELEASE >= 314 + pvAttachReturn pvAttach(const casCtx &ctx, const char *pPVName); +#else + pvCreateReturn createPV(const casCtx &ctx, const char *pPVName); +#endif + }; #endif /* !PARAMRECORDSET_H */ diff --git a/allParam/ca/server/paramServer.cc b/allParam/ca/server/paramServer.cc index bb707ec..d577e23 100644 --- a/allParam/ca/server/paramServer.cc +++ b/allParam/ca/server/paramServer.cc @@ -1,5 +1,5 @@ static const char rcsId[] = - "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramServer.cc,v 1.6 2003-05-19 11:01:55 sailer Exp $"; + "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramServer.cc,v 1.7 2003-05-19 16:05:41 sailer Exp $"; #define _POSIX_C_SOURCE 199506L #define SYSLOG_NAMES @@ -126,8 +126,7 @@ int main(int argc, char *argv[]) cas->setDebugLevel(0u); while (aitTrue) { - osiTime delay(1000u, 0u); - fileDescriptorManager.process(delay); + fileDescriptorManager.process(1000.0); } delete cas; diff --git a/allParam/ca/server/paramStringRecord.h b/allParam/ca/server/paramStringRecord.h index 680acdb..e4e9441 100644 --- a/allParam/ca/server/paramStringRecord.h +++ b/allParam/ca/server/paramStringRecord.h @@ -1,7 +1,7 @@ #ifndef PARAMSTRINGRECORD_H #define PARAMSTRINGRECORD_H -#include "paramRecord.h" +#include "record.h" class ParamStringRecord : public Record { private: diff --git a/allParam/config.h.in b/allParam/config.h.in index a6ca420..310e670 100644 --- a/allParam/config.h.in +++ b/allParam/config.h.in @@ -71,3 +71,7 @@ /* Define to `unsigned' if does not define. */ #undef size_t + +/* Set epics_release here. */ +#undef EPICS_RELEASE + -- 2.43.0