From 68bbb55370914769be393fefc90490b27adf2447 Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Wed, 7 Apr 2021 07:57:56 -0400 Subject: [PATCH] another atrempt to fix jenkins failure --- src/special/pvdbcrAddRecordRegister.cpp | 12 ++++++------ src/special/pvdbcrProcessRecordRegister.cpp | 14 +++++++------- src/special/pvdbcrRemoveRecordRegister.cpp | 12 ++++++------ src/special/pvdbcrScalarArrayRegister.cpp | 14 ++++++-------- src/special/pvdbcrScalarRegister.cpp | 13 +++++-------- src/special/pvdbcrTraceRecordRegister.cpp | 14 +++++++------- 6 files changed, 37 insertions(+), 42 deletions(-) diff --git a/src/special/pvdbcrAddRecordRegister.cpp b/src/special/pvdbcrAddRecordRegister.cpp index cb94883..1c9d33a 100644 --- a/src/special/pvdbcrAddRecordRegister.cpp +++ b/src/special/pvdbcrAddRecordRegister.cpp @@ -5,7 +5,7 @@ /** * @author mrk - * @date 2021.03.12 + * @date 2021.04.07 */ #include #include @@ -20,13 +20,12 @@ // The following must be the last include for code exampleLink uses #include #define epicsExportSharedSymbols -#include "pv/pvStructureCopy.h" -#include "pv/channelProviderLocal.h" #include "pv/pvDatabase.h" using namespace epics::pvData; -using namespace epics::pvDatabase; using namespace std; +namespace epics { namespace pvDatabase { + class PvdbcrAddRecord; typedef std::tr1::shared_ptr PvdbcrAddRecordPtr; @@ -122,6 +121,7 @@ void PvdbcrAddRecord::process() pvResult->put("failure"); } } +}} static const iocshArg arg0 = { "recordName", iocshArgString }; static const iocshArg arg1 = { "asLevel", iocshArgInt }; @@ -143,10 +143,10 @@ static void pvdbcrAddRecordCallFunc(const iocshArgBuf *args) if(sval) { asGroup = string(sval); } - PvdbcrAddRecordPtr record = PvdbcrAddRecord::create(recordName); + epics::pvDatabase::PvdbcrAddRecordPtr record = epics::pvDatabase::PvdbcrAddRecord::create(recordName); record->setAsLevel(asLevel); record->setAsGroup(asGroup); - PVDatabasePtr master = PVDatabase::getMaster(); + epics::pvDatabase::PVDatabasePtr master = epics::pvDatabase::PVDatabase::getMaster(); bool result = master->addRecord(record); if(!result) cout << "recordname " << recordName << " not added" << endl; } diff --git a/src/special/pvdbcrProcessRecordRegister.cpp b/src/special/pvdbcrProcessRecordRegister.cpp index e0b7d00..49583ba 100644 --- a/src/special/pvdbcrProcessRecordRegister.cpp +++ b/src/special/pvdbcrProcessRecordRegister.cpp @@ -5,7 +5,7 @@ /** * @author mrk - * @date 2021.03.12 + * @date 2021.04.07 */ #include #include @@ -23,14 +23,12 @@ #include #define epicsExportSharedSymbols -#include "pv/pvStructureCopy.h" -#include "pv/channelProviderLocal.h" #include "pv/pvDatabase.h" - using namespace epics::pvData; -using namespace epics::pvDatabase; using namespace std; +namespace epics { namespace pvDatabase { + typedef std::tr1::shared_ptr EpicsThreadPtr; class PvdbcrProcessRecord; typedef std::tr1::shared_ptr PvdbcrProcessRecordPtr; @@ -185,6 +183,7 @@ void PvdbcrProcessRecord::run() } } } +}} static const iocshArg arg0 = { "recordName", iocshArgString }; static const iocshArg arg1 = { "delay", iocshArgDouble }; @@ -209,10 +208,11 @@ static void pvdbcrProcessRecordCallFunc(const iocshArgBuf *args) if(sval) { asGroup = string(sval); } - PvdbcrProcessRecordPtr record = PvdbcrProcessRecord::create(recordName,delay); + epics::pvDatabase::PvdbcrProcessRecordPtr record + = epics::pvDatabase::PvdbcrProcessRecord::create(recordName,delay); record->setAsLevel(asLevel); record->setAsGroup(asGroup); - PVDatabasePtr master = PVDatabase::getMaster(); + epics::pvDatabase::PVDatabasePtr master = epics::pvDatabase::PVDatabase::getMaster(); bool result = master->addRecord(record); if(!result) cout << "recordname " << recordName << " not added" << endl; } diff --git a/src/special/pvdbcrRemoveRecordRegister.cpp b/src/special/pvdbcrRemoveRecordRegister.cpp index 50879c5..e724f8f 100644 --- a/src/special/pvdbcrRemoveRecordRegister.cpp +++ b/src/special/pvdbcrRemoveRecordRegister.cpp @@ -5,7 +5,7 @@ /** * @author mrk - * @date 2021.03.12 + * @date 2021.04.07 */ #include #include @@ -19,13 +19,12 @@ #include #define epicsExportSharedSymbols -#include "pv/pvStructureCopy.h" -#include "pv/channelProviderLocal.h" #include "pv/pvDatabase.h" using namespace epics::pvData; -using namespace epics::pvDatabase; using namespace std; +namespace epics { namespace pvDatabase { + class PvdbcrRemoveRecord; typedef std::tr1::shared_ptr PvdbcrRemoveRecordPtr; @@ -96,6 +95,7 @@ void PvdbcrRemoveRecord::process() pvRecord->remove(); pvResult->put("success"); } +}} static const iocshArg arg0 = { "recordName", iocshArgString }; static const iocshArg arg1 = { "asLevel", iocshArgInt }; @@ -117,10 +117,10 @@ static void pvdbcrRemoveRecordCallFunc(const iocshArgBuf *args) if(sval) { asGroup = string(sval); } - PvdbcrRemoveRecordPtr record = PvdbcrRemoveRecord::create(recordName); + epics::pvDatabase::PvdbcrRemoveRecordPtr record = epics::pvDatabase::PvdbcrRemoveRecord::create(recordName); record->setAsLevel(asLevel); record->setAsGroup(asGroup); - PVDatabasePtr master = PVDatabase::getMaster(); + epics::pvDatabase::PVDatabasePtr master = epics::pvDatabase::PVDatabase::getMaster(); bool result = master->addRecord(record); if(!result) cout << "recordname " << recordName << " not added" << endl; } diff --git a/src/special/pvdbcrScalarArrayRegister.cpp b/src/special/pvdbcrScalarArrayRegister.cpp index f2c63a8..3c7afa6 100644 --- a/src/special/pvdbcrScalarArrayRegister.cpp +++ b/src/special/pvdbcrScalarArrayRegister.cpp @@ -5,7 +5,7 @@ /** * @author mrk - * @date 2021.03.12 + * @date 2021.04.07 */ @@ -23,11 +23,8 @@ // The following must be the last include for code pvDatabase implements #include #define epicsExportSharedSymbols -#include "pv/pvStructureCopy.h" -#include "pv/channelProviderLocal.h" #include "pv/pvDatabase.h" using namespace epics::pvData; -using namespace epics::pvDatabase; using namespace std; static const iocshArg arg0 = { "recordName", iocshArgString }; @@ -42,12 +39,12 @@ static void pvdbcrScalarArrayCallFunc(const iocshArgBuf *args) { char *sval = args[0].sval; if(!sval) { - throw std::runtime_error("pvdbcrScalarArrayCreate recordName not specified"); + throw std::runtime_error("pvdbcrScalarArray recordName not specified"); } string recordName = string(sval); sval = args[1].sval; if(!sval) { - throw std::runtime_error("pvdbcrScalarArrayCreate scalarType not specified"); + throw std::runtime_error("pvdbcrScalarArray scalarType not specified"); } string scalarType = string(sval); int asLevel = args[2].ival; @@ -66,10 +63,11 @@ static void pvdbcrScalarArrayCallFunc(const iocshArgBuf *args) add("alarm",standardField->alarm()) -> createStructure(); PVStructurePtr pvStructure = pvDataCreate->createPVStructure(top); - PVRecordPtr record = PVRecord::create(recordName,pvStructure); + epics::pvDatabase::PVRecordPtr record + = epics::pvDatabase::PVRecord::create(recordName,pvStructure); record->setAsLevel(asLevel); record->setAsGroup(asGroup); - PVDatabasePtr master = PVDatabase::getMaster(); + epics::pvDatabase::PVDatabasePtr master = epics::pvDatabase::PVDatabase::getMaster(); bool result = master->addRecord(record); if(!result) cout << "recordname " << recordName << " not added" << endl; } diff --git a/src/special/pvdbcrScalarRegister.cpp b/src/special/pvdbcrScalarRegister.cpp index acfbc26..0209b88 100644 --- a/src/special/pvdbcrScalarRegister.cpp +++ b/src/special/pvdbcrScalarRegister.cpp @@ -5,7 +5,7 @@ /** * @author mrk - * @date 2021.03.12 + * @date 2021.04.07 */ #include #include @@ -20,11 +20,8 @@ // The following must be the last include for code pvDatabase implements #include #define epicsExportSharedSymbols -#include "pv/pvStructureCopy.h" -#include "pv/channelProviderLocal.h" #include "pv/pvDatabase.h" using namespace epics::pvData; -using namespace epics::pvDatabase; using namespace std; static const iocshArg arg0 = { "recordName", iocshArgString }; @@ -39,12 +36,12 @@ static void pvdbcrScalarCallFunc(const iocshArgBuf *args) { char *sval = args[0].sval; if(!sval) { - throw std::runtime_error("pvdbcrScalarArrayCreate recordName not specified"); + throw std::runtime_error("pvdbcrScalar recordName not specified"); } string recordName = string(sval); sval = args[1].sval; if(!sval) { - throw std::runtime_error("pvdbcrScalarArrayCreate scalarType not specified"); + throw std::runtime_error("pvdbcrScalar scalarType not specified"); } string scalarType = string(sval); int asLevel = args[2].ival; @@ -63,10 +60,10 @@ static void pvdbcrScalarCallFunc(const iocshArgBuf *args) add("alarm",standardField->alarm()) -> createStructure(); PVStructurePtr pvStructure = pvDataCreate->createPVStructure(top); - PVRecordPtr record = PVRecord::create(recordName,pvStructure); + epics::pvDatabase::PVRecordPtr record = epics::pvDatabase::PVRecord::create(recordName,pvStructure); record->setAsLevel(asLevel); record->setAsGroup(asGroup); - PVDatabasePtr master = PVDatabase::getMaster(); + epics::pvDatabase::PVDatabasePtr master = epics::pvDatabase::PVDatabase::getMaster(); bool result = master->addRecord(record); if(!result) cout << "recordname " << recordName << " not added" << endl; } diff --git a/src/special/pvdbcrTraceRecordRegister.cpp b/src/special/pvdbcrTraceRecordRegister.cpp index 81579f0..7e36a81 100644 --- a/src/special/pvdbcrTraceRecordRegister.cpp +++ b/src/special/pvdbcrTraceRecordRegister.cpp @@ -5,7 +5,7 @@ /** * @author mrk - * @date 2021.03.12 + * @date 2021.04.07 */ #include #include @@ -20,14 +20,12 @@ // The following must be the last include #include #define epicsExportSharedSymbols -#include "pv/pvStructureCopy.h" -#include "pv/channelProviderLocal.h" #include "pv/pvDatabase.h" - using namespace epics::pvData; -using namespace epics::pvDatabase; using namespace std; +namespace epics { namespace pvDatabase { + class PvdbcrTraceRecord; typedef std::tr1::shared_ptr PvdbcrTraceRecordPtr; @@ -102,6 +100,7 @@ void PvdbcrTraceRecord::process() pvRecord->setTraceLevel(pvLevel->get()); pvResult->put("success"); } +}} static const iocshArg arg0 = { "recordName", iocshArgString }; static const iocshArg arg1 = { "asLevel", iocshArgInt }; @@ -123,10 +122,11 @@ static void pvdbcrTraceRecordCallFunc(const iocshArgBuf *args) if(sval) { asGroup = string(sval); } - PvdbcrTraceRecordPtr record = PvdbcrTraceRecord::create(recordName); + epics::pvDatabase::PvdbcrTraceRecordPtr record + = epics::pvDatabase::PvdbcrTraceRecord::create(recordName); record->setAsLevel(asLevel); record->setAsGroup(asGroup); - PVDatabasePtr master = PVDatabase::getMaster(); + epics::pvDatabase::PVDatabasePtr master = epics::pvDatabase::PVDatabase::getMaster(); bool result = master->addRecord(record); if(!result) cout << "recordname " << recordName << " not added" << endl; }