Multi version support part 2.

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

6 files changed, 14 insertions, 3 deletions

diff --git a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index 64471e4d61..e7a9bb1933 100644
--- a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
@@ -38,6 +38,8 @@
 namespace qpid {
 namespace framing {
 
+class AMQP_ClientProxy;
+
 class AMQP_ClientOperations
 {
 protected:
@@ -46,7 +48,7 @@ protected:
 
 public:
     AMQP_ClientOperations(u_int8_t major, u_int8_t minor) : version(major, minor) {}
-    AMQP_ClientOperations(ProtocolVersion version) : version(version) {}
+    AMQP_ClientOperations(ProtocolVersion& version) : version(version) {}
     virtual ~AMQP_ClientOperations() {}
 
     inline u_int8_t getMajor() const { return version.getMajor(); }
diff --git a/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl b/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
index b9d8263cea..8cca6e5cec 100644
--- a/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
+++ b/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
@@ -37,6 +37,7 @@ namespace framing {
 
 AMQP_ClientProxy::AMQP_ClientProxy(OutputHandler* out, u_int8_t major, u_int8_t minor) :
 %{CLIST} ${cpc_constructor_initializer}
+        
 {}
 
 	// Inner class instance get methods
diff --git a/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index 6773fab5c6..b5b11b4dc9 100644
--- a/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
@@ -39,11 +39,14 @@ namespace framing {
 class AMQP_ClientProxy : public AMQP_ClientOperations
 {
 private:
+    
+    ProtocolVersion version;
     OutputHandler* out;
 %{CLIST} ${cph_handler_pointer_defn}
 
 public:
     AMQP_ClientProxy(OutputHandler* out, u_int8_t major, u_int8_t minor);
+    ProtocolVersion& getProtocolVersion() {return version;}
     virtual ~AMQP_ClientProxy() {}
 
 	// Get methods for handlers
diff --git a/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
index 5728a4ce31..b55705b980 100644
--- a/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
@@ -38,6 +38,9 @@
 namespace qpid {
 namespace framing {
 
+class AMQP_ServerProxy;
+class AMQP_ClientProxy;
+
 class AMQP_ServerOperations
 {
 protected:
@@ -46,7 +49,7 @@ protected:
 
 public:
     AMQP_ServerOperations(u_int8_t major, u_int8_t minor) : version(major, minor) {}
-    AMQP_ServerOperations(ProtocolVersion version) : version(version) {}
+    AMQP_ServerOperations(ProtocolVersion& version) : version(version) {}
     virtual ~AMQP_ServerOperations() {}
 
     inline u_int8_t getMajor() const { return version.getMajor(); }
diff --git a/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index 5f808982fa..c0acf6222e 100644
--- a/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
@@ -39,11 +39,13 @@ namespace framing {
 class AMQP_ServerProxy : public AMQP_ServerOperations
 {
 private:
+    ProtocolVersion version;
     OutputHandler* out;
 %{CLIST} ${sph_handler_pointer_defn}
 
 public:
     AMQP_ServerProxy(OutputHandler* out, u_int8_t major, u_int8_t minor);
+    ProtocolVersion& getProtocolVersion() {return version;}
     virtual ~AMQP_ServerProxy() {}
 
 	// Get methods for handlers
diff --git a/gentools/templ.cpp/MethodBodyClass.h.tmpl b/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 50c8feebac..1edd938d3d 100644
--- a/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/gentools/templ.cpp/MethodBodyClass.h.tmpl
@@ -58,7 +58,7 @@ public:
 ${mb_constructor_with_initializers}
 
     inline ${CLASS}${METHOD}Body(u_int8_t major, u_int8_t minor): AMQMethodBody(major, minor) {}
-    inline ${CLASS}${METHOD}Body(ProtocolVersion version): AMQMethodBody(version) {}
+    inline ${CLASS}${METHOD}Body(ProtocolVersion& version): AMQMethodBody(version) {}
     virtual ~${CLASS}${METHOD}Body() {}
     
     // Attribute get methods