3 files changed, 14 insertions, 9 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() {}
diff --git a/cpp/src/qpid/framing/AMQFrame.h b/cpp/src/qpid/framing/AMQFrame.h
index 29ee1250e1..aa6b2249aa 100644
--- a/cpp/src/qpid/framing/AMQFrame.h
+++ b/cpp/src/qpid/framing/AMQFrame.h
@@ -37,10 +37,11 @@ namespace qpid {
 
         class AMQFrame : virtual public AMQDataBlock
         {
+            static AMQP_MethodVersionMap versionMap;
+            
             u_int16_t channel;
             u_int8_t type;//used if the body is decoded separately from the 'head'
             AMQBody::shared_ptr body;
-            AMQP_MethodVersionMap versionMap;
 			AMQBody::shared_ptr createMethodBody(Buffer& buffer);
             
         public:
diff --git a/cpp/test/bin/topictest b/cpp/test/bin/topictest
index 44a279c363..792f063bea 100755
--- a/cpp/test/bin/topictest
+++ b/cpp/test/bin/topictest
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Run the c++ or java topic test
 
 . `dirname $0`/env