Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 80318 invoked from network); 17 Mar 2011 20:07:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Mar 2011 20:07:07 -0000 Received: (qmail 45225 invoked by uid 500); 17 Mar 2011 20:07:07 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 45205 invoked by uid 500); 17 Mar 2011 20:07:07 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 45198 invoked by uid 99); 17 Mar 2011 20:07:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Mar 2011 20:07:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Mar 2011 20:07:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E929238896F; Thu, 17 Mar 2011 20:06:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1082670 - /qpid/trunk/qpid/cpp/rubygen/amqpgen.rb Date: Thu, 17 Mar 2011 20:06:44 -0000 To: commits@qpid.apache.org From: aconway@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110317200644.6E929238896F@eris.apache.org> Author: aconway Date: Thu Mar 17 20:06:44 2011 New Revision: 1082670 URL: http://svn.apache.org/viewvc?rev=1082670&view=rev Log: QPID-3116: rubygen with ruby 1.9 Fix name mangling for reserved "type" symbol to work on ruby 1.8 and 1.9. Modified: qpid/trunk/qpid/cpp/rubygen/amqpgen.rb Modified: qpid/trunk/qpid/cpp/rubygen/amqpgen.rb URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb?rev=1082670&r1=1082669&r2=1082670&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/rubygen/amqpgen.rb (original) +++ qpid/trunk/qpid/cpp/rubygen/amqpgen.rb Thu Mar 17 20:06:44 2011 @@ -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. --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org