X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=java_strings.py;h=c83ee8269257f6a5c66e9f3bbe15cdb26cc3f98b;hb=99606785a06b710cd4e97f5f3e5464e50d449d72;hp=7ae38a14242d64cf0707676fa830065633cf0707;hpb=fa74d578e4e0b8d629a16d6baaba0c78b1d7ffe2;p=ldk-java diff --git a/java_strings.py b/java_strings.py index 7ae38a14..c83ee826 100644 --- a/java_strings.py +++ b/java_strings.py @@ -54,7 +54,7 @@ public class bindings { self.common_base = """package org.ldk.structs; import java.util.LinkedList; class CommonBase { - long ptr; + final long ptr; LinkedList ptrs_to = new LinkedList(); protected CommonBase(long ptr) { this.ptr = ptr; } public long _test_only_get_ptr() { return this.ptr; } @@ -552,9 +552,6 @@ import java.util.Arrays; if fn_line.ret_ty_info.from_hu_conv[1] != "": java_trait_constr = java_trait_constr + "\t\t\t\t" + fn_line.ret_ty_info.from_hu_conv[1].replace("this", "impl_holder.held") + ";\n" #if fn_line.ret_ty_info.rust_obj in result_types: - # XXX: We need to handle this in conversion logic so that its cross-language! - # Avoid double-free by breaking the result - we should learn to clone these and then we can be safe instead - # java_trait_constr = java_trait_constr + "\t\t\t\tret.ptr = 0;\n" java_trait_constr = java_trait_constr + "\t\t\t\treturn result;\n" else: java_trait_constr = java_trait_constr + "\t\t\t\treturn ret;\n"