1 files changed, 13 insertions, 7 deletions
diff --git a/qpid/cpp/src/qpid/framing/FieldTable.cpp b/qpid/cpp/src/qpid/framing/FieldTable.cpp
index bc832e9db4..255a3b74a4 100644
--- a/qpid/cpp/src/qpid/framing/FieldTable.cpp
+++ b/qpid/cpp/src/qpid/framing/FieldTable.cpp
@@ -185,13 +185,8 @@ template <class T, int width, uint8_t typecode>
 bool getRawFixedWidthValue(FieldTable::ValuePtr vptr, T& value) 
 {
     if (vptr && vptr->getType() == typecode) {
-        FixedWidthValue<width>* fwv = dynamic_cast< FixedWidthValue<width>* >(&vptr->getData());
-        if (fwv) {
-            uint8_t* const octets = Endian::convertIfRequired(fwv->rawOctets(), width);
-            uint8_t* const target = reinterpret_cast<uint8_t*>(&value);
-            for (uint i = 0; i < width; ++i) target[i] = octets[i];
-            return true;
-        }
+        value = vptr->get<T>();
+        return true;
     }
     return false;
 }
@@ -370,5 +365,16 @@ void FieldTable::erase(const std::string& name)
         values.erase(name);
 }
 
+std::pair<FieldTable::ValueMap::iterator, bool> FieldTable::insert(const ValueMap::value_type& value)
+{
+    return values.insert(value);
+}
+
+FieldTable::ValueMap::iterator FieldTable::insert(ValueMap::iterator position, const ValueMap::value_type& value)
+{
+    return values.insert(position, value);
+}
+
+
 }
 }