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

Replace calls of deprecated subfield functions

Browse Source 
The non-template functions for getting subfields of a PVStructure, such
as PVStructure::getIntField were marked as deprecated in the 4.4 release
and now generate build warnings. Replace calls of these functions with
calls of the template function getSubField, e.g. getSubField<PVInt>.
This commit is contained in:
Dave Hickin
2015-07-15 19:06:04 +01:00
parent 81b160d7b6
commit 6b0d1ce49b
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
exampleServer/src/exampleServer.cpp
View File

@ -66,9 +66,9 @@ bool ExampleServer::init()
initPVRecord();
PVFieldPtr pvField;
pvArgumentValue = getPVStructure()->getStringField("argument.value");
pvArgumentValue = getPVStructure()->getSubField<PVString>("argument.value");
if(pvArgumentValue.get()==NULL) return false;
pvResultValue = getPVStructure()->getStringField("result.value");
pvResultValue = getPVStructure()->getSubField<PVString>("result.value");
if(pvResultValue.get()==NULL) return false;
pvTimeStamp.attach(getPVStructure()->getSubField("result.timeStamp"));
return true;

2
src/pvAccess/channelLocal.cpp
View File

@ -149,7 +149,7 @@ ChannelProcessLocalPtr ChannelProcessLocal::create(
pvOptions = static_pointer_cast<PVStructure>(pvField);
pvField = pvOptions->getSubField("nProcess");
if(pvField) {
PVStringPtr pvString = pvOptions->getStringField("nProcess");
PVStringPtr pvString = pvOptions->getSubField<PVString>("nProcess");
if(pvString) {
int size;
std::stringstream ss;

9
src/special/recordList.cpp
View File

@ -61,20 +61,19 @@ bool RecordListRecord::init()
{
initPVRecord();
PVStructurePtr pvStructure = getPVStructure();
database = pvStructure->getStringField("argument.database");
database = pvStructure->getSubField<PVString>("argument.database");
if(database.get()==NULL) return false;
regularExpression = pvStructure->getStringField(
regularExpression = pvStructure->getSubField<PVString>(
"argument.regularExpression");
if(regularExpression.get()==NULL) return false;
status = pvStructure->getStringField("result.status");
status = pvStructure->getSubField<PVString>("result.status");
if(status.get()==NULL) return false;
PVFieldPtr pvField = pvStructure->getSubField("result.names");
if(pvField.get()==NULL) {
std::cerr << "no result.names" << std::endl;
return false;
}
name = static_pointer_cast<PVStringArray>(
pvStructure->getScalarArrayField("result.names",pvString));
name = pvStructure->getSubField<PVStringArray>("result.names");
if(name.get()==NULL) return false;
return true;
}

6
src/special/traceRecord.cpp
View File

@ -62,11 +62,11 @@ bool TraceRecord::init()
{
initPVRecord();
PVStructurePtr pvStructure = getPVStructure();
pvRecordName = pvStructure->getStringField("argument.recordName");
pvRecordName = pvStructure->getSubField<PVString>("argument.recordName");
if(!pvRecordName) return false;
pvLevel = pvStructure->getIntField("argument.level");
pvLevel = pvStructure->getSubField<PVInt>("argument.level");
if(!pvLevel) return false;
pvResult = pvStructure->getStringField("result.status");
pvResult = pvStructure->getSubField<PVString>("result.status");
if(!pvResult) return false;
return true;
}