2 files changed, 5 insertions, 4 deletions
diff --git a/cpp/rubygen/templates/MethodBodyDefaultVisitor.rb b/cpp/rubygen/templates/MethodBodyDefaultVisitor.rb
index 2247c4d8a1..4944b10a84 100755
--- a/cpp/rubygen/templates/MethodBodyDefaultVisitor.rb
+++ b/cpp/rubygen/templates/MethodBodyDefaultVisitor.rb
@@ -13,19 +13,20 @@ class MethodBodyDefaultVisitorGen < CppGen
     h_file(@filename) {
       include "qpid/framing/MethodBodyConstVisitor"
       namespace(@namespace) { 
-        genl
+        genl "class AMQMethodBody;"
         cpp_class(@classname, "public MethodBodyConstVisitor") {
           genl "public:"
-          genl "virtual void defaultVisit() = 0;"
+          genl "virtual void defaultVisit(const AMQMethodBody&) = 0;"
           @amqp.methods_.each { |m|
             genl "virtual void visit(const #{m.body_name}&);" }
         }}}
 
     cpp_file(@filename) {
       include(@filename)
+      include("all_method_bodies.h")
       namespace(@namespace) {
         @amqp.methods_.each { |m|
-          genl "void #{@classname}::visit(const #{m.body_name}&) { defaultVisit(); }"
+          genl "void #{@classname}::visit(const #{m.body_name}& b) { defaultVisit(b); }"
         }}}
   end
 end
diff --git a/cpp/rubygen/templates/constants.rb b/cpp/rubygen/templates/constants.rb
index 7e212bd38a..45efb35353 100755
--- a/cpp/rubygen/templates/constants.rb
+++ b/cpp/rubygen/templates/constants.rb
@@ -14,7 +14,7 @@ class ConstantsGen < CppGen
     h_file("#{@dir}/constants") {
       namespace(@namespace) { 
         @amqp.constants.each { |c|
-          genl "inline const int #{c.name.shout} = #{c.value};"
+          genl "enum { #{c.name.shout} = #{c.value} };"
         }
       }
     }