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

add == for introspection; == of PVField is done in base class via convert.

Browse Source 
Make monitorQueue compatible with monitor, i.e. shared_pointer
This commit is contained in:
Marty Kraimer
2011-04-27 08:27:10 -04:00
parent b45b965f14
commit 95ae684d3d
25 changed files with 157 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pvDataApp/factory/PVDataCreateFactory.cpp
View File

@@ -42,8 +42,6 @@ public:
SerializableControl *pflusher) const;
virtual void deserialize(ByteBuffer *pbuffer,
DeserializableControl *pflusher);
virtual bool operator==(PVField& pv) ;
virtual bool operator!=(PVField& pv) ;
private:
T value;
};
@@ -78,18 +76,6 @@ void BasePVScalar<T>::deserialize(ByteBuffer *pbuffer,
value = pbuffer->get<T>();
}
template<typename T>
bool BasePVScalar<T>::operator==(PVField& pvField)
{
return getConvert()->equals(this, &pvField);
}
template<typename T>
bool BasePVScalar<T>::operator!=(PVField& pvField)
{
return !(getConvert()->equals(this, &pvField));
}
typedef BasePVScalar<bool> BasePVBoolean;
typedef BasePVScalar<int8> BasePVByte;
typedef BasePVScalar<int16> BasePVShort;
@@ -115,8 +101,6 @@ public:
DeserializableControl *pflusher);
virtual void serialize(ByteBuffer *pbuffer,
SerializableControl *pflusher, int offset, int count) const;
virtual bool operator==(PVField& pv) ;
virtual bool operator!=(PVField& pv) ;
private:
String value;
};
@@ -160,22 +144,6 @@ void BasePVString::serialize(ByteBuffer *pbuffer,
SerializeHelper::serializeSubstring(value, offset, count, pbuffer, pflusher);
}
bool BasePVString::operator==(PVField& pvField)
{
return getConvert()->equals(this, &pvField);
}
bool BasePVString::operator!=(PVField& pvField)
{
return !(getConvert()->equals(this, &pvField));
}
/** Default storage for arrays
*/
template<typename T>
@@ -197,8 +165,6 @@ public:
virtual void deserialize(ByteBuffer *pbuffer,DeserializableControl *pflusher);
virtual void serialize(ByteBuffer *pbuffer,
SerializableControl *pflusher, int offset, int count) const;
virtual bool operator==(PVField& pv) ;
virtual bool operator!=(PVField& pv) ;
private:
pointer value;
};
@@ -346,18 +312,6 @@ void DefaultPVArray<T>::serialize(ByteBuffer *pbuffer,
}
}
template<typename T>
bool DefaultPVArray<T>::operator==(PVField& pv)
{
return getConvert()->equals(this, &pv);
}
template<typename T>
bool DefaultPVArray<T>::operator!=(PVField& pv)
{
return !(getConvert()->equals(this, &pv));
}
// specializations for String
template<>