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

PVStructure::getNumberFields != Structure::getNumberFields

Browse Source 
Apparently PVStructure::getNumberFields is one indexed???
This commit is contained in:
Michael Davidsaver
2013-05-01 12:18:21 -04:00
parent 61e8024c65
commit 00ac5bf64f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvDataApp/factory/Compare.cpp
+4 -2
View File
@@ -171,13 +171,15 @@ bool compareField(PVScalarArray* left, PVScalarArray* right)
bool compareField(PVStructure* left, PVStructure* right) bool compareField(PVStructure* left, PVStructure* right)
{ {
if(left->getStructure()!=right->getStructure()) StructureConstPtr ls = left->getStructure();
if(*ls!=*right->getStructure())
return false; return false;
const PVFieldPtrArray& lf = left->getPVFields(); const PVFieldPtrArray& lf = left->getPVFields();
const PVFieldPtrArray& rf = right->getPVFields(); const PVFieldPtrArray& rf = right->getPVFields();
for(size_t i=0, nfld=left->getNumberFields(); i<nfld; i++) { for(size_t i=0, nfld=ls->getNumberFields(); i<nfld; i++) {
if(*lf[i]!=*rf[i]) if(*lf[i]!=*rf[i])
return false; return false;
} }
pvDataApp/factory/printer.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ void PrinterBase::impl_print(const PVField& pv)
const PVFieldPtrArray& vals = fld.getPVFields(); const PVFieldPtrArray& vals = fld.getPVFields();
beginStructure(fld); beginStructure(fld);
for(size_t i=0, nfld=fld.getNumberFields(); i<nfld; i++) for(size_t i=0, nfld=fld.getStructure()->getNumberFields(); i<nfld; i++)
this->print(*vals[i]); this->print(*vals[i]);
endStructure(fld); endStructure(fld);
} }