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

tempalte helpers; static initialization order

Browse Source
This commit is contained in:
Matej Sekoranja
2013-11-08 13:50:54 +01:00
parent 57b3e9a8b2
commit 1aff2ec112
8 changed files with 85 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pvDataApp/factory/PVStructureArray.cpp
View File

@@ -28,8 +28,9 @@ size_t PVStructureArray::append(size_t number)
StructureConstPtr structure = structureArray->getStructure();
PVDataCreatePtr pvDataCreate = getPVDataCreate();
for(svector::reverse_iterator it = data.rbegin(); number; ++it, --number)
*it = getPVDataCreate()->createPVStructure(structure);
*it = pvDataCreate->createPVStructure(structure);
size_t newLength = data.size();
@@ -148,6 +149,8 @@ void PVStructureArray::deserialize(ByteBuffer *pbuffer,
StructureConstPtr structure = structureArray->getStructure();
PVDataCreatePtr pvDataCreate = getPVDataCreate();
for(size_t i = 0; i<size; i++) {
pcontrol->ensureData(1);
size_t temp = pbuffer->getByte();
@@ -156,7 +159,7 @@ void PVStructureArray::deserialize(ByteBuffer *pbuffer,
}
else {
if(data[i].get()==NULL) {
data[i] = getPVDataCreate()->createPVStructure(structure);
data[i] = pvDataCreate->createPVStructure(structure);
}
data[i]->deserialize(pbuffer, pcontrol);
}