Merge PR 'Changed signature of getFieldOrder'

justinmk · justinmk · commit 2f84fac917f4 · 2018-09-11T14:37:14.000+02:00
nativelibs4java#111
diff --git a/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNADeclarationsConverter.java b/jnaerator/src/main/java/com/ochafik/lang/jnaerator/JNADeclarationsConverter.java
@@ -946,7 +946,7 @@ private void addStructConstructors(Identifier structName, Struct structJavaClass
                         stat(methodCall(varRef(fieldOrderName), "addAll", selfList)),
                         new Statement.Return(varRef(fieldOrderName)));
             }
-            TypeRef listRef = typeRef(ident(List.class, expr(typeRef("?"))));
+            TypeRef listRef = typeRef(ident(List.class, expr(typeRef("java.lang.String"))));
             Function getFieldOrder = new Function(
                     Type.JavaMethod, ident(getFieldOrderName), listRef)
                     .setBody(getFieldOrderImpl).addModifiers(ModifierType.Protected);

Original file line number	Diff line number	Diff line change
`@@ -946,7 +946,7 @@ private void addStructConstructors(Identifier structName, Struct structJavaClass`
`946`	`946`	`stat(methodCall(varRef(fieldOrderName), "addAll", selfList)),`
`947`	`947`	`new Statement.Return(varRef(fieldOrderName)));`
`948`	`948`	`}`
`949`		`- TypeRef listRef = typeRef(ident(List.class, expr(typeRef("?"))));`
	`949`	`+ TypeRef listRef = typeRef(ident(List.class, expr(typeRef("java.lang.String"))));`
`950`	`950`	`Function getFieldOrder = new Function(`
`951`	`951`	`Type.JavaMethod, ident(getFieldOrderName), listRef)`
`952`	`952`	`.setBody(getFieldOrderImpl).addModifiers(ModifierType.Protected);`