From b90e6509861bce61699a5ad35b922c6b5f826e4b Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 21 Mar 2011 18:13:28 +0000 Subject: QPID-3116: rubygen with ruby 1.9 Fix name mangling for reserved "type" symbol to work on ruby 1.8 and 1.9. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.10@1083889 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/rubygen/amqpgen.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qpid/cpp/rubygen/amqpgen.rb b/qpid/cpp/rubygen/amqpgen.rb index 69e65a4056..20aac35194 100755 --- a/qpid/cpp/rubygen/amqpgen.rb +++ b/qpid/cpp/rubygen/amqpgen.rb @@ -61,7 +61,8 @@ end class Module # Add trailing _ to avoid conflict with Object methods. def mangle(sym) - (Object.method_defined? sym) ? (sym.to_s+"_").intern : sym + sym = (sym.to_s+"_").to_sym if (Object.method_defined?(sym) or sym == :type) + sym end # Add attribute reader for XML attribute. -- cgit v1.2.1