1 files changed, 11 insertions, 2 deletions
diff --git a/cpp/rubygen/cppgen.rb b/cpp/rubygen/cppgen.rb
index ceda5e039c..2590d48f7b 100755
--- a/cpp/rubygen/cppgen.rb
+++ b/cpp/rubygen/cppgen.rb
@@ -97,12 +97,13 @@ class AmqpField
   def cppname() name.lcaps.cppsafe; end
   def cpptype() domain.cpptype;  end
   def bit?() domain.type_ == "bit"; end
+  def signature() cpptype.param+" "+cppname; end
 end
 
 class AmqpMethod
   def cppname() name.lcaps.cppsafe; end
   def param_names() fields.map { |f| f.cppname }; end
-  def signature() fields.map { |f| f.cpptype.param+" "+f.cppname }; end
+  def signature() fields.map { |f| f.signature }; end
   def body_name() parent.name.caps+name.caps+"Body"; end
 end
 
@@ -197,7 +198,7 @@ class CppGen < Generator
     genl
     yield
     genl
-    genl('}'*names.size+" // "+name)
+    genl('}'*names.size+" // namespace "+name)
     genl
   end
 
@@ -236,3 +237,11 @@ class CppGen < Generator
   end
 end
 
+# Fully-qualified class name
+class FqClass < Struct.new(:fqname,:namespace,:name,:file)
+  def initialize(fqclass)
+    names=fqclass.split "::"
+    super(fqclass, names[0..-2].join('::'), names[-1], names.join("/"))
+  end
+end
+