Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B8455CDDF for ; Sat, 30 Jun 2012 06:44:36 +0000 (UTC) Received: (qmail 87282 invoked by uid 500); 30 Jun 2012 06:44:36 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 87215 invoked by uid 500); 30 Jun 2012 06:44:35 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 87199 invoked by uid 99); 30 Jun 2012 06:44:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Jun 2012 06:44:35 +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; Sat, 30 Jun 2012 06:44:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E419D23889BB for ; Sat, 30 Jun 2012 06:44:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1355654 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/main/org/apache/jute/compiler/JRecord.java Date: Sat, 30 Jun 2012 06:44:13 -0000 To: commits@zookeeper.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120630064413.E419D23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: phunt Date: Sat Jun 30 06:44:12 2012 New Revision: 1355654 URL: http://svn.apache.org/viewvc?rev=1355654&view=rev Log: ZOOKEEPER-1471. Jute generates invalid C++ code (Michi Mutsuzaki via phunt) Modified: zookeeper/branches/branch-3.4/CHANGES.txt zookeeper/branches/branch-3.4/src/java/main/org/apache/jute/compiler/JRecord.java Modified: zookeeper/branches/branch-3.4/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1355654&r1=1355653&r2=1355654&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/CHANGES.txt (original) +++ zookeeper/branches/branch-3.4/CHANGES.txt Sat Jun 30 06:44:12 2012 @@ -71,6 +71,9 @@ BUGFIXES: ZOOKEEPER-1236. Security uses proprietary Sun APIs (Adalberto Medeiros via phunt) + ZOOKEEPER-1471. Jute generates invalid C++ code + (Michi Mutsuzaki via phunt) + IMPROVEMENTS: ZOOKEEPER-1389. it would be nice if start-foreground used exec $JAVA Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/jute/compiler/JRecord.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/jute/compiler/JRecord.java?rev=1355654&r1=1355653&r2=1355654&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/main/org/apache/jute/compiler/JRecord.java (original) +++ zookeeper/branches/branch-3.4/src/java/main/org/apache/jute/compiler/JRecord.java Sat Jun 30 06:44:12 2012 @@ -99,7 +99,7 @@ public class JRecord extends JCompType { } public String genCppDecl(String fname) { - return " "+mName+" "+fname+";\n"; + return " "+ getCppNameSpace() + "::" + mName+" m"+fname+";\n"; } public String genJavaReadMethod(String fname, String tag) { @@ -320,9 +320,9 @@ public class JRecord extends JCompType { JField jf = i.next(); String name = jf.getName(); if (jf.getType() instanceof JBuffer) { - cc.write(" a_.serialize("+name+","+name+".length(),\""+jf.getTag()+"\");\n"); + cc.write(" a_.serialize(m"+name+",m"+name+".length(),\""+jf.getTag()+"\");\n"); } else { - cc.write(" a_.serialize("+name+",\""+jf.getTag()+"\");\n"); + cc.write(" a_.serialize(m"+name+",\""+jf.getTag()+"\");\n"); } cc.write(" bs_.reset("+fIdx+");\n"); } @@ -337,9 +337,9 @@ public class JRecord extends JCompType { JField jf = i.next(); String name = jf.getName(); if (jf.getType() instanceof JBuffer) { - cc.write(" { size_t len=0; a_.deserialize("+name+",len,\""+jf.getTag()+"\");}\n"); + cc.write(" { size_t len=0; a_.deserialize(m"+name+",len,\""+jf.getTag()+"\");}\n"); } else { - cc.write(" a_.deserialize("+name+",\""+jf.getTag()+"\");\n"); + cc.write(" a_.deserialize(m"+name+",\""+jf.getTag()+"\");\n"); } cc.write(" bs_.set("+fIdx+");\n"); } @@ -353,7 +353,7 @@ public class JRecord extends JCompType { JField jf = (JField) i.next(); JType type = jf.getType(); if (type instanceof JRecord) { - cc.write(" if (!"+jf.getName()+".validate()) return false;\n"); + cc.write(" if (!m"+jf.getName()+".validate()) return false;\n"); } } cc.write(" return true;\n"); @@ -364,7 +364,7 @@ public class JRecord extends JCompType { for (Iterator i = mFields.iterator(); i.hasNext();) { JField jf = i.next(); String name = jf.getName(); - cc.write(" && ("+name+" < peer_."+name+")\n"); + cc.write(" && (m"+name+" < peer_.m"+name+")\n"); } cc.write(" );\n"); cc.write("}\n"); @@ -374,7 +374,7 @@ public class JRecord extends JCompType { for (Iterator i = mFields.iterator(); i.hasNext();) { JField jf = i.next(); String name = jf.getName(); - cc.write(" && ("+name+" == peer_."+name+")\n"); + cc.write(" && (m"+name+" == peer_.m"+name+")\n"); } cc.write(" );\n"); cc.write("}\n");