summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2011-03-17 20:06:44 +0000
committerAlan Conway <aconway@apache.org>2011-03-17 20:06:44 +0000
commit703553fac60cb1f0fa891261bd65b966e1662903 (patch)
tree3a5f8d07e78b0126413cb1334255780d14749d70
parente92294fca79d1b6a61cb343160ef39b076b66b03 (diff)
downloadqpid-python-703553fac60cb1f0fa891261bd65b966e1662903.tar.gz
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/trunk@1082670 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xqpid/cpp/rubygen/amqpgen.rb3
1 files changed, 2 insertions, 1 deletions
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.