Patches from Andrew Stitcher to fix QPID-140, QPID-141.

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

1 files changed, 11 insertions, 7 deletions

diff --git a/cpp/src/qpid/framing/AMQFrame.cpp b/cpp/src/qpid/framing/AMQFrame.cpp
index b58bc93545..df4d2574b4 100644
--- a/cpp/src/qpid/framing/AMQFrame.cpp
+++ b/cpp/src/qpid/framing/AMQFrame.cpp
@@ -24,20 +24,24 @@
 
 using namespace qpid::framing;
 
-// AMQP version management change - kpvdr 2006-11-17
-// TODO: Make this class version-aware and link these hard-wired numbers to that version
-AMQFrame::AMQFrame() : versionMap(8, 0) {}
+// This only works as a static as the version is currently fixed to 8.0
+// TODO: When the class is version-aware this will need to change
+AMQP_MethodVersionMap AMQFrame::versionMap(8,0);
+
+// AMQP version management change - kpvdr 2-11-17
+// TODO: Make this class version-aware
+AMQFrame::AMQFrame() {}
 
 // AMQP version management change - kpvdr 2006-11-17
-// TODO: Make this class version-aware and link these hard-wired numbers to that version
+// TODO: Make this class version-aware
 AMQFrame::AMQFrame(u_int16_t _channel, AMQBody* _body) :
-channel(_channel), body(_body), versionMap(8, 0)
+channel(_channel), body(_body)
 {}
 
 // AMQP version management change - kpvdr 2006-11-17
-// TODO: Make this class version-aware and link these hard-wired numbers to that version
+// TODO: Make this class version-aware
 AMQFrame::AMQFrame(u_int16_t _channel, AMQBody::shared_ptr& _body) :
-channel(_channel), body(_body), versionMap(8, 0)
+channel(_channel), body(_body)
 {}
 
 AMQFrame::~AMQFrame() {}