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

Merge pull request #8 from dhickin/move_getSubFieldT_def_from_class_body

Browse Source 
Move getSubFieldT definitions out of class body
This commit is contained in:
dhickin
2015-09-01 17:03:14 +01:00
parent f22cefba97 52bc6d060d
commit 973fbeeba5
1 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/pv/pvData.h
View File

@@ -757,20 +757,8 @@ public:
}
template<typename PVT>
std::tr1::shared_ptr<PVT> getSubFieldT(const char *name) const
{
std::tr1::shared_ptr<PVT> pvField = std::tr1::dynamic_pointer_cast<PVT>(
getSubFieldImpl(name)->shared_from_this());
std::tr1::shared_ptr<PVT> getSubFieldT(const char *name) const;
if (pvField.get())
return pvField;
else
{
std::stringstream ss;
ss << "Failed to get field: " << name << " (Field has wrong type)";
throw std::runtime_error(ss.str());
}
}
/**
* Get the subfield with the specified offset.
* @param fieldOffset The offset.
@@ -786,20 +774,7 @@ public:
* @throws std::runtime_error if the requested sub-field doesn't exist, or has a different type
*/
template<typename PVT>
std::tr1::shared_ptr<PVT> getSubFieldT(std::size_t fieldOffset) const
{
std::tr1::shared_ptr<PVT> pvField = std::tr1::dynamic_pointer_cast<PVT>(
getSubFieldT(fieldOffset));
if (pvField.get())
return pvField;
else
{
std::stringstream ss;
ss << "Failed to get field with offset "
<< fieldOffset << " (Field has wrong type)";
throw std::runtime_error(ss.str());
}
}
std::tr1::shared_ptr<PVT> getSubFieldT(std::size_t fieldOffset) const;
/**
* Serialize.
@@ -879,6 +854,38 @@ private:
};
template<typename PVT>
std::tr1::shared_ptr<PVT> PVStructure::getSubFieldT(const char *name) const
{
std::tr1::shared_ptr<PVT> pvField = std::tr1::dynamic_pointer_cast<PVT>(
getSubFieldImpl(name)->shared_from_this());
if (pvField.get())
return pvField;
else
{
std::stringstream ss;
ss << "Failed to get field: " << name << " (Field has wrong type)";
throw std::runtime_error(ss.str());
}
}
template<typename PVT>
std::tr1::shared_ptr<PVT> PVStructure::getSubFieldT(std::size_t fieldOffset) const
{
std::tr1::shared_ptr<PVT> pvField = std::tr1::dynamic_pointer_cast<PVT>(
getSubFieldT(fieldOffset));
if (pvField.get())
return pvField;
else
{
std::stringstream ss;
ss << "Failed to get field with offset "
<< fieldOffset << " (Field has wrong type)";
throw std::runtime_error(ss.str());
}
}
/**
* @brief PVUnion has a single subfield.
*