More rearranging of template specialisation to avoid gccisms and conform correctly to the standard

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@586054 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 12 insertions, 24 deletions

diff --git a/cpp/src/qpid/framing/FieldValue.cpp b/cpp/src/qpid/framing/FieldValue.cpp
index 71961fa98a..a7535ae4b9 100644
--- a/cpp/src/qpid/framing/FieldValue.cpp
+++ b/cpp/src/qpid/framing/FieldValue.cpp
@@ -82,30 +82,6 @@ void FieldValue::decode(Buffer& buffer)
     data->decode(buffer);
 }
 
-template<>
-bool FieldValue::convertsTo<int>() const
-{
-    return data->convertsToInt();
-}
-
-template<>
-bool FieldValue::convertsTo<string>() const
-{
-    return data->convertsToString();
-}
-
-template<>
-int FieldValue::get<int>() const
-{
-    return data->getInt();
-}
-
-template<>
-std::string FieldValue::get<std::string>() const
-{
-    return data->getString();
-}
-
 void FieldValue::encode(Buffer& buffer)
 {
     buffer.putOctet(typeOctet);
diff --git a/cpp/src/qpid/framing/FieldValue.h b/cpp/src/qpid/framing/FieldValue.h
index 171afb68d0..7e3d895b61 100644
--- a/cpp/src/qpid/framing/FieldValue.h
+++ b/cpp/src/qpid/framing/FieldValue.h
@@ -78,6 +78,18 @@ class FieldValue {
     std::auto_ptr<Data> data; 
 };
 
+template <>
+inline bool FieldValue::convertsTo<int>() const { return data->convertsToInt(); }
+
+template <>
+inline bool FieldValue::convertsTo<std::string>() const { return data->convertsToString(); }
+
+template <>
+inline int FieldValue::get<int>() const { return data->getInt(); }
+
+template <>
+inline std::string FieldValue::get<std::string>() const { return data->getString(); }
+
 inline std::ostream& operator<<(std::ostream& out, const FieldValue& v) {
     v.print(out);
     return out;