From ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 21 Oct 2011 01:19:00 +0000 Subject: Undo bad merge from trunk - merged at wrong level. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/rubygen/amqpgen.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'cpp/rubygen/amqpgen.rb') diff --git a/cpp/rubygen/amqpgen.rb b/cpp/rubygen/amqpgen.rb index 88720cad5f..69e65a4056 100755 --- a/cpp/rubygen/amqpgen.rb +++ b/cpp/rubygen/amqpgen.rb @@ -61,8 +61,7 @@ end class Module # Add trailing _ to avoid conflict with Object methods. def mangle(sym) - sym = (sym.to_s+"_").to_sym if (Object.method_defined?(sym) or sym == :type) - sym + (Object.method_defined? sym) ? (sym.to_s+"_").intern : sym end # Add attribute reader for XML attribute. @@ -191,8 +190,7 @@ class AmqpElement "command-fragments" => "session.command-fragment", "in-doubt" => "dtx.xid", "tx-publish" => "str-8", - "queues" => "str-8", - "prepared" => "str-8" + "queues" => "str-8" } def array_type(name) -- cgit v1.2.1