From 81abd5f413d451468294be8589382e4bcf231e7b Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Fri, 2 Apr 2021 17:00:51 -0400 Subject: [PATCH 1/2] another attempt to fix jenkins_problem --- src/special/pvdbcrAddRecordRegister.cpp | 2 -- src/special/pvdbcrProcessRecordRegister.cpp | 2 +- src/special/pvdbcrRemoveRecordRegister.cpp | 1 - src/special/pvdbcrTraceRecordRegister.cpp | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/special/pvdbcrAddRecordRegister.cpp b/src/special/pvdbcrAddRecordRegister.cpp index c8a69d1..ba6077d 100644 --- a/src/special/pvdbcrAddRecordRegister.cpp +++ b/src/special/pvdbcrAddRecordRegister.cpp @@ -23,9 +23,7 @@ #include "pv/pvStructureCopy.h" #include "pv/channelProviderLocal.h" #include "pv/pvDatabase.h" -using std::tr1::static_pointer_cast; using namespace epics::pvData; -using namespace epics::pvAccess; using namespace epics::pvDatabase; using namespace std; diff --git a/src/special/pvdbcrProcessRecordRegister.cpp b/src/special/pvdbcrProcessRecordRegister.cpp index bfac05c..e0b7d00 100644 --- a/src/special/pvdbcrProcessRecordRegister.cpp +++ b/src/special/pvdbcrProcessRecordRegister.cpp @@ -26,8 +26,8 @@ #include "pv/pvStructureCopy.h" #include "pv/channelProviderLocal.h" #include "pv/pvDatabase.h" + using namespace epics::pvData; -using namespace epics::pvAccess; using namespace epics::pvDatabase; using namespace std; diff --git a/src/special/pvdbcrRemoveRecordRegister.cpp b/src/special/pvdbcrRemoveRecordRegister.cpp index 561faa6..50879c5 100644 --- a/src/special/pvdbcrRemoveRecordRegister.cpp +++ b/src/special/pvdbcrRemoveRecordRegister.cpp @@ -23,7 +23,6 @@ #include "pv/channelProviderLocal.h" #include "pv/pvDatabase.h" using namespace epics::pvData; -using namespace epics::pvAccess; using namespace epics::pvDatabase; using namespace std; diff --git a/src/special/pvdbcrTraceRecordRegister.cpp b/src/special/pvdbcrTraceRecordRegister.cpp index d5439e7..81579f0 100644 --- a/src/special/pvdbcrTraceRecordRegister.cpp +++ b/src/special/pvdbcrTraceRecordRegister.cpp @@ -25,7 +25,6 @@ #include "pv/pvDatabase.h" using namespace epics::pvData; -using namespace epics::pvAccess; using namespace epics::pvDatabase; using namespace std; From a622f66a94549319c445c0c74f652eb9016149ac Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Fri, 2 Apr 2021 18:09:38 -0400 Subject: [PATCH 2/2] another attempt to fix jenkins_problem --- src/special/pvdbcrAddRecordRegister.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/special/pvdbcrAddRecordRegister.cpp b/src/special/pvdbcrAddRecordRegister.cpp index ba6077d..cb94883 100644 --- a/src/special/pvdbcrAddRecordRegister.cpp +++ b/src/special/pvdbcrAddRecordRegister.cpp @@ -112,7 +112,7 @@ void PvdbcrAddRecord::process() pvResult->put(name + " union most be a structure"); return; } - StructureConstPtr st = static_pointer_cast(pvField->getField()); + StructureConstPtr st = std::tr1::static_pointer_cast(pvField->getField()); PVStructurePtr pvStructure = pvDataCreate->createPVStructure(st); PVRecordPtr pvRec = PVRecord::create(name,pvStructure); bool result = PVDatabase::getMaster()->addRecord(pvRec);