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

remove Convert pointer from PVField

Browse Source 
Allow inline construction of Convert
This commit is contained in:
Michael Davidsaver
2013-05-08 10:31:36 -04:00
parent 9e8a6b6304
commit 461dbdf0f8
4 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pvDataApp/factory/PVField.cpp
View File

@@ -26,8 +26,7 @@ PVField::PVField(FieldConstPtr field)
: notImplemented("not implemented"),
parent(NULL),field(field),
fieldOffset(0), nextFieldOffset(0),
immutable(false),
convert(getConvert())
immutable(false)
{
}
@@ -175,7 +174,7 @@ void PVField::setParentAndName(PVStructure * xxx,String const & name)
bool PVField::equals(PVField &pv)
{
return convert->equals(*this,pv);
return pv==*this;
}
void PVField::toString(StringBuilder buf)
@@ -185,7 +184,7 @@ void PVField::toString(StringBuilder buf)
void PVField::toString(StringBuilder buf,int indentLevel)
{
convert->getString(buf,this,indentLevel);
Convert().getString(buf,this,indentLevel);
if(pvAuxInfo.get()!=NULL) pvAuxInfo->toString(buf,indentLevel);
}