epics/pvDatabase
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge pull request #67 from epics-base/jenkins_problem

Browse Source 
another attempt to fix jenkins_problem
This commit is contained in:
Marty Kraimer
2021-04-03 05:52:10 -04:00
committed by GitHub
parent 4df01038c3 a622f66a94
commit d4a13397d7
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/special/pvdbcrAddRecordRegister.cpp
View File

@ -23,9 +23,7 @@
#include "pv/pvStructureCopy.h" #include "pv/pvStructureCopy.h"
#include "pv/channelProviderLocal.h" #include "pv/channelProviderLocal.h"
#include "pv/pvDatabase.h" #include "pv/pvDatabase.h"
using std::tr1::static_pointer_cast;
using namespace epics::pvData; using namespace epics::pvData;
using namespace epics::pvAccess;
using namespace epics::pvDatabase; using namespace epics::pvDatabase;
using namespace std; using namespace std;
@ -114,7 +112,7 @@ void PvdbcrAddRecord::process()
pvResult->put(name + " union most be a structure"); pvResult->put(name + " union most be a structure");
return; return;
} }
StructureConstPtr st = static_pointer_cast<const Structure>(pvField->getField()); StructureConstPtr st = std::tr1::static_pointer_cast<const Structure>(pvField->getField());
PVStructurePtr pvStructure = pvDataCreate->createPVStructure(st); PVStructurePtr pvStructure = pvDataCreate->createPVStructure(st);
PVRecordPtr pvRec = PVRecord::create(name,pvStructure); PVRecordPtr pvRec = PVRecord::create(name,pvStructure);
bool result = PVDatabase::getMaster()->addRecord(pvRec); bool result = PVDatabase::getMaster()->addRecord(pvRec);

2
src/special/pvdbcrProcessRecordRegister.cpp
View File

@ -26,8 +26,8 @@
#include "pv/pvStructureCopy.h" #include "pv/pvStructureCopy.h"
#include "pv/channelProviderLocal.h" #include "pv/channelProviderLocal.h"
#include "pv/pvDatabase.h" #include "pv/pvDatabase.h"
using namespace epics::pvData; using namespace epics::pvData;
using namespace epics::pvAccess;
using namespace epics::pvDatabase; using namespace epics::pvDatabase;
using namespace std; using namespace std;

1
src/special/pvdbcrRemoveRecordRegister.cpp
View File

@ -23,7 +23,6 @@
#include "pv/channelProviderLocal.h" #include "pv/channelProviderLocal.h"
#include "pv/pvDatabase.h" #include "pv/pvDatabase.h"
using namespace epics::pvData; using namespace epics::pvData;
using namespace epics::pvAccess;
using namespace epics::pvDatabase; using namespace epics::pvDatabase;
using namespace std; using namespace std;

1
src/special/pvdbcrTraceRecordRegister.cpp
View File

@ -25,7 +25,6 @@
#include "pv/pvDatabase.h" #include "pv/pvDatabase.h"
using namespace epics::pvData; using namespace epics::pvData;
using namespace epics::pvAccess;
using namespace epics::pvDatabase; using namespace epics::pvDatabase;
using namespace std; using namespace std;