diff options
| author | Alan Conway <aconway@apache.org> | 2007-08-09 14:39:07 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-08-09 14:39:07 +0000 |
| commit | dd7aef35baa0fcda7f19851aecac3225f9a7b4b7 (patch) | |
| tree | 80730c3bf9dbf130a79b450731a8e03f21db4ad7 /qpid/cpp/rubygen/templates/method_variants.rb | |
| parent | 61bc423099806cdfb952dfd730989e11a8ce106e (diff) | |
| download | qpid-python-dd7aef35baa0fcda7f19851aecac3225f9a7b4b7.tar.gz | |
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
Diffstat (limited to 'qpid/cpp/rubygen/templates/method_variants.rb')
| -rwxr-xr-x | qpid/cpp/rubygen/templates/method_variants.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qpid/cpp/rubygen/templates/method_variants.rb b/qpid/cpp/rubygen/templates/method_variants.rb index 0787657089..886c7559bb 100755 --- a/qpid/cpp/rubygen/templates/method_variants.rb +++ b/qpid/cpp/rubygen/templates/method_variants.rb @@ -24,10 +24,10 @@ class AmqpCppModelGen < CppGen def gen_class(c) varname="#{c.name.caps}Variant" - mtypes=c.methods.map { |m| m.body_name } + mtypes=c.amqp_methods.map { |m| m.body_name } typedef(blank_variant(mtypes), varname) genl - pairs=c.methods.map { |m| [m.index.to_i,m.body_name] } + pairs=c.amqp_methods.map { |m| [m.index.to_i,m.body_name] } gen_set_variant(varname, "MethodId", pairs, "%d is not a valid method index in class #{c.name}") mtypes.each { |t| @@ -38,8 +38,8 @@ class AmqpCppModelGen < CppGen def gen_all() varname="MethodVariant" - types=@amqp.classes.map { |c| "#{c.name.caps}Variant" } - pairs=@amqp.classes.map { |c| [c.index.to_i,"#{c.name.caps}Variant"] } + types=@amqp.amqp_classes.map { |c| "#{c.name.caps}Variant" } + pairs=@amqp.amqp_classes.map { |c| [c.index.to_i,"#{c.name.caps}Variant"] } typedef(blank_variant(types), varname) genl gen_set_variant(varname, "ClassId", pairs, @@ -48,7 +48,7 @@ class AmqpCppModelGen < CppGen def generate() h_file("qpid/framing/method_variants.h") { - @amqp.methods.each { |m| include "qpid/framing/#{m.body_name}.h"} + @amqp.amqp_methods.each { |m| include "qpid/framing/#{m.body_name}.h"} include "qpid/framing/amqp_types.h" include "qpid/QpidError.h" include "qpid/framing/variant.h" @@ -58,7 +58,7 @@ class AmqpCppModelGen < CppGen genl "// Metafunction returns class variant containing method T." genl "template <class T> struct ClassVariant {};" genl - @amqp.classes.each { |c| gen_class c } + @amqp.amqp_classes.each { |c| gen_class c } } namespace("qpid::framing") { gen_all |