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

null element handling for structure/union array

Browse Source
This commit is contained in:
Matej Sekoranja
2014-11-06 12:48:57 +01:00
parent c86e31ad99
commit 6117035863
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/factory/Compare.cpp
View File

@@ -251,7 +251,13 @@ bool compareField(const PVStructureArray* left, const PVStructureArray* right)
lit!=lend;
++lit, ++rit)
{
if(**lit != **rit)
// element can be null
if (!(*lit) || !(*rit))
{
if (*lit || *rit)
return false;
}
else if (**lit != **rit)
return false;
}
return true;
@@ -304,7 +310,13 @@ bool compareField(const PVUnionArray* left, const PVUnionArray* right)
lit!=lend;
++lit, ++rit)
{
if(**lit != **rit)
// element can be null
if (!(*lit) || !(*rit))
{
if (*lit || *rit)
return false;
}
else if (**lit != **rit)
return false;
}
return true;

9
src/factory/PVStructureArray.cpp
View File

@@ -232,8 +232,13 @@ std::ostream& PVStructureArray::dumpValue(std::ostream& o) const
std::ostream& PVStructureArray::dumpValue(std::ostream& o, std::size_t index) const
{
const_svector temp(view());
if(index<temp.size())
o << *temp[index];
if (index<temp.size())
{
if (temp[index])
o << *temp[index];
else
o << "(none)" << std::endl;
}
return o;
}

9
src/factory/PVUnionArray.cpp
View File

@@ -231,8 +231,13 @@ std::ostream& PVUnionArray::dumpValue(std::ostream& o) const
std::ostream& PVUnionArray::dumpValue(std::ostream& o, std::size_t index) const
{
const_svector temp(view());
if(index<temp.size())
o << *temp[index];
if (index<temp.size())
{
if (temp[index])
o << *temp[index];
else
o << "(none)" << std::endl;
}
return o;
}