Avoid clash with built-in ruby function Object.methods():n

 - Renamed methods*() to amqp_methods, classes*() to amqp_classes.
 - Renamed CppGen.class_() to cpp_class.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/qpid/cpp/rubygen/templates/ClassBodyVariant.rb b/qpid/cpp/rubygen/templates/ClassBodyVariant.rb
index a1dada40a5..dce14c5652 100755
--- a/qpid/cpp/rubygen/templates/ClassBodyVariant.rb
+++ b/qpid/cpp/rubygen/templates/ClassBodyVariant.rb
@@ -10,18 +10,18 @@ class ClassBodyVariant < CppGen
 
   def class_body(c)
     h_file (c.body_name) { 
-      c.methods.each { |m| genl "#include \"#{m.body_name}.h\""; }
+      c.amqp_methods.each { |m| genl "#include \"#{m.body_name}.h\""; }
       genl
       genl "#include <boost/visitor.hpp>"
       genl
       gen "typedef boost::variant<"
-      indent { genl c.methods().collect { |m| m.body_name }.join(",\n") }
+      indent { genl c.amqp_methods().collect { |m| m.body_name }.join(",\n") }
       genl ">  #{c.body_name};"
     }
   end
 
   def generate()
-    @amqp.classes.each{ |c| class_body c }
+    @amqp.amqp_classes.each{ |c| class_body c }
   end
 end