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

Use "String const &" in many more places

Browse Source
This commit is contained in:
Marty Kraimer
2012-08-20 09:16:43 -04:00
parent 9061e8f731
commit 8f3a1dde34
15 changed files with 156 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvDataApp/factory/StandardPVField.cpp
+10 -5
View File
@@ -28,21 +28,24 @@ StandardPVField::StandardPVField(){}
StandardPVField::~StandardPVField(){}
PVStructurePtr StandardPVField::scalar(ScalarType type,String properties)
PVStructurePtr StandardPVField::scalar(
ScalarType type,String const & properties)
{
StructureConstPtr field = standardField->scalar(type,properties);
PVStructurePtr pvStructure = pvDataCreate->createPVStructure(field);
return pvStructure;
}
PVStructurePtr StandardPVField::scalarArray(ScalarType elementType, String properties)
PVStructurePtr StandardPVField::scalarArray(
ScalarType elementType, String const & properties)
{
StructureConstPtr field = standardField->scalarArray(elementType,properties);
PVStructurePtr pvStructure = pvDataCreate->createPVStructure(field);
return pvStructure;
}
PVStructurePtr StandardPVField::structureArray(StructureConstPtr const & structure,String properties)
PVStructurePtr StandardPVField::structureArray(
StructureConstPtr const & structure,String const & properties)
{
StructureConstPtr field = standardField->structureArray(structure,properties);
PVStructurePtr pvStructure = pvDataCreate->createPVStructure(field);
@@ -63,11 +66,13 @@ PVStructurePtr StandardPVField::enumerated(StringArray const &choices)
return pvStructure;
}
PVStructurePtr StandardPVField::enumerated(StringArray const &choices,String properties)
PVStructurePtr StandardPVField::enumerated(
StringArray const &choices,String const & properties)
{
StructureConstPtr field = standardField->enumerated(properties);
PVStructurePtr pvStructure = pvDataCreate->createPVStructure(field);
PVScalarArrayPtr pvScalarArray = pvStructure->getScalarArrayField("value.choices",pvString);
PVScalarArrayPtr pvScalarArray = pvStructure->getScalarArrayField(
"value.choices",pvString);
if(pvScalarArray.get()==NULL) {
throw std::logic_error(String("StandardPVField::enumerated"));
}