EPICS_base/normativeTypes
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Add missing implementation of NTScalarArray::value

Browse Source 
Use value in unit tests instead of deprecated arrayValue.
This commit is contained in:
Dave Hickin
2015-10-16 15:46:56 +01:00
parent 51d4d270cd
commit bab0d964ab
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nt/ntscalarArray.cpp
View File

@ -18,6 +18,16 @@ static NTFieldPtr ntField = NTField::get();
namespace detail {
NTScalarArrayBuilder::shared_pointer NTScalarArrayBuilder::value(
epics::pvData::ScalarType elementType
)
{
valueType = elementType;
valueTypeSet = true;
return shared_from_this();
}
NTScalarArrayBuilder::shared_pointer NTScalarArrayBuilder::arrayValue(
epics::pvData::ScalarType elementType
)
@ -129,15 +139,15 @@ NTScalarArrayBuilder::shared_pointer NTScalarArrayBuilder::add(string const & na
const std::string NTScalarArray::URI("epics:nt/NTScalarArray:1.0");
NTScalarArray::shared_pointer NTScalarArray::wrap(PVStructurePtr const & structure)
NTScalarArray::shared_pointer NTScalarArray::wrap(PVStructurePtr const & pvStructure)
{
if(!isCompatible(structure)) return shared_pointer();
return wrapUnsafe(structure);
if(!isCompatible(pvStructure)) return shared_pointer();
return wrapUnsafe(pvStructure);
}
NTScalarArray::shared_pointer NTScalarArray::wrapUnsafe(PVStructurePtr const & structure)
NTScalarArray::shared_pointer NTScalarArray::wrapUnsafe(PVStructurePtr const & pvStructure)
{
return shared_pointer(new NTScalarArray(structure));
return shared_pointer(new NTScalarArray(pvStructure));
}
bool NTScalarArray::is_a(StructureConstPtr const & structure)

6
test/nt/ntscalarArrayTest.cpp
View File

@ -23,7 +23,7 @@ void test_builder()
testOk(builder.get() != 0, "Got builder");
StructureConstPtr structure = builder->
arrayValue(pvDouble)->
value(pvDouble)->
addDescriptor()->
addAlarm()->
addTimeStamp()->
@ -75,7 +75,7 @@ void test_ntscalarArray()
testOk(builder.get() != 0, "Got builder");
NTScalarArrayPtr ntScalarArray = builder->
arrayValue(pvInt)->
value(pvInt)->
addDescriptor()->
addAlarm()->
addTimeStamp()->
@ -220,7 +220,7 @@ void test_wrap()
testOk(builder.get() != 0, "Got builder");
PVStructurePtr pvStructure = builder->
arrayValue(pvDouble)->
value(pvDouble)->
createPVStructure();
testOk1(pvStructure.get() != 0);
if (!pvStructure)