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

use FieldBuilder::begin() and Field::build()

Browse Source
This commit is contained in:
Michael Davidsaver
2018-10-01 15:08:59 -07:00
parent 45265b4f9b
commit c3b0b49e3f
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/copy/createRequest.cpp
View File

@@ -318,7 +318,7 @@ struct CreateRequestImpl {
if (!request.empty()) removeBlanks(request);
if (request.empty())
{
return pvDataCreate->createPVStructure(fieldCreate->createStructure());
return fieldCreate->createStructure()->build();
}
size_t offsetRecord = request.find("record[");
size_t offsetField = request.find("field(");
@@ -437,7 +437,7 @@ struct CreateRequestImpl {
}
StructureConstPtr structure = fieldCreate->createStructure(names, fields);
if(!structure) throw std::invalid_argument("bad request " + crequest);
PVStructurePtr pvStructure = pvDataCreate->createPVStructure(structure);
PVStructurePtr pvStructure = structure->build();
for(size_t i=0; i<optionList.size(); ++i) {
OptionPair pair = optionList[i];
string name = pair.name;

6
src/copy/requestmapper.cpp
View File

@@ -36,14 +36,14 @@ PVStructurePtr PVRequestMapper::buildRequested() const
{
if(!typeRequested)
THROW_EXCEPTION2(std::logic_error, "No mapping compute()d");
return getPVDataCreate()->createPVStructure(typeRequested);
return typeRequested->build();
}
PVStructurePtr PVRequestMapper::buildBase() const
{
if(!typeBase)
THROW_EXCEPTION2(std::logic_error, "No mapping compute()d");
return getPVDataCreate()->createPVStructure(typeBase);
return typeBase->build();
}
void PVRequestMapper::compute(const PVStructure &base,
@@ -96,7 +96,7 @@ void PVRequestMapper::compute(const PVStructure &base,
}
{
PVStructurePtr proto(getPVDataCreate()->createPVStructure(temp.typeRequested));
PVStructurePtr proto(temp.typeRequested->build());
// base -> request may be sparce mapping
temp.base2req.resize(base.getNextFieldOffset());

2
src/pv/valueBuilder.cpp
View File

@@ -285,7 +285,7 @@ PVStructure::shared_pointer ValueBuilder::buildPVStructure() const
type = tbuild->createStructure();
}
PVStructure::shared_pointer root(getPVDataCreate()->createPVStructure(type));
PVStructure::shared_pointer root(type->build());
child_struct::storeStruct(*this, root);

14
testApp/pv/testPVData.cpp
View File

@@ -384,7 +384,7 @@ static void testRequest()
StructureConstPtr topStructure = fieldCreate->createStructure(
topNames,topFields);
cout << *topStructure << endl;
PVStructurePtr pvTop = pvDataCreate->createPVStructure(topStructure);
PVStructurePtr pvTop = topStructure->build();
cout << *pvTop << endl;
cout << *pvTop->getStructure() << endl;
PVStructurePtr xxx = pvTop->getSubField<PVStructure>("record");
@@ -522,7 +522,7 @@ static void testFieldAccess()
endNested()->
createStructure();
PVStructurePtr fld = pvDataCreate->createPVStructure(tdef);
PVStructurePtr fld = tdef->build();
PVIntPtr a = fld->getSubField<PVInt>("test");
testOk1(a.get() != NULL);
@@ -628,11 +628,11 @@ static void testFieldAccess()
static void testAnyScalar()
{
PVStructurePtr value(getPVDataCreate()->createPVStructure(getFieldCreate()->createFieldBuilder()
->add("a", pvInt)
->add("b", pvDouble)
->add("c", pvString)
->createStructure()));
PVStructurePtr value(FieldBuilder::begin()
->add("a", pvInt)
->add("b", pvDouble)
->add("c", pvString)
->createStructure()->build());
PVIntPtr a(value->getSubFieldT<PVInt>("a"));
PVDoublePtr b(value->getSubFieldT<PVDouble>("b"));

24
testApp/pv/testPVStructureArray.cpp
View File

@@ -38,7 +38,7 @@ static void testBasic()
StructureArrayConstPtr alarmtype(
fieldCreate->createStructureArray(standardField->alarm()));
PVStructureArrayPtr alarmarr(pvDataCreate->createPVStructureArray(alarmtype));
PVStructureArrayPtr alarmarr(alarmtype->build());
testOk1(alarmarr->getLength()==0);
@@ -69,7 +69,7 @@ static void testCompress()
StructureArrayConstPtr alarmtype(
fieldCreate->createStructureArray(standardField->alarm()));
PVStructureArrayPtr alarmarr(pvDataCreate->createPVStructureArray(alarmtype));
PVStructureArrayPtr alarmarr(alarmtype->build());
alarmarr->setLength(5);
@@ -85,10 +85,10 @@ static void testCompress()
PVStructureArray::svector contents(10);
contents[2] = pvDataCreate->createPVStructure(standardField->alarm());
contents[4] = pvDataCreate->createPVStructure(standardField->alarm());
contents[5] = pvDataCreate->createPVStructure(standardField->alarm());
contents[8] = pvDataCreate->createPVStructure(standardField->alarm());
contents[2] = standardField->alarm()->build();
contents[4] = standardField->alarm()->build();
contents[5] = standardField->alarm()->build();
contents[8] = standardField->alarm()->build();
PVStructureArray::const_svector scont(freeze(contents));
@@ -117,11 +117,11 @@ static void testRemove()
PVStructureArray::svector contents(10);
for(size_t i=0; i<contents.size(); i++)
contents[i] = pvDataCreate->createPVStructure(standardField->alarm());
contents[i] = standardField->alarm()->build();
StructureArrayConstPtr alarmtype(
fieldCreate->createStructureArray(standardField->alarm()));
PVStructureArrayPtr alarmarr(pvDataCreate->createPVStructureArray(alarmtype));
PVStructureArrayPtr alarmarr(alarmtype->build());
PVStructureArray::const_svector scont(freeze(contents));
@@ -147,10 +147,10 @@ static void testFromRaw()
testDiag("Test structure array external allocation for shared_vector");
PVStructurePtr* raw = new PVStructurePtr[4];
raw[0] = pvDataCreate->createPVStructure(standardField->alarm());
raw[1] = pvDataCreate->createPVStructure(standardField->alarm());
raw[2] = pvDataCreate->createPVStructure(standardField->alarm());
raw[3] = pvDataCreate->createPVStructure(standardField->alarm());
raw[0] = standardField->alarm()->build();
raw[1] = standardField->alarm()->build();
raw[2] = standardField->alarm()->build();
raw[3] = standardField->alarm()->build();
PVStructureArray::svector cont(raw, 1, 2);
}