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

Merge pull request #10 from dhickin/remove_deprecated_getDerivedTypeField

Browse Source 
Remove deprecated PVStructure::get*Field Functions
This commit is contained in:
dhickin
2015-07-29 12:29:08 +01:00
parent d0a8d2b1cd ddebd494c6
commit 51f36b2281
2 changed files with 0 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/factory/PVStructure.cpp
View File

@@ -242,101 +242,6 @@ PVField* PVStructure::getSubFieldImpl(const char *name, bool throws) const
}
PVBooleanPtr PVStructure::getBooleanField(string const &fieldName)
{
return getSubField<PVBoolean>(fieldName);
}
PVBytePtr PVStructure::getByteField(string const &fieldName)
{
return getSubField<PVByte>(fieldName);
}
PVShortPtr PVStructure::getShortField(string const &fieldName)
{
return getSubField<PVShort>(fieldName);
}
PVIntPtr PVStructure::getIntField(string const &fieldName)
{
return getSubField<PVInt>(fieldName);
}
PVLongPtr PVStructure::getLongField(string const &fieldName)
{
return getSubField<PVLong>(fieldName);
}
PVUBytePtr PVStructure::getUByteField(string const &fieldName)
{
return getSubField<PVUByte>(fieldName);
}
PVUShortPtr PVStructure::getUShortField(string const &fieldName)
{
return getSubField<PVUShort>(fieldName);
}
PVUIntPtr PVStructure::getUIntField(string const &fieldName)
{
return getSubField<PVUInt>(fieldName);
}
PVULongPtr PVStructure::getULongField(string const &fieldName)
{
return getSubField<PVULong>(fieldName);
}
PVFloatPtr PVStructure::getFloatField(string const &fieldName)
{
return getSubField<PVFloat>(fieldName);
}
PVDoublePtr PVStructure::getDoubleField(string const &fieldName)
{
return getSubField<PVDouble>(fieldName);
}
PVStringPtr PVStructure::getStringField(string const &fieldName)
{
return getSubField<PVString>(fieldName);
}
PVStructurePtr PVStructure::getStructureField(string const &fieldName)
{
return getSubField<PVStructure>(fieldName);
}
PVUnionPtr PVStructure::getUnionField(string const &fieldName)
{
return getSubField<PVUnion>(fieldName);
}
PVScalarArrayPtr PVStructure::getScalarArrayField(
string const &fieldName,ScalarType elementType)
{
PVScalarArrayPtr arrayField = getSubField<PVScalarArray>(fieldName);
if (arrayField.get() &&
arrayField->getScalarArray()->getElementType()!=elementType)
{
return nullPVScalarArray;
}
return arrayField;
}
PVStructureArrayPtr PVStructure::getStructureArrayField(
string const &fieldName)
{
return getSubField<PVStructureArray>(fieldName);
}
PVUnionArrayPtr PVStructure::getUnionArrayField(
string const &fieldName)
{
return getSubField<PVUnionArray>(fieldName);
}
void PVStructure::serialize(ByteBuffer *pbuffer,
SerializableControl *pflusher) const {
size_t fieldsSize = pvFields.size();

122
src/pv/pvData.h
View File

@@ -801,128 +801,6 @@ public:
}
}
/**
* Get a boolean field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVBooleanPtr getBooleanField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a byte field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVBytePtr getByteField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a short field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVShortPtr getShortField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a int field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVIntPtr getIntField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a long field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVLongPtr getLongField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get an unsigned byte field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVUBytePtr getUByteField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get an unsigned short field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVUShortPtr getUShortField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get an unsigned int field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVUIntPtr getUIntField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get an unsigned long field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVULongPtr getULongField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a float field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVFloatPtr getFloatField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a double field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVDoublePtr getDoubleField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a string field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVStringPtr getStringField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a structure field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVStructurePtr getStructureField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a union field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVUnionPtr getUnionField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a scalarArray field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @param elementType The element type.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVScalarArrayPtr getScalarArrayField(
std::string const &fieldName,ScalarType elementType) USAGE_DEPRECATED;
/**
* Get a structureArray field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVStructureArrayPtr getStructureArrayField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Get a unionArray field with the specified name.
* @deprecated No longer needed. Use template version of getSubField
* @param fieldName The name of the field to get.
* @return Pointer to the field of null if a field with that name and type does not exist.
*/
PVUnionArrayPtr getUnionArrayField(std::string const &fieldName) USAGE_DEPRECATED;
/**
* Serialize.
* @param pbuffer The byte buffer.