2 files changed, 39 insertions, 26 deletions
diff --git a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index bdc3d6c694..b8010896a7 100644
--- a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
@@ -34,16 +34,28 @@ namespace framing {
 
 class AMQP_ClientOperations
 {
-    public:
-        AMQP_ClientOperations() {}
-        virtual ~AMQP_ClientOperations() {}
-{so_get_amqp_major}
-{so_get_amqp_minor}
+private:
+    u_int8_t major;
+    u_int8_t minor;
 
-	// Method handler get methods
-{CLIST} {co_method_handler_get_method}
+public:
+    AMQP_ClientOperations(u_int8_t major, u_int8_t minor) : major(major), minor(minor) {}
+    virtual ~AMQP_ClientOperations() {}
 
-{CLIST} {co_cleint method_inner_class}
+    inline u_int8_t getMajor() { return major; }
+    inline u_int8_t getMinor() { return minor; }
+    inline isVersion(u_int8_t _major, u_int8_t _minor)
+    {
+        return major == _major && minor == _minor;
+    }
+
+    // Method handler get methods
+
+%{CLIST} ${coh_method_handler_get_method}
+
+    // Inner classes
+
+%{CLIST} ${coh_inner_class}
 
 }; /* class AMQP_ClientOperations */
 
diff --git a/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
index 80c6c0f5ab..b1d1c98b25 100644
--- a/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
@@ -34,27 +34,28 @@ namespace framing {
 
 class AMQP_ServerOperations
 {
-	private:
-		u_int8_t major;
-		u_int8_t minor;
-    public:
-        AMQP_ServerOperations(u_int8_t major, u_int8_t minor) : major(major), minor(minor) {}
-        virtual ~AMQP_ServerOperations() {}
-        
-        inline u_int8_t getMajor() { return major; }
-        inline u_int8_t getMinor() { return minor; }
-        inline isVersion(u_int8_t _major, u_int8_t _minor)
-        {
-        	return major == _major && minor == _minor;
-        }
+private:
+    u_int8_t major;
+    u_int8_t minor;
 
-		// Method handler get methods
-	
-%{CLIST} ${co_method_handler_get_method}
+public:
+    AMQP_ServerOperations(u_int8_t major, u_int8_t minor) : major(major), minor(minor) {}
+    virtual ~AMQP_ServerOperations() {}
 
-		// Inner classes
+    inline u_int8_t getMajor() { return major; }
+    inline u_int8_t getMinor() { return minor; }
+    inline isVersion(u_int8_t _major, u_int8_t _minor)
+    {
+        return major == _major && minor == _minor;
+    }
 
-%{CLIST} ${co_server_method_inner_class}
+    // Method handler get methods
+
+%{CLIST} ${soh_method_handler_get_method}
+
+    // Inner classes
+
+%{CLIST} ${soh_inner_class}
 
 }; /* class AMQP_ServerOperations */