svn commit: r938194 - in /hadoop/zookeeper/branches/branch-3.3: CHANGES.txt src/java/main/org/apache/jute/compiler/JRecord.java

[ph...@apache.org]

Author: phunt
Date: Mon Apr 26 18:57:08 2010
New Revision: 938194

URL: http://svn.apache.org/viewvc?rev=938194&view=rev
Log:
ZOOKEEPER-738. zookeeper.jute.h fails to compile with -pedantic

Modified:
    hadoop/zookeeper/branches/branch-3.3/CHANGES.txt
    hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/jute/compiler/JRecord.java

Modified: hadoop/zookeeper/branches/branch-3.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/CHANGES.txt?rev=938194&r1=938193&r2=938194&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.3/CHANGES.txt (original)
+++ hadoop/zookeeper/branches/branch-3.3/CHANGES.txt Mon Apr 26 18:57:08 2010
@@ -18,6 +18,9 @@ BUGFIXES:
   ZOOKEEPER-631. zkpython's C code could do with a style clean-up
   (henry robinson via phunt)
 
+  ZOOKEEPER-738. zookeeper.jute.h fails to compile with -pedantic
+  (Jozef Hatala via phunt)
+
 Release 3.3.0 - 2010-03-24
 
 Non-backward compatible changes:

Modified: hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/jute/compiler/JRecord.java
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/jute/compiler/JRecord.java?rev=938194&r1=938193&r2=938194&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/jute/compiler/JRecord.java (original)
+++ hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/jute/compiler/JRecord.java Mon Apr 26 18:57:08 2010
@@ -114,7 +114,7 @@ public class JRecord extends JCompType {
                 String struct_name = JVector.extractVectorName(jvType);
                 if (vectorStructs.get(struct_name) == null) {
                     vectorStructs.put(struct_name, struct_name);
-                    h.write("struct " + struct_name + " {\n    int32_t count;\n" + jv.getElementType().genCDecl("*data") + ";\n};\n");
+                    h.write("struct " + struct_name + " {\n    int32_t count;\n" + jv.getElementType().genCDecl("*data") + "\n};\n");
                     h.write("int serialize_" + struct_name + "(struct oarchive *out, const char *tag, struct " + struct_name + " *v);\n");
                     h.write("int deserialize_" + struct_name + "(struct iarchive *in, const char *tag, struct " + struct_name + " *v);\n");
                     h.write("int allocate_" + struct_name + "(struct " + struct_name + " *v, int32_t len);\n");