Make getSubFieldT return shared pointer

Signed-off-by: Dave Hickin <david.hickin@diamond.ac.uk>
2015-07-13 12:48:05 +01:00
parent 9827caa3e3
commit ac2b6ea8db
5 changed files with 33 additions and 30 deletions
--- a/src/factory/PVStructure.cpp
+++ b/src/factory/PVStructure.cpp
@@ -134,11 +134,11 @@ PVFieldPtr  PVStructure::getSubField(size_t fieldOffset) const
    throw std::logic_error("PVStructure.getSubField: Logic error");
 }

-PVField& PVStructure::getSubFieldT(std::size_t fieldOffset) const
+PVFieldPtr PVStructure::getSubFieldT(std::size_t fieldOffset) const
 {
-    PVField * raw = getSubField(fieldOffset).get();
-    if (raw)
-        return *raw;
+    PVFieldPtr pvField = getSubField(fieldOffset);
+    if (pvField.get())
+        return pvField;
    else
    {
        std::stringstream ss;