svn commit: r586054 - in /incubator/qpid/trunk/qpid/cpp/src/qpid/framing: FieldValue.cpp FieldValue.h

[astitcher]

Author: astitcher
Date: Thu Oct 18 11:30:07 2007
New Revision: 586054

URL: http://svn.apache.org/viewvc?rev=586054&view=rev
Log:
More rearranging of template specialisation to avoid gccisms and conform 
correctly to the standard

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.cpp?rev=586054&r1=586053&r2=586054&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.cpp Thu Oct 18 
11:30:07 2007
@@ -82,30 +82,6 @@
     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);

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h?rev=586054&r1=586053&r2=586054&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h Thu Oct 18 
11:30:07 2007
@@ -78,6 +78,18 @@
     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;