From 0c920d920150351bbf98bc47a407817b8fff90b5 Mon Sep 17 00:00:00 2001 From: Fedor Chelnokov Date: Thu, 15 Oct 2026 21:38:06 +0300 Subject: [PATCH 1/2] Java: shorten the ffi class names too, and the test outputs to 64 characters The committed test outputs had paths up to 177 characters, 22 more than the Rust ones; a MeshInspector Windows runner checking out MeshLib's mrbind submodule went over MAX_PATH. The ffi classes are named after the C files, which the C generator truncates at 100 plus a hash, so they escaped the Java limit. The tests now pass --max-class-name-length 64 (max path 141). Co-Authored-By: Claude Fable 5.1 --- docs/generating_java.md | 2 +- src/generators/java/generator.cpp | 1 + test/make_java.sh | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/generating_java.md b/docs/generating_java.md index 4fb5b72d..36d5ab37 100644 --- a/docs/generating_java.md +++ b/docs/generating_java.md @@ -41,7 +41,7 @@ Where: * `--force-namespace MyLib` is optional, but you'll usually want it. It puts the entities of the global C++ namespace (which includes the `std::` container instantiations) into the package of this namespace (`com.example.mylib.mylib` here, `Foo::Bar` becomes `foo.bar`). Without it they go directly to the base package, next to the runtime classes. -Class names longer than 100 characters (some `std::function` instantiations) are truncated and suffixed with a hash, since each class is a file and Windows limits the path length. `--max-class-name-length` changes the limit, 0 disables it. +Class names longer than 100 characters (some `std::function` instantiations, and the `ffi` classes named after long C file names) are truncated and suffixed with a hash, since each class is a file and Windows limits the path length. `--max-class-name-length` changes the limit, 0 disables it. The generator prints a summary at the end: how many functions got wrappers, how many of those use raw C types, and how many were skipped because their C types can't be spelled in Java (`long double` and such). Pass `--verbose` to list the skipped ones. diff --git a/src/generators/java/generator.cpp b/src/generators/java/generator.cpp index 824a3a3d..1ef68422 100644 --- a/src/generators/java/generator.cpp +++ b/src/generators/java/generator.cpp @@ -214,6 +214,7 @@ namespace mrbind::Java } if (ret.idents.empty()) throw std::runtime_error("Bad relative file name in the input JSON: `" + file.relative_name + "`."); + ret.idents.back() = ShortenClassName(ret.idents.back()); ret.java_path = base_package + ".ffi." + JoinNameParts(ret.idents, "."); } else if (ret.group != file.group) diff --git a/test/make_java.sh b/test/make_java.sh index c87e7398..238a5540 100644 --- a/test/make_java.sh +++ b/test/make_java.sh @@ -6,6 +6,8 @@ shopt -s nullglob JAVA_BIN="${JAVA_HOME:+$JAVA_HOME/bin/}" +# The class names are shortened more than by default: the output paths here are long already, +# and Windows checkouts of this repo as a submodule are limited to 260 characters per path. build/mrbind_gen_java \ --input-json test/output_c/desc.json \ --output-dir test/output_java/src \ @@ -13,6 +15,7 @@ build/mrbind_gen_java \ --package mrbind_test \ --force-namespace MR::CS \ --imported-lib-name bleh \ + --max-class-name-length 64 \ build/mrbind_gen_java \ --input-json test/output_c_fixed_typedefs/desc.json \ @@ -21,6 +24,7 @@ build/mrbind_gen_java \ --package mrbind_test \ --force-namespace MR::CS \ --imported-lib-name bleh \ + --max-class-name-length 64 \ --imported-split-lib-name MR_A_ bleh_A \ --imported-split-lib-name MR_B_ bleh_B \ --imported-split-lib-name MR_AB_ bleh_AB \ @@ -32,6 +36,7 @@ build/mrbind_gen_java \ --package mrbind_test \ --force-namespace MR::CS \ --imported-lib-name bleh \ + --max-class-name-length 64 \ --imported-split-lib-name MR_AB_ bleh_AB \ # Compile each output. `javac` reads the list of sources from a file, the command line would be too long otherwise. From e044b5e1d3ea59c19f8bdd27412eb99c11e425d2 Mon Sep 17 00:00:00 2001 From: Fedor Chelnokov Date: Thu, 15 Oct 2026 21:56:22 +0300 Subject: [PATCH 2/2] Java: regenerate the test outputs with the shorter names Co-Authored-By: Claude Fable 5.1 --- ...from_MR_CSharp_ExposedLayo__90003873.java} | 4 +-- ...const_MR_CSharp_ExposedLay__1bab9140.java} | 4 +-- ...ue_ref_const_MR_CSharp_Exp__2c745d14.java} | 4 +-- ...f_float_ref_const_int_ref___843c200b.java} | 4 +-- ...alue_ref_const_std_string___80503fe8.java} | 4 +-- ..._string_ref_std_string_rva__d6d42941.java} | 4 +-- .../src/mrbind_test/mr/cs/Functions.java | 12 +++---- ...from_MR_CSharp_ExposedLayo__90003873.java} | 36 +++++++++---------- ...const_MR_CSharp_ExposedLay__1bab9140.java} | 14 ++++---- ...ue_ref_const_MR_CSharp_Exp__2c745d14.java} | 20 +++++------ ...f_float_ref_const_int_ref___1836f048.java} | 30 ++++++++-------- ...alue_ref_const_std_string___80503fe8.java} | 24 ++++++------- ..._string_ref_std_string_rva__d6d42941.java} | 18 +++++----- ..._MR_StdContainers_NonAssignable_float.java | 16 ++++----- ...Assignable_float_const_ite__97007713.java} | 14 ++++---- ..._MR_StdContainers_NonAssignable_float.java | 32 ++++++++--------- ...rs_NonAssignable_float_cons__8276285.java} | 16 ++++----- ...rs_NonAssignable_float_iter__8fb8fc8.java} | 12 +++---- ...ltiset_MR_StdContainers_NonAssignable.java | 16 ++++----- ...rs_NonAssignable_const_iter__8fb8fc8.java} | 12 +++---- ...StdContainers_NonDefaultConstructible.java | 18 +++++----- ...tConstructible_const_iterat__7063b67.java} | 14 ++++---- .../src/mrbind_test/mr/csharp/Functions.java | 16 ++++----- .../mr/csharp/TestStdFunction.java | 10 +++--- .../mr/stdtuplelike/Functions.java | 4 +-- ...from_MR_CSharp_ExposedLayo__90003873.java} | 4 +-- ...const_MR_CSharp_ExposedLay__1bab9140.java} | 4 +-- ...ue_ref_const_MR_CSharp_Exp__2c745d14.java} | 4 +-- ...t32_t_ref_float_ref_const___d1fce16b.java} | 4 +-- ...t_rvalue_ref_const_std_str__811a190d.java} | 4 +-- ..._std_string_ref_std_string__dea7a07a.java} | 4 +-- .../src/mrbind_test/mr/cs/Functions.java | 12 +++---- ...from_MR_CSharp_ExposedLayo__90003873.java} | 36 +++++++++---------- ...const_MR_CSharp_ExposedLay__1bab9140.java} | 14 ++++---- ...ue_ref_const_MR_CSharp_Exp__2c745d14.java} | 20 +++++------ ...t32_t_ref_float_ref_const___332c5840.java} | 30 ++++++++-------- ...t_rvalue_ref_const_std_str__f9497869.java} | 24 ++++++------- ..._std_string_ref_std_string__dea7a07a.java} | 18 +++++----- ..._MR_StdContainers_NonAssignable_float.java | 16 ++++----- ...Assignable_float_const_ite__97007713.java} | 14 ++++---- ..._MR_StdContainers_NonAssignable_float.java | 32 ++++++++--------- ...rs_NonAssignable_float_cons__8276285.java} | 16 ++++----- ...rs_NonAssignable_float_iter__8fb8fc8.java} | 12 +++---- ...ltiset_MR_StdContainers_NonAssignable.java | 16 ++++----- ...rs_NonAssignable_const_iter__8fb8fc8.java} | 12 +++---- ...StdContainers_NonDefaultConstructible.java | 18 +++++----- ...tConstructible_const_iterat__7063b67.java} | 14 ++++---- .../src/mrbind_test/mr/csharp/Functions.java | 16 ++++----- .../mr/csharp/TestStdFunction.java | 10 +++--- .../mr/stdtuplelike/Functions.java | 4 +-- ...from_MR_CSharp_ExposedLayo__90003873.java} | 4 +-- ...const_MR_CSharp_ExposedLay__1bab9140.java} | 4 +-- ...ue_ref_const_MR_CSharp_Exp__2c745d14.java} | 4 +-- ...f_float_ref_const_int_ref___843c200b.java} | 4 +-- ...alue_ref_const_std_string___80503fe8.java} | 4 +-- ..._string_ref_std_string_rva__d6d42941.java} | 4 +-- .../src/mrbind_test/mr/cs/Functions.java | 12 +++---- ...from_MR_CSharp_ExposedLayo__90003873.java} | 36 +++++++++---------- ...const_MR_CSharp_ExposedLay__1bab9140.java} | 14 ++++---- ...ue_ref_const_MR_CSharp_Exp__2c745d14.java} | 20 +++++------ ...f_float_ref_const_int_ref___1836f048.java} | 30 ++++++++-------- ...alue_ref_const_std_string___80503fe8.java} | 24 ++++++------- ..._string_ref_std_string_rva__d6d42941.java} | 18 +++++----- ..._MR_StdContainers_NonAssignable_float.java | 16 ++++----- ...Assignable_float_const_ite__97007713.java} | 14 ++++---- ..._MR_StdContainers_NonAssignable_float.java | 32 ++++++++--------- ...rs_NonAssignable_float_cons__8276285.java} | 16 ++++----- ...rs_NonAssignable_float_iter__8fb8fc8.java} | 12 +++---- ...ltiset_MR_StdContainers_NonAssignable.java | 16 ++++----- ...rs_NonAssignable_const_iter__8fb8fc8.java} | 12 +++---- ...StdContainers_NonDefaultConstructible.java | 18 +++++----- ...tConstructible_const_iterat__7063b67.java} | 14 ++++---- .../src/mrbind_test/mr/csharp/Functions.java | 16 ++++----- .../mr/csharp/TestStdFunction.java | 10 +++--- .../mr/stdtuplelike/Functions.java | 4 +-- 75 files changed, 537 insertions(+), 537 deletions(-) rename test/output_java/src/mrbind_test/ffi/{std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java => std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java} (98%) rename test/{output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java => output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java} (97%) rename test/{output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java => output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java} (97%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.java => output_java/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.java} (98%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java => output_java/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java} (97%) rename test/output_java/src/mrbind_test/ffi/{std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java => std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java} (98%) rename test/output_java/src/mrbind_test/mr/cs/{std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java => std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java} (73%) rename test/output_java/src/mrbind_test/mr/cs/{std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java => std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java} (77%) rename test/output_java/src/mrbind_test/mr/cs/{std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java => std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java} (74%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a.java => output_java/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048.java} (73%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java => output_java/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java} (73%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java => output_java/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java} (79%) rename test/{output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java => output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java} (93%) rename test/{output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java => output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java} (92%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java => output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java} (93%) rename test/output_java/src/mrbind_test/mr/cs/{std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java => std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java} (91%) rename test/output_java/src/mrbind_test/mr/cs/{std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java => std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java} (92%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java => output_java_fixed_typedefs/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java} (98%) rename test/{output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java => output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java} (97%) rename test/{output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java => output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java} (97%) rename test/output_java_fixed_typedefs/src/mrbind_test/ffi/{std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.java => std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.java} (98%) rename test/output_java_fixed_typedefs/src/mrbind_test/ffi/{std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.java => std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.java} (96%) rename test/output_java_fixed_typedefs/src/mrbind_test/ffi/{std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java => std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.java} (97%) rename test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/{std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java => std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java} (73%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java => output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java} (77%) rename test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/{std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java => std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java} (74%) rename test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/{std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t___a385e102.java => std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___332c5840.java} (72%) rename test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/{std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java => std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869.java} (73%) rename test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/{std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java => std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.java} (79%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java => output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java} (93%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java => output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java} (92%) rename test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/{std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java => std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java} (93%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java => output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java} (91%) rename test/{output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java => output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java} (92%) rename test/{output_java_fixed_typedefs/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java => output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java} (98%) rename test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/{std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java => std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java} (97%) rename test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/{std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java => std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java} (97%) rename test/{output_java/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.java => output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.java} (98%) rename test/{output_java/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java => output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java} (97%) rename test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/{std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java => std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java} (98%) rename test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/{std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java => std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java} (73%) rename test/{output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java => output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java} (77%) rename test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/{std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java => std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java} (74%) rename test/{output_java/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a.java => output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048.java} (73%) rename test/{output_java/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java => output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java} (73%) rename test/{output_java/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java => output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java} (79%) rename test/{output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java => output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java} (93%) rename test/{output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java => output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java} (92%) rename test/{output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java => output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java} (93%) rename test/{output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java => output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java} (91%) rename test/{output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java => output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java} (92%) diff --git a/test/output_java/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java b/test/output_java/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java similarity index 98% rename from test/output_java/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java rename to test/output_java/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java index 8bed5155..fab3483e 100644 --- a/test/output_java/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java +++ b/test/output_java/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC`. */ -public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC +public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 { - private std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC() {} + private std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java b/test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java similarity index 97% rename from test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java rename to test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java index 97fb581a..b17c6913 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java +++ b/test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref`. */ -public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref +public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140 { - private std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref() {} + private std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java b/test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java similarity index 97% rename from test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java rename to test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java index 4764212a..92a7af3d 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java +++ b/test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref`. */ -public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref +public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 { - private std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref() {} + private std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.java b/test/output_java/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.java similarity index 98% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.java rename to test/output_java/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.java index 743c7ec5..d0119ca4 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.java +++ b/test/output_java/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd`. */ -public final class std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd +public final class std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b { - private std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd() {} + private std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java b/test/output_java/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java similarity index 97% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java rename to test/output_java/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java index 5e31e992..602abe0e 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java +++ b/test/output_java/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref`. */ -public final class std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref +public final class std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8 { - private std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref() {} + private std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8() {} public static final class H0 { diff --git a/test/output_java/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java b/test/output_java/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java similarity index 98% rename from test/output_java/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java rename to test/output_java/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java index 90a276f0..5265e024 100644 --- a/test/output_java/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java +++ b/test/output_java/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref`. */ -public final class std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref +public final class std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941 { - private std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref() {} + private std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941() {} public static final class H0 { diff --git a/test/output_java/src/mrbind_test/mr/cs/Functions.java b/test/output_java/src/mrbind_test/mr/cs/Functions.java index 370c7484..a4677bb5 100644 --- a/test/output_java/src/mrbind_test/mr/cs/Functions.java +++ b/test/output_java/src/mrbind_test/mr/cs/Functions.java @@ -1963,7 +1963,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_set_float_const_iterator a, * * Calls `MR_C_sub_MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator()`. */ - public static long opSub(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator b) + public static long opSub(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 b) { try { @@ -1987,7 +1987,7 @@ public static long opSub(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaul * * Calls `MR_C_equal_MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 b) { try { @@ -2371,7 +2371,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_unordered_set_MR_StdContaine * * Calls `MR_C_equal_MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator a, mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 a, mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 b) { try { @@ -2491,7 +2491,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_multimap_MR_StdContainers_No * * Calls `MR_C_equal_MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator a, mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 a, mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 b) { try { @@ -2539,7 +2539,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_unordered_map_MR_StdContaine * * Calls `MR_C_equal_MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 b) { try { @@ -2563,7 +2563,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdCon * * Calls `MR_C_equal_MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 b) { try { diff --git a/test/output_java/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java b/test/output_java/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java similarity index 73% rename from test/output_java/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java rename to test/output_java/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java index 570af0ba..75405d5e 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC extends mrbind_test.CppObject +public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC::__destroy : null, owner);} + public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_DefaultConstruct()`. */ - public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC() + public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873() { this(__ctor_defaultConstruct(), true, null); } @@ -37,7 +37,7 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_DefaultConstruct.invokeExact(); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_DefaultConstruct.invokeExact(); mrbind_test.Ffi.checkException(); return __ret; } @@ -53,16 +53,16 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructFromAnother()`. */ - public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC other) + public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 other) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructFromAnother.invokeExact(mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructFromAnother.invokeExact(mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); return __ret; } @@ -82,11 +82,11 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC other) + public void assignFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 other) { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignFromAnother.invokeExact(rawPointer(), mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignFromAnother.invokeExact(rawPointer(), mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); } catch (java.lang.Throwable __e) @@ -109,7 +109,7 @@ public boolean has_value() { try { - boolean __ret = (boolean)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_has_value.invokeExact(rawPointer()); + boolean __ret = (boolean)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_has_value.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -132,7 +132,7 @@ public void reset() { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_reset.invokeExact(rawPointer()); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_reset.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); } catch (java.lang.Throwable __e) @@ -154,7 +154,7 @@ public mrbind_test.mr.csharp.ExposedLayoutC call(mrbind_test.mr.csharp.ExposedLa { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_call.invokeExact((java.lang.foreign.SegmentAllocator)java.lang.foreign.Arena.ofAuto(), rawPointer(), mrbind_test.Ffi.ptrNonNull(_1, "_1")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_call.invokeExact((java.lang.foreign.SegmentAllocator)java.lang.foreign.Arena.ofAuto(), rawPointer(), mrbind_test.Ffi.ptrNonNull(_1, "_1")); mrbind_test.Ffi.checkException(); return new mrbind_test.mr.csharp.ExposedLayoutC(__ret, null); } @@ -176,7 +176,7 @@ public interface Fn mrbind_test.mr.csharp.ExposedLayoutC call(mrbind_test.mr.csharp.ExposedLayoutC _1); } - private static final java.lang.foreign.MemorySegment CALL_STUB = mrbind_test.Ffi.upcall(java.lang.invoke.MethodHandles.lookup(), std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.class, "__call", java.lang.foreign.FunctionDescriptor.of(mrbind_test.mr.csharp.ExposedLayoutC.LAYOUT, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS)); + private static final java.lang.foreign.MemorySegment CALL_STUB = mrbind_test.Ffi.upcall(java.lang.invoke.MethodHandles.lookup(), std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.class, "__call", java.lang.foreign.FunctionDescriptor.of(mrbind_test.mr.csharp.ExposedLayoutC.LAYOUT, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS)); private static java.lang.foreign.MemorySegment __call(java.lang.foreign.MemorySegment _1, java.lang.foreign.MemorySegment _userdata, java.lang.foreign.MemorySegment _cleanup_value) { @@ -196,13 +196,13 @@ private static java.lang.foreign.MemorySegment __call(java.lang.foreign.MemorySe /** Constructs an instance holding a Java callable. The copies of the instance share it. An exception thrown by the callable is rethrown by the wrapper that called into C. * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructEx()`. */ - public static mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC of(Fn func) + public static mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 of(Fn func) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructEx.invokeExact(CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructEx.invokeExact(CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(__ret, true, null); + return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -217,7 +217,7 @@ public void assignFn(Fn func) { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignEx.invokeExact(rawPointer(), CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignEx.invokeExact(rawPointer(), CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); mrbind_test.Ffi.checkException(); } catch (java.lang.Throwable __e) diff --git a/test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java b/test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java similarity index 77% rename from test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java rename to test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java index 71b5a4f3..928a27b0 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref extends mrbind_test.CppObject +public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref::__destroy : null, owner);} + public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -30,7 +30,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Construct()`. */ - public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) + public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) { this(__ctor_construct(_0, _1), true, null); } @@ -39,7 +39,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(mrbind_test.mr.c { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); mrbind_test.Ffi.checkException(); return __ret; } @@ -64,7 +64,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_MR_CSharp_ExposedLayout_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); @@ -89,7 +89,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_const_MR_CSharp_ExposedLayout_ref { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_const_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_const_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); diff --git a/test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java b/test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java similarity index 74% rename from test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java rename to test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java index 2727d2f7..7393e212 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref extends mrbind_test.CppObject +public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref::__destroy : null, owner);} + public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -29,16 +29,16 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_ConstructFromAnother()`. */ - public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref other) + public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 other) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); return __ret; } @@ -59,7 +59,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Construct()`. */ - public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) + public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) { this(__ctor_construct(_0, _1), true, null); } @@ -68,7 +68,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(mrbind_test.mr.c { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); mrbind_test.Ffi.checkException(); return __ret; } @@ -93,7 +93,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_MR_CSharp_ExposedLayout_rvalue_re { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); @@ -118,7 +118,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_const_MR_CSharp_ExposedLayout_rva { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_const_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_const_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a.java b/test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048.java similarity index 73% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a.java rename to test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048.java index f8a53944..53573d75 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a extends mrbind_test.CppObject +public final class std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a::__destroy : null, owner);} + public std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -36,7 +36,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_Construct()`. Some types are raw C types, see the C bindings for the details. */ - public std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a(int _0, float _1, java.lang.foreign.MemorySegment _2, java.lang.foreign.MemorySegment _3, int _4, float _5, java.lang.foreign.MemorySegment _6, java.lang.foreign.MemorySegment _7, int _8, float _9) + public std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048(int _0, float _1, java.lang.foreign.MemorySegment _2, java.lang.foreign.MemorySegment _3, int _4, float _5, java.lang.foreign.MemorySegment _6, java.lang.foreign.MemorySegment _7, int _8, float _9) { this(__ctor_construct(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9), true, null); } @@ -45,7 +45,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(int _0, float _1 { try (java.lang.foreign.Arena __arena = java.lang.foreign.Arena.ofConfined()) { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_Construct.invokeExact(_0, _1, _2, _3, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _4), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _5), _6, _7, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _8), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _9)); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_Construct.invokeExact(_0, _1, _2, _3, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _4), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _5), _6, _7, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _8), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _9)); mrbind_test.Ffi.checkException(); return __ret; } @@ -65,7 +65,7 @@ public int get_const_int() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -89,7 +89,7 @@ public float get_const_float() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } @@ -113,7 +113,7 @@ public java.lang.foreign.MemorySegment get_int_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_int_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_int_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -137,7 +137,7 @@ public java.lang.foreign.MemorySegment get_float_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_float_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_float_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -161,7 +161,7 @@ public int get_const_int_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -185,7 +185,7 @@ public float get_const_float_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } @@ -209,7 +209,7 @@ public java.lang.foreign.MemorySegment get_int_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_int_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_int_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -233,7 +233,7 @@ public java.lang.foreign.MemorySegment get_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -257,7 +257,7 @@ public int get_const_int_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -281,7 +281,7 @@ public float get_const_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java b/test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java similarity index 73% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java rename to test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java index 56219490..a3babc68 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref extends mrbind_test.CppObject +public final class std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref::__destroy : null, owner);} + public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -29,16 +29,16 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_ConstructFromAnother()`. */ - public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref other) + public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8(mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8 other) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); return __ret; } @@ -61,7 +61,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Construct()`. */ - public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(int _0, float _1, java.lang.String _2, java.lang.String _3) + public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8(int _0, float _1, java.lang.String _2, java.lang.String _3) { this(__ctor_construct(_0, _1, _2, _3), true, null); } @@ -72,7 +72,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(int _0, float _1 { java.lang.foreign.MemorySegment __str__2 = mrbind_test.Ffi.utf8(__arena, java.util.Objects.requireNonNull(_2, "_2")); java.lang.foreign.MemorySegment __str__3 = mrbind_test.Ffi.utf8(__arena, java.util.Objects.requireNonNull(_3, "_3")); - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _0), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _1), __str__2, mrbind_test.Ffi.end(__str__2), __str__3, mrbind_test.Ffi.end(__str__3)); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _0), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _1), __str__2, mrbind_test.Ffi.end(__str__2), __str__3, mrbind_test.Ffi.end(__str__3)); mrbind_test.Ffi.checkException(); return __ret; } @@ -92,7 +92,7 @@ public int get_const_int_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_int_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_int_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -116,7 +116,7 @@ public float get_const_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } @@ -140,7 +140,7 @@ public mrbind_test.mr.cs.std_string get_const_std_string_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); @@ -165,7 +165,7 @@ public mrbind_test.mr.cs.std_string get_const_std_string_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java b/test/output_java/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java similarity index 79% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java rename to test/output_java/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java index eb36d206..4cbb58c6 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref extends mrbind_test.CppObject +public final class std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref::__destroy : null, owner);} + public std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -32,7 +32,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Construct()`. Some types are raw C types, see the C bindings for the details. */ - public std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref(java.lang.foreign.MemorySegment _0, java.lang.foreign.MemorySegment _1, mrbind_test.mr.cs.std_string _2, java.lang.String _3) + public std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941(java.lang.foreign.MemorySegment _0, java.lang.foreign.MemorySegment _1, mrbind_test.mr.cs.std_string _2, java.lang.String _3) { this(__ctor_construct(_0, _1, _2, _3), true, null); } @@ -42,7 +42,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(java.lang.foreig try (java.lang.foreign.Arena __arena = java.lang.foreign.Arena.ofConfined()) { java.lang.foreign.MemorySegment __str__3 = mrbind_test.Ffi.utf8(__arena, java.util.Objects.requireNonNull(_3, "_3")); - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Construct.invokeExact(_0, _1, mrbind_test.Ffi.ptrNonNull(_2, "_2"), __str__3, mrbind_test.Ffi.end(__str__3)); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Construct.invokeExact(_0, _1, mrbind_test.Ffi.ptrNonNull(_2, "_2"), __str__3, mrbind_test.Ffi.end(__str__3)); mrbind_test.Ffi.checkException(); return __ret; } @@ -66,7 +66,7 @@ public java.lang.foreign.MemorySegment get_int_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_int_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_int_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -90,7 +90,7 @@ public java.lang.foreign.MemorySegment get_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -114,7 +114,7 @@ public mrbind_test.mr.cs.std_string get_std_string_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); @@ -139,7 +139,7 @@ public mrbind_test.mr.cs.std_string get_std_string_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); diff --git a/test/output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java b/test/output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java index f82d6439..beecce1b 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java @@ -223,13 +223,13 @@ public boolean contains(mrbind_test.mr.stdcontainers.NonAssignable key) * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_find()`. */ - public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator find(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 find(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_map_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_find.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -273,13 +273,13 @@ public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_ * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_begin()`. */ - public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator begin() + public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_map_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -296,7 +296,7 @@ public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_ * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 iter) { try { @@ -369,13 +369,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_Non * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_end()`. */ - public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator end() + public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_map_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -392,7 +392,7 @@ public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_ * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 iter) { try { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java b/test/output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java similarity index 93% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java rename to test/output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java index 7f7a0983..84fe1007 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator extends mrbind_test.CppObject +public final class std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator::__destroy : null, owner);} + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_DefaultConstruct()`. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator() + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_ConstructFromAnother()`. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator other) + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 other) { try { @@ -105,7 +105,7 @@ public void assignFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContaine * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_from_mutable()`. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_iterator iter) + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_iterator iter) { this(__ctor_from_mutable(iter), true, null); } diff --git a/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java b/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java index 1e8f792e..4d713520 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java @@ -198,13 +198,13 @@ public long count(mrbind_test.mr.stdcontainers.NonAssignable key) * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator find(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 find(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -223,13 +223,13 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find_mut()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator find_mut(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 find_mut(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find_mut.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -248,13 +248,13 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator begin() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -271,7 +271,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 iter) { try { @@ -296,13 +296,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainer * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin_mut()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator begin_mut() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 begin_mut() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin_mut.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -319,7 +319,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_begin_mut()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { try { @@ -344,13 +344,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainer * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator end() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -367,7 +367,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 iter) { try { @@ -392,13 +392,13 @@ public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_ * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end_mut()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator end_mut() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 end_mut() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end_mut.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -415,7 +415,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_end_mut()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { try { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java b/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java similarity index 92% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java rename to test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java index 71f0330b..68a4cdca 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator extends mrbind_test.CppObject +public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator::__destroy : null, owner);} + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_DefaultConstruct()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator() + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_ConstructFromAnother()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator other) + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 other) { try { @@ -105,12 +105,12 @@ public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdCon * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_from_mutable()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { this(__ctor_from_mutable(iter), true, null); } - private static java.lang.foreign.MemorySegment __ctor_from_mutable(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + private static java.lang.foreign.MemorySegment __ctor_from_mutable(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { try { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java b/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java similarity index 93% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java rename to test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java index f7672c58..c45e2ea0 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator extends mrbind_test.CppObject +public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator::__destroy : null, owner);} + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator_DefaultConstruct()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator() + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator_ConstructFromAnother()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator other) + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 other) { try { diff --git a/test/output_java/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java b/test/output_java/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java index da707bac..bfd13316 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java @@ -198,13 +198,13 @@ public long count(mrbind_test.mr.stdcontainers.NonAssignable key) * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_find()`. */ - public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator find(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 find(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multiset_MR_StdContainers_NonAssignable.H0.MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_find.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -223,13 +223,13 @@ public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_c * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_begin()`. */ - public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator begin() + public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multiset_MR_StdContainers_NonAssignable.H0.MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -246,7 +246,7 @@ public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_c * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 iter) { try { @@ -271,13 +271,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainer * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_end()`. */ - public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator end() + public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multiset_MR_StdContainers_NonAssignable.H0.MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -294,7 +294,7 @@ public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_c * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 iter) { try { diff --git a/test/output_java/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java b/test/output_java/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java similarity index 91% rename from test/output_java/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java rename to test/output_java/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java index 484b26bc..6d78a7dd 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator extends mrbind_test.CppObject +public final class std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator::__destroy : null, owner);} + public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator_DefaultConstruct()`. */ - public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator() + public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator_ConstructFromAnother()`. */ - public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator other) + public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 other) { try { diff --git a/test/output_java/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java b/test/output_java/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java index a3d8d80c..85c45a9d 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java @@ -554,7 +554,7 @@ public void erase_at_mutable_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_ * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_insert_at_iter()`. */ - public void insert_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator position, mrbind_test.mr.stdcontainers.NonDefaultConstructible new_elem) + public void insert_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 position, mrbind_test.mr.stdcontainers.NonDefaultConstructible new_elem) { try { @@ -578,7 +578,7 @@ public void insert_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefa * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_erase_at_iter()`. */ - public void erase_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator position) + public void erase_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 position) { try { @@ -602,13 +602,13 @@ public void erase_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefau * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_begin()`. */ - public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator begin() + public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_vector_MR_StdContainers_NonDefaultConstructible.H0.MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -625,7 +625,7 @@ public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_con * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 iter) { try { @@ -698,13 +698,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefault * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_end()`. */ - public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator end() + public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_vector_MR_StdContainers_NonDefaultConstructible.H0.MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -721,7 +721,7 @@ public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_con * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 iter) { try { @@ -793,7 +793,7 @@ public boolean is_end(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultCo * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_to_index()`. */ - public long to_index(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator iter) + public long to_index(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 iter) { try { diff --git a/test/output_java/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java b/test/output_java/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java similarity index 92% rename from test/output_java/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java rename to test/output_java/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java index f3f4e76e..4eb85c1e 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java +++ b/test/output_java/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator extends mrbind_test.CppObject +public final class std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator::__destroy : null, owner);} + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_DefaultConstruct()`. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator() + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_ConstructFromAnother()`. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator other) + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 other) { try { @@ -105,7 +105,7 @@ public void assignFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonD * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_from_mutable()`. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_iterator iter) + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_iterator iter) { this(__ctor_from_mutable(iter), true, null); } diff --git a/test/output_java/src/mrbind_test/mr/csharp/Functions.java b/test/output_java/src/mrbind_test/mr/csharp/Functions.java index f70b61b9..bd83a4bd 100644 --- a/test/output_java/src/mrbind_test/mr/csharp/Functions.java +++ b/test/output_java/src/mrbind_test/mr/csharp/Functions.java @@ -6350,13 +6350,13 @@ public static mrbind_test.mr.cs.std_tuple_const_int_std_string get_tuple_const() * * Calls `MR_CSharp_get_tuple_refs()`. */ - public static mrbind_test.mr.cs.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref get_tuple_refs() + public static mrbind_test.mr.cs.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941 get_tuple_refs() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_refs.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -6369,13 +6369,13 @@ public static mrbind_test.mr.cs.std_tuple_int_ref_float_rvalue_ref_std_string_re * * Calls `MR_CSharp_get_tuple_crefs()`. */ - public static mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref get_tuple_crefs() + public static mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8 get_tuple_crefs() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_crefs.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -6407,13 +6407,13 @@ public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_const_MR_CShar * * Calls `MR_CSharp_get_tuple_exposed_lvalue_ref()`. */ - public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref get_tuple_exposed_lvalue_ref() + public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140 get_tuple_exposed_lvalue_ref() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_exposed_lvalue_ref.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -6426,13 +6426,13 @@ public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_C * * Calls `MR_CSharp_get_tuple_exposed_rvalue_ref()`. */ - public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref get_tuple_exposed_rvalue_ref() + public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 get_tuple_exposed_rvalue_ref() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_exposed_rvalue_ref.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(__ret, true, null); } catch (java.lang.Throwable __e) { diff --git a/test/output_java/src/mrbind_test/mr/csharp/TestStdFunction.java b/test/output_java/src/mrbind_test/mr/csharp/TestStdFunction.java index d2fc362c..486526f6 100644 --- a/test/output_java/src/mrbind_test/mr/csharp/TestStdFunction.java +++ b/test/output_java/src/mrbind_test/mr/csharp/TestStdFunction.java @@ -60,12 +60,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_CSharp_TestStdFunction_ConstructFrom()`. */ - public TestStdFunction(mrbind_test.mr.cs.std_function_int_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int_int f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC f4, mrbind_test.mr.cs.std_function_int_ref_from_int_ref_int_rvalue_ref f5, mrbind_test.mr.cs.std_function_int_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) + public TestStdFunction(mrbind_test.mr.cs.std_function_int_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int_int f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 f4, mrbind_test.mr.cs.std_function_int_ref_from_int_ref_int_rvalue_ref f5, mrbind_test.mr.cs.std_function_int_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) { this(__ctor_constructFrom(f1, f2, f3, f4, f5, f6, f7), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFrom(mrbind_test.mr.cs.std_function_int_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int_int f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC f4, mrbind_test.mr.cs.std_function_int_ref_from_int_ref_int_rvalue_ref f5, mrbind_test.mr.cs.std_function_int_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) + private static java.lang.foreign.MemorySegment __ctor_constructFrom(mrbind_test.mr.cs.std_function_int_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int_int f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 f4, mrbind_test.mr.cs.std_function_int_ref_from_int_ref_int_rvalue_ref f5, mrbind_test.mr.cs.std_function_int_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) { try { @@ -319,14 +319,14 @@ public void setF3(mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 * * Calls `MR_CSharp_TestStdFunction_Get_f4()`. */ - public mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC f4() + public mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 f4() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H6.MR_CSharp_TestStdFunction_Get_f4.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; - return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(__ret, false, __owner); + return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(__ret, false, __owner); } catch (java.lang.Throwable __e) { @@ -344,7 +344,7 @@ public mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_Ex * * Calls `MR_CSharp_TestStdFunction_Set_f4()`. */ - public void setF4(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC value) + public void setF4(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 value) { try { diff --git a/test/output_java/src/mrbind_test/mr/stdtuplelike/Functions.java b/test/output_java/src/mrbind_test/mr/stdtuplelike/Functions.java index 5940ada2..ad79d06a 100644 --- a/test/output_java/src/mrbind_test/mr/stdtuplelike/Functions.java +++ b/test/output_java/src/mrbind_test/mr/stdtuplelike/Functions.java @@ -189,13 +189,13 @@ public static mrbind_test.mr.cs.std_tuple_int_float GetTuple() * * Calls `MR_StdTupleLike_GetTuple2()`. */ - public static mrbind_test.mr.cs.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a GetTuple2() + public static mrbind_test.mr.cs.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048 GetTuple2() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_std_tuple_like.H0.MR_StdTupleLike_GetTuple2.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048(__ret, true, null); } catch (java.lang.Throwable __e) { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java similarity index 98% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java rename to test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java index 8bed5155..fab3483e 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC`. */ -public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC +public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 { - private std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC() {} + private std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873() {} public static final class H0 { diff --git a/test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java similarity index 97% rename from test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java rename to test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java index 97fb581a..b17c6913 100644 --- a/test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref`. */ -public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref +public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140 { - private std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref() {} + private std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140() {} public static final class H0 { diff --git a/test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java similarity index 97% rename from test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java rename to test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java index 4764212a..92a7af3d 100644 --- a/test/output_java/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref`. */ -public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref +public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 { - private std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref() {} + private std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.java b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.java similarity index 98% rename from test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.java rename to test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.java index f14ee396..0f4dd95b 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db`. */ -public final class std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db +public final class std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b { - private std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db() {} + private std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.java b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.java similarity index 96% rename from test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.java rename to test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.java index d2051726..6cb2345d 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b`. */ -public final class std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b +public final class std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d { - private std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b() {} + private std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.java similarity index 97% rename from test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java rename to test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.java index 836573be..96bdd964 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref`. */ -public final class std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref +public final class std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a { - private std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref() {} + private std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/Functions.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/Functions.java index c3bddb20..0942ec2e 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/Functions.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/Functions.java @@ -1963,7 +1963,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_set_float_const_iterator a, * * Calls `MR_C_sub_MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator()`. */ - public static long opSub(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator b) + public static long opSub(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 b) { try { @@ -1987,7 +1987,7 @@ public static long opSub(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaul * * Calls `MR_C_equal_MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 b) { try { @@ -2371,7 +2371,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_unordered_set_MR_StdContaine * * Calls `MR_C_equal_MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator a, mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 a, mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 b) { try { @@ -2491,7 +2491,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_multimap_MR_StdContainers_No * * Calls `MR_C_equal_MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator a, mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 a, mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 b) { try { @@ -2539,7 +2539,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_unordered_map_MR_StdContaine * * Calls `MR_C_equal_MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 b) { try { @@ -2563,7 +2563,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdCon * * Calls `MR_C_equal_MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 b) { try { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java similarity index 73% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java index 570af0ba..75405d5e 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC extends mrbind_test.CppObject +public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC::__destroy : null, owner);} + public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_DefaultConstruct()`. */ - public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC() + public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873() { this(__ctor_defaultConstruct(), true, null); } @@ -37,7 +37,7 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_DefaultConstruct.invokeExact(); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_DefaultConstruct.invokeExact(); mrbind_test.Ffi.checkException(); return __ret; } @@ -53,16 +53,16 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructFromAnother()`. */ - public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC other) + public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 other) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructFromAnother.invokeExact(mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructFromAnother.invokeExact(mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); return __ret; } @@ -82,11 +82,11 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC other) + public void assignFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 other) { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignFromAnother.invokeExact(rawPointer(), mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignFromAnother.invokeExact(rawPointer(), mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); } catch (java.lang.Throwable __e) @@ -109,7 +109,7 @@ public boolean has_value() { try { - boolean __ret = (boolean)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_has_value.invokeExact(rawPointer()); + boolean __ret = (boolean)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_has_value.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -132,7 +132,7 @@ public void reset() { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_reset.invokeExact(rawPointer()); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_reset.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); } catch (java.lang.Throwable __e) @@ -154,7 +154,7 @@ public mrbind_test.mr.csharp.ExposedLayoutC call(mrbind_test.mr.csharp.ExposedLa { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_call.invokeExact((java.lang.foreign.SegmentAllocator)java.lang.foreign.Arena.ofAuto(), rawPointer(), mrbind_test.Ffi.ptrNonNull(_1, "_1")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_call.invokeExact((java.lang.foreign.SegmentAllocator)java.lang.foreign.Arena.ofAuto(), rawPointer(), mrbind_test.Ffi.ptrNonNull(_1, "_1")); mrbind_test.Ffi.checkException(); return new mrbind_test.mr.csharp.ExposedLayoutC(__ret, null); } @@ -176,7 +176,7 @@ public interface Fn mrbind_test.mr.csharp.ExposedLayoutC call(mrbind_test.mr.csharp.ExposedLayoutC _1); } - private static final java.lang.foreign.MemorySegment CALL_STUB = mrbind_test.Ffi.upcall(java.lang.invoke.MethodHandles.lookup(), std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.class, "__call", java.lang.foreign.FunctionDescriptor.of(mrbind_test.mr.csharp.ExposedLayoutC.LAYOUT, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS)); + private static final java.lang.foreign.MemorySegment CALL_STUB = mrbind_test.Ffi.upcall(java.lang.invoke.MethodHandles.lookup(), std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.class, "__call", java.lang.foreign.FunctionDescriptor.of(mrbind_test.mr.csharp.ExposedLayoutC.LAYOUT, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS)); private static java.lang.foreign.MemorySegment __call(java.lang.foreign.MemorySegment _1, java.lang.foreign.MemorySegment _userdata, java.lang.foreign.MemorySegment _cleanup_value) { @@ -196,13 +196,13 @@ private static java.lang.foreign.MemorySegment __call(java.lang.foreign.MemorySe /** Constructs an instance holding a Java callable. The copies of the instance share it. An exception thrown by the callable is rethrown by the wrapper that called into C. * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructEx()`. */ - public static mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC of(Fn func) + public static mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 of(Fn func) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructEx.invokeExact(CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructEx.invokeExact(CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(__ret, true, null); + return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -217,7 +217,7 @@ public void assignFn(Fn func) { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignEx.invokeExact(rawPointer(), CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignEx.invokeExact(rawPointer(), CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); mrbind_test.Ffi.checkException(); } catch (java.lang.Throwable __e) diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java similarity index 77% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java index 71b5a4f3..928a27b0 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref extends mrbind_test.CppObject +public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref::__destroy : null, owner);} + public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -30,7 +30,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Construct()`. */ - public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) + public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) { this(__ctor_construct(_0, _1), true, null); } @@ -39,7 +39,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(mrbind_test.mr.c { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); mrbind_test.Ffi.checkException(); return __ret; } @@ -64,7 +64,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_MR_CSharp_ExposedLayout_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); @@ -89,7 +89,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_const_MR_CSharp_ExposedLayout_ref { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_const_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_const_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java similarity index 74% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java index 2727d2f7..7393e212 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref extends mrbind_test.CppObject +public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref::__destroy : null, owner);} + public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -29,16 +29,16 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_ConstructFromAnother()`. */ - public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref other) + public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 other) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); return __ret; } @@ -59,7 +59,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Construct()`. */ - public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) + public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) { this(__ctor_construct(_0, _1), true, null); } @@ -68,7 +68,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(mrbind_test.mr.c { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); mrbind_test.Ffi.checkException(); return __ret; } @@ -93,7 +93,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_MR_CSharp_ExposedLayout_rvalue_re { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); @@ -118,7 +118,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_const_MR_CSharp_ExposedLayout_rva { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_const_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_const_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t___a385e102.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___332c5840.java similarity index 72% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t___a385e102.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___332c5840.java index 5fe3419c..29e05d03 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t___a385e102.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___332c5840.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t___a385e102 extends mrbind_test.CppObject +public final class std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___332c5840 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t___a385e102(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t___a385e102::__destroy : null, owner);} + public std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___332c5840(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___332c5840::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -37,7 +37,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_Construct()`. Some types are raw C types, see the C bindings for the details. */ - public std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t___a385e102(int _0, float _1, java.lang.foreign.MemorySegment _2, java.lang.foreign.MemorySegment _3, int _4, float _5, java.lang.foreign.MemorySegment _6, java.lang.foreign.MemorySegment _7, int _8, float _9) + public std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___332c5840(int _0, float _1, java.lang.foreign.MemorySegment _2, java.lang.foreign.MemorySegment _3, int _4, float _5, java.lang.foreign.MemorySegment _6, java.lang.foreign.MemorySegment _7, int _8, float _9) { this(__ctor_construct(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9), true, null); } @@ -46,7 +46,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(int _0, float _1 { try (java.lang.foreign.Arena __arena = java.lang.foreign.Arena.ofConfined()) { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_Construct.invokeExact(_0, _1, _2, _3, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _4), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _5), _6, _7, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _8), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _9)); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_Construct.invokeExact(_0, _1, _2, _3, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _4), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _5), _6, _7, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _8), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _9)); mrbind_test.Ffi.checkException(); return __ret; } @@ -66,7 +66,7 @@ public int get_const_int32_t() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_int32_t.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_int32_t.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -90,7 +90,7 @@ public float get_const_float() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_float.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_float.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } @@ -114,7 +114,7 @@ public java.lang.foreign.MemorySegment get_int32_t_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_int32_t_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_int32_t_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -138,7 +138,7 @@ public java.lang.foreign.MemorySegment get_float_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_float_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_float_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -162,7 +162,7 @@ public int get_const_int32_t_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_int32_t_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_int32_t_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -186,7 +186,7 @@ public float get_const_float_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_float_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_float_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } @@ -210,7 +210,7 @@ public java.lang.foreign.MemorySegment get_int32_t_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_int32_t_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_int32_t_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -234,7 +234,7 @@ public java.lang.foreign.MemorySegment get_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -258,7 +258,7 @@ public int get_const_int32_t_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_int32_t_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_int32_t_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -282,7 +282,7 @@ public float get_const_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32___98db.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___d1fce16b.H0.MR_C_std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t_rvalue_ref_float_rvalue_ref_const_int32_t_rvalue_ref_const_float_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869.java similarity index 73% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869.java index c5aeddc1..f8e176ee 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref extends mrbind_test.CppObject +public final class std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref::__destroy : null, owner);} + public std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -29,16 +29,16 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_ConstructFromAnother()`. */ - public std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(mrbind_test.mr.cs.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref other) + public std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869(mrbind_test.mr.cs.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869 other) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); return __ret; } @@ -61,7 +61,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Construct()`. */ - public std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(int _0, float _1, java.lang.String _2, java.lang.String _3) + public std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869(int _0, float _1, java.lang.String _2, java.lang.String _3) { this(__ctor_construct(_0, _1, _2, _3), true, null); } @@ -72,7 +72,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(int _0, float _1 { java.lang.foreign.MemorySegment __str__2 = mrbind_test.Ffi.utf8(__arena, java.util.Objects.requireNonNull(_2, "_2")); java.lang.foreign.MemorySegment __str__3 = mrbind_test.Ffi.utf8(__arena, java.util.Objects.requireNonNull(_3, "_3")); - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _0), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _1), __str__2, mrbind_test.Ffi.end(__str__2), __str__3, mrbind_test.Ffi.end(__str__3)); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _0), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _1), __str__2, mrbind_test.Ffi.end(__str__2), __str__3, mrbind_test.Ffi.end(__str__3)); mrbind_test.Ffi.checkException(); return __ret; } @@ -92,7 +92,7 @@ public int get_const_int32_t_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_int32_t_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_int32_t_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -116,7 +116,7 @@ public float get_const_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } @@ -140,7 +140,7 @@ public mrbind_test.mr.cs.std_string get_const_std_string_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); @@ -165,7 +165,7 @@ public mrbind_test.mr.cs.std_string get_const_std_string_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_re__883b.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__811a190d.H0.MR_C_std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.java similarity index 79% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.java index 3a6defd7..ccebfa54 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref extends mrbind_test.CppObject +public final class std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref::__destroy : null, owner);} + public std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -32,7 +32,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Construct()`. Some types are raw C types, see the C bindings for the details. */ - public std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref(java.lang.foreign.MemorySegment _0, java.lang.foreign.MemorySegment _1, mrbind_test.mr.cs.std_string _2, java.lang.String _3) + public std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a(java.lang.foreign.MemorySegment _0, java.lang.foreign.MemorySegment _1, mrbind_test.mr.cs.std_string _2, java.lang.String _3) { this(__ctor_construct(_0, _1, _2, _3), true, null); } @@ -42,7 +42,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(java.lang.foreig try (java.lang.foreign.Arena __arena = java.lang.foreign.Arena.ofConfined()) { java.lang.foreign.MemorySegment __str__3 = mrbind_test.Ffi.utf8(__arena, java.util.Objects.requireNonNull(_3, "_3")); - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Construct.invokeExact(_0, _1, mrbind_test.Ffi.ptrNonNull(_2, "_2"), __str__3, mrbind_test.Ffi.end(__str__3)); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Construct.invokeExact(_0, _1, mrbind_test.Ffi.ptrNonNull(_2, "_2"), __str__3, mrbind_test.Ffi.end(__str__3)); mrbind_test.Ffi.checkException(); return __ret; } @@ -66,7 +66,7 @@ public java.lang.foreign.MemorySegment get_int32_t_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_int32_t_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_int32_t_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -90,7 +90,7 @@ public java.lang.foreign.MemorySegment get_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -114,7 +114,7 @@ public mrbind_test.mr.cs.std_string get_std_string_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); @@ -139,7 +139,7 @@ public mrbind_test.mr.cs.std_string get_std_string_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a.H0.MR_C_std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java index f82d6439..beecce1b 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java @@ -223,13 +223,13 @@ public boolean contains(mrbind_test.mr.stdcontainers.NonAssignable key) * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_find()`. */ - public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator find(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 find(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_map_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_find.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -273,13 +273,13 @@ public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_ * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_begin()`. */ - public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator begin() + public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_map_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -296,7 +296,7 @@ public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_ * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 iter) { try { @@ -369,13 +369,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_Non * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_end()`. */ - public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator end() + public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_map_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -392,7 +392,7 @@ public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_ * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 iter) { try { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java similarity index 93% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java index 7f7a0983..84fe1007 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator extends mrbind_test.CppObject +public final class std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator::__destroy : null, owner);} + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_DefaultConstruct()`. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator() + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_ConstructFromAnother()`. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator other) + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 other) { try { @@ -105,7 +105,7 @@ public void assignFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContaine * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_from_mutable()`. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_iterator iter) + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_iterator iter) { this(__ctor_from_mutable(iter), true, null); } diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java index 1e8f792e..4d713520 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java @@ -198,13 +198,13 @@ public long count(mrbind_test.mr.stdcontainers.NonAssignable key) * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator find(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 find(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -223,13 +223,13 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find_mut()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator find_mut(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 find_mut(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find_mut.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -248,13 +248,13 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator begin() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -271,7 +271,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 iter) { try { @@ -296,13 +296,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainer * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin_mut()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator begin_mut() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 begin_mut() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin_mut.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -319,7 +319,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_begin_mut()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { try { @@ -344,13 +344,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainer * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator end() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -367,7 +367,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 iter) { try { @@ -392,13 +392,13 @@ public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_ * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end_mut()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator end_mut() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 end_mut() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end_mut.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -415,7 +415,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_end_mut()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { try { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java similarity index 92% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java index 71f0330b..68a4cdca 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator extends mrbind_test.CppObject +public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator::__destroy : null, owner);} + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_DefaultConstruct()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator() + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_ConstructFromAnother()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator other) + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 other) { try { @@ -105,12 +105,12 @@ public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdCon * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_from_mutable()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { this(__ctor_from_mutable(iter), true, null); } - private static java.lang.foreign.MemorySegment __ctor_from_mutable(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + private static java.lang.foreign.MemorySegment __ctor_from_mutable(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { try { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java similarity index 93% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java index f7672c58..c45e2ea0 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator extends mrbind_test.CppObject +public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator::__destroy : null, owner);} + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator_DefaultConstruct()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator() + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator_ConstructFromAnother()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator other) + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 other) { try { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java index da707bac..bfd13316 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java @@ -198,13 +198,13 @@ public long count(mrbind_test.mr.stdcontainers.NonAssignable key) * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_find()`. */ - public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator find(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 find(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multiset_MR_StdContainers_NonAssignable.H0.MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_find.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -223,13 +223,13 @@ public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_c * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_begin()`. */ - public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator begin() + public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multiset_MR_StdContainers_NonAssignable.H0.MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -246,7 +246,7 @@ public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_c * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 iter) { try { @@ -271,13 +271,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainer * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_end()`. */ - public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator end() + public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multiset_MR_StdContainers_NonAssignable.H0.MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -294,7 +294,7 @@ public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_c * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 iter) { try { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java similarity index 91% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java index 484b26bc..6d78a7dd 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator extends mrbind_test.CppObject +public final class std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator::__destroy : null, owner);} + public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator_DefaultConstruct()`. */ - public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator() + public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator_ConstructFromAnother()`. */ - public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator other) + public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 other) { try { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java index a3d8d80c..85c45a9d 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java @@ -554,7 +554,7 @@ public void erase_at_mutable_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_ * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_insert_at_iter()`. */ - public void insert_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator position, mrbind_test.mr.stdcontainers.NonDefaultConstructible new_elem) + public void insert_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 position, mrbind_test.mr.stdcontainers.NonDefaultConstructible new_elem) { try { @@ -578,7 +578,7 @@ public void insert_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefa * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_erase_at_iter()`. */ - public void erase_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator position) + public void erase_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 position) { try { @@ -602,13 +602,13 @@ public void erase_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefau * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_begin()`. */ - public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator begin() + public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_vector_MR_StdContainers_NonDefaultConstructible.H0.MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -625,7 +625,7 @@ public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_con * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 iter) { try { @@ -698,13 +698,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefault * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_end()`. */ - public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator end() + public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_vector_MR_StdContainers_NonDefaultConstructible.H0.MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -721,7 +721,7 @@ public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_con * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 iter) { try { @@ -793,7 +793,7 @@ public boolean is_end(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultCo * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_to_index()`. */ - public long to_index(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator iter) + public long to_index(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 iter) { try { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java similarity index 92% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java rename to test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java index f3f4e76e..4eb85c1e 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator extends mrbind_test.CppObject +public final class std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator::__destroy : null, owner);} + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_DefaultConstruct()`. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator() + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_ConstructFromAnother()`. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator other) + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 other) { try { @@ -105,7 +105,7 @@ public void assignFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonD * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_from_mutable()`. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_iterator iter) + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_iterator iter) { this(__ctor_from_mutable(iter), true, null); } diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/csharp/Functions.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/csharp/Functions.java index 1ba1bc16..27ac0439 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/csharp/Functions.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/csharp/Functions.java @@ -6350,13 +6350,13 @@ public static mrbind_test.mr.cs.std_tuple_const_int32_t_std_string get_tuple_con * * Calls `MR_CSharp_get_tuple_refs()`. */ - public static mrbind_test.mr.cs.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref get_tuple_refs() + public static mrbind_test.mr.cs.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a get_tuple_refs() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_refs.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_int32_t_ref_float_rvalue_ref_std_string_ref_std_string__dea7a07a(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -6369,13 +6369,13 @@ public static mrbind_test.mr.cs.std_tuple_int32_t_ref_float_rvalue_ref_std_strin * * Calls `MR_CSharp_get_tuple_crefs()`. */ - public static mrbind_test.mr.cs.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref get_tuple_crefs() + public static mrbind_test.mr.cs.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869 get_tuple_crefs() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_crefs.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_const_int32_t_ref_const_float_rvalue_ref_const_std_str__f9497869(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -6407,13 +6407,13 @@ public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_const_MR_CShar * * Calls `MR_CSharp_get_tuple_exposed_lvalue_ref()`. */ - public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref get_tuple_exposed_lvalue_ref() + public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140 get_tuple_exposed_lvalue_ref() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_exposed_lvalue_ref.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -6426,13 +6426,13 @@ public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_C * * Calls `MR_CSharp_get_tuple_exposed_rvalue_ref()`. */ - public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref get_tuple_exposed_rvalue_ref() + public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 get_tuple_exposed_rvalue_ref() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_exposed_rvalue_ref.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(__ret, true, null); } catch (java.lang.Throwable __e) { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/csharp/TestStdFunction.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/csharp/TestStdFunction.java index fc1b6d82..e17902e8 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/csharp/TestStdFunction.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/csharp/TestStdFunction.java @@ -60,12 +60,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_CSharp_TestStdFunction_ConstructFrom()`. */ - public TestStdFunction(mrbind_test.mr.cs.std_function_int32_t_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int32_t_int32_t f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC f4, mrbind_test.mr.cs.std_function_int32_t_ref_from_int32_t_ref_int32_t_rvalue_ref f5, mrbind_test.mr.cs.std_function_int32_t_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) + public TestStdFunction(mrbind_test.mr.cs.std_function_int32_t_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int32_t_int32_t f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 f4, mrbind_test.mr.cs.std_function_int32_t_ref_from_int32_t_ref_int32_t_rvalue_ref f5, mrbind_test.mr.cs.std_function_int32_t_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) { this(__ctor_constructFrom(f1, f2, f3, f4, f5, f6, f7), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFrom(mrbind_test.mr.cs.std_function_int32_t_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int32_t_int32_t f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC f4, mrbind_test.mr.cs.std_function_int32_t_ref_from_int32_t_ref_int32_t_rvalue_ref f5, mrbind_test.mr.cs.std_function_int32_t_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) + private static java.lang.foreign.MemorySegment __ctor_constructFrom(mrbind_test.mr.cs.std_function_int32_t_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int32_t_int32_t f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 f4, mrbind_test.mr.cs.std_function_int32_t_ref_from_int32_t_ref_int32_t_rvalue_ref f5, mrbind_test.mr.cs.std_function_int32_t_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) { try { @@ -319,14 +319,14 @@ public void setF3(mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 * * Calls `MR_CSharp_TestStdFunction_Get_f4()`. */ - public mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC f4() + public mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 f4() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H6.MR_CSharp_TestStdFunction_Get_f4.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; - return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(__ret, false, __owner); + return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(__ret, false, __owner); } catch (java.lang.Throwable __e) { @@ -344,7 +344,7 @@ public mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_Ex * * Calls `MR_CSharp_TestStdFunction_Set_f4()`. */ - public void setF4(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC value) + public void setF4(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 value) { try { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/stdtuplelike/Functions.java b/test/output_java_fixed_typedefs/src/mrbind_test/mr/stdtuplelike/Functions.java index c109410b..4af2902e 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/stdtuplelike/Functions.java +++ b/test/output_java_fixed_typedefs/src/mrbind_test/mr/stdtuplelike/Functions.java @@ -189,13 +189,13 @@ public static mrbind_test.mr.cs.std_tuple_int32_t_float GetTuple() * * Calls `MR_StdTupleLike_GetTuple2()`. */ - public static mrbind_test.mr.cs.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t___a385e102 GetTuple2() + public static mrbind_test.mr.cs.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___332c5840 GetTuple2() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_std_tuple_like.H0.MR_StdTupleLike_GetTuple2.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const_int32_t_ref_const_float_ref_int32_t___a385e102(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_const_int32_t_const_float_int32_t_ref_float_ref_const___332c5840(__ret, true, null); } catch (java.lang.Throwable __e) { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java similarity index 98% rename from test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java index 8bed5155..fab3483e 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC`. */ -public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC +public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 { - private std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC() {} + private std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java similarity index 97% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java index 97fb581a..b17c6913 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref`. */ -public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref +public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140 { - private std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref() {} + private std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java similarity index 97% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java index 4764212a..92a7af3d 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref`. */ -public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref +public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 { - private std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref() {} + private std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14() {} public static final class H0 { diff --git a/test/output_java/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.java similarity index 98% rename from test/output_java/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.java index 743c7ec5..d0119ca4 100644 --- a/test/output_java/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd`. */ -public final class std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd +public final class std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b { - private std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd() {} + private std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b() {} public static final class H0 { diff --git a/test/output_java/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java similarity index 97% rename from test/output_java/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java index 5e31e992..602abe0e 100644 --- a/test/output_java/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref`. */ -public final class std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref +public final class std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8 { - private std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref() {} + private std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java similarity index 98% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java index 90a276f0..5265e024 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/ffi/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java @@ -1,9 +1,9 @@ package mrbind_test.ffi; /** The downcall handles of the C bindings file `std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref`. */ -public final class std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref +public final class std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941 { - private std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref() {} + private std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941() {} public static final class H0 { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/Functions.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/Functions.java index ba9d1fb8..89b8aa18 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/Functions.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/Functions.java @@ -1963,7 +1963,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_set_float_const_iterator a, * * Calls `MR_C_sub_MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator()`. */ - public static long opSub(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator b) + public static long opSub(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 b) { try { @@ -1987,7 +1987,7 @@ public static long opSub(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaul * * Calls `MR_C_equal_MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 a, mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 b) { try { @@ -2371,7 +2371,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_unordered_set_MR_StdContaine * * Calls `MR_C_equal_MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator a, mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 a, mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 b) { try { @@ -2491,7 +2491,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_multimap_MR_StdContainers_No * * Calls `MR_C_equal_MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator a, mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 a, mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 b) { try { @@ -2539,7 +2539,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_unordered_map_MR_StdContaine * * Calls `MR_C_equal_MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 b) { try { @@ -2563,7 +2563,7 @@ public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdCon * * Calls `MR_C_equal_MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator()`. */ - public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator b) + public static boolean opEqual(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 a, mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 b) { try { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java similarity index 73% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java index 570af0ba..75405d5e 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC extends mrbind_test.CppObject +public final class std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC::__destroy : null, owner);} + public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_DefaultConstruct()`. */ - public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC() + public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873() { this(__ctor_defaultConstruct(), true, null); } @@ -37,7 +37,7 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_DefaultConstruct.invokeExact(); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_DefaultConstruct.invokeExact(); mrbind_test.Ffi.checkException(); return __ret; } @@ -53,16 +53,16 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructFromAnother()`. */ - public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC other) + public std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 other) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructFromAnother.invokeExact(mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructFromAnother.invokeExact(mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); return __ret; } @@ -82,11 +82,11 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC other) + public void assignFromAnother(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 other) { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignFromAnother.invokeExact(rawPointer(), mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignFromAnother.invokeExact(rawPointer(), mrbind_test.Ffi.PASS_BY_COPY, mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); } catch (java.lang.Throwable __e) @@ -109,7 +109,7 @@ public boolean has_value() { try { - boolean __ret = (boolean)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_has_value.invokeExact(rawPointer()); + boolean __ret = (boolean)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_has_value.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -132,7 +132,7 @@ public void reset() { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_reset.invokeExact(rawPointer()); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_reset.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); } catch (java.lang.Throwable __e) @@ -154,7 +154,7 @@ public mrbind_test.mr.csharp.ExposedLayoutC call(mrbind_test.mr.csharp.ExposedLa { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_call.invokeExact((java.lang.foreign.SegmentAllocator)java.lang.foreign.Arena.ofAuto(), rawPointer(), mrbind_test.Ffi.ptrNonNull(_1, "_1")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_call.invokeExact((java.lang.foreign.SegmentAllocator)java.lang.foreign.Arena.ofAuto(), rawPointer(), mrbind_test.Ffi.ptrNonNull(_1, "_1")); mrbind_test.Ffi.checkException(); return new mrbind_test.mr.csharp.ExposedLayoutC(__ret, null); } @@ -176,7 +176,7 @@ public interface Fn mrbind_test.mr.csharp.ExposedLayoutC call(mrbind_test.mr.csharp.ExposedLayoutC _1); } - private static final java.lang.foreign.MemorySegment CALL_STUB = mrbind_test.Ffi.upcall(java.lang.invoke.MethodHandles.lookup(), std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.class, "__call", java.lang.foreign.FunctionDescriptor.of(mrbind_test.mr.csharp.ExposedLayoutC.LAYOUT, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS)); + private static final java.lang.foreign.MemorySegment CALL_STUB = mrbind_test.Ffi.upcall(java.lang.invoke.MethodHandles.lookup(), std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.class, "__call", java.lang.foreign.FunctionDescriptor.of(mrbind_test.mr.csharp.ExposedLayoutC.LAYOUT, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS, java.lang.foreign.ValueLayout.ADDRESS)); private static java.lang.foreign.MemorySegment __call(java.lang.foreign.MemorySegment _1, java.lang.foreign.MemorySegment _userdata, java.lang.foreign.MemorySegment _cleanup_value) { @@ -196,13 +196,13 @@ private static java.lang.foreign.MemorySegment __call(java.lang.foreign.MemorySe /** Constructs an instance holding a Java callable. The copies of the instance share it. An exception thrown by the callable is rethrown by the wrapper that called into C. * * Calls `MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructEx()`. */ - public static mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC of(Fn func) + public static mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 of(Fn func) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructEx.invokeExact(CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_ConstructEx.invokeExact(CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(__ret, true, null); + return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -217,7 +217,7 @@ public void assignFn(Fn func) { try { - mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignEx.invokeExact(rawPointer(), CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); + mrbind_test.ffi.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873.H0.MR_C_std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC_AssignEx.invokeExact(rawPointer(), CALL_STUB, mrbind_test.Ffi.newCallbackState(java.util.Objects.requireNonNull(func, "func")), java.lang.foreign.MemorySegment.NULL, mrbind_test.Ffi.CALLBACK_STATE_STUB); mrbind_test.Ffi.checkException(); } catch (java.lang.Throwable __e) diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java similarity index 77% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java index 71b5a4f3..928a27b0 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref extends mrbind_test.CppObject +public final class std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref::__destroy : null, owner);} + public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -30,7 +30,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Construct()`. */ - public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) + public std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) { this(__ctor_construct(_0, _1), true, null); } @@ -39,7 +39,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(mrbind_test.mr.c { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); mrbind_test.Ffi.checkException(); return __ret; } @@ -64,7 +64,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_MR_CSharp_ExposedLayout_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); @@ -89,7 +89,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_const_MR_CSharp_ExposedLayout_ref { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_const_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref_get_const_MR_CSharp_ExposedLayout_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java similarity index 74% rename from test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java index 2727d2f7..7393e212 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref extends mrbind_test.CppObject +public final class std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref::__destroy : null, owner);} + public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -29,16 +29,16 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_ConstructFromAnother()`. */ - public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref other) + public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 other) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); return __ret; } @@ -59,7 +59,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Construct()`. */ - public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) + public std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(mrbind_test.mr.csharp.ExposedLayout _0, mrbind_test.mr.csharp.ExposedLayout _1) { this(__ctor_construct(_0, _1), true, null); } @@ -68,7 +68,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(mrbind_test.mr.c { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.ptrNonNull(_0, "_0"), mrbind_test.Ffi.ptrNonNull(_1, "_1")); mrbind_test.Ffi.checkException(); return __ret; } @@ -93,7 +93,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_MR_CSharp_ExposedLayout_rvalue_re { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); @@ -118,7 +118,7 @@ public mrbind_test.mr.csharp.ExposedLayout get_const_MR_CSharp_ExposedLayout_rva { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_const_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14.H0.MR_C_std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref_get_const_MR_CSharp_ExposedLayout_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.csharp.ExposedLayout(__ret.reinterpret(mrbind_test.mr.csharp.ExposedLayout.LAYOUT.byteSize()), __owner); diff --git a/test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048.java similarity index 73% rename from test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048.java index f8a53944..53573d75 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a extends mrbind_test.CppObject +public final class std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a::__destroy : null, owner);} + public std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -36,7 +36,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_Construct()`. Some types are raw C types, see the C bindings for the details. */ - public std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a(int _0, float _1, java.lang.foreign.MemorySegment _2, java.lang.foreign.MemorySegment _3, int _4, float _5, java.lang.foreign.MemorySegment _6, java.lang.foreign.MemorySegment _7, int _8, float _9) + public std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048(int _0, float _1, java.lang.foreign.MemorySegment _2, java.lang.foreign.MemorySegment _3, int _4, float _5, java.lang.foreign.MemorySegment _6, java.lang.foreign.MemorySegment _7, int _8, float _9) { this(__ctor_construct(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9), true, null); } @@ -45,7 +45,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(int _0, float _1 { try (java.lang.foreign.Arena __arena = java.lang.foreign.Arena.ofConfined()) { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_Construct.invokeExact(_0, _1, _2, _3, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _4), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _5), _6, _7, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _8), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _9)); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_Construct.invokeExact(_0, _1, _2, _3, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _4), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _5), _6, _7, mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _8), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _9)); mrbind_test.Ffi.checkException(); return __ret; } @@ -65,7 +65,7 @@ public int get_const_int() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -89,7 +89,7 @@ public float get_const_float() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } @@ -113,7 +113,7 @@ public java.lang.foreign.MemorySegment get_int_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_int_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_int_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -137,7 +137,7 @@ public java.lang.foreign.MemorySegment get_float_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_float_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_float_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -161,7 +161,7 @@ public int get_const_int_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -185,7 +185,7 @@ public float get_const_float_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } @@ -209,7 +209,7 @@ public java.lang.foreign.MemorySegment get_int_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_int_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_int_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -233,7 +233,7 @@ public java.lang.foreign.MemorySegment get_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -257,7 +257,7 @@ public int get_const_int_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_int_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -281,7 +281,7 @@ public float get_const_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_flo__22dd.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___843c200b.H0.MR_C_std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float_rvalue_ref_const_int_rvalue_ref_const_float_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } diff --git a/test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java similarity index 73% rename from test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java index 56219490..a3babc68 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref extends mrbind_test.CppObject +public final class std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref::__destroy : null, owner);} + public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -29,16 +29,16 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_ConstructFromAnother()`. */ - public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref other) + public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8(mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8 other) { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_ConstructFromAnother.invokeExact(mrbind_test.Ffi.ptrNonNull(other, "other")); mrbind_test.Ffi.checkException(); return __ret; } @@ -61,7 +61,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Construct()`. */ - public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(int _0, float _1, java.lang.String _2, java.lang.String _3) + public std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8(int _0, float _1, java.lang.String _2, java.lang.String _3) { this(__ctor_construct(_0, _1, _2, _3), true, null); } @@ -72,7 +72,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(int _0, float _1 { java.lang.foreign.MemorySegment __str__2 = mrbind_test.Ffi.utf8(__arena, java.util.Objects.requireNonNull(_2, "_2")); java.lang.foreign.MemorySegment __str__3 = mrbind_test.Ffi.utf8(__arena, java.util.Objects.requireNonNull(_3, "_3")); - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _0), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _1), __str__2, mrbind_test.Ffi.end(__str__2), __str__3, mrbind_test.Ffi.end(__str__3)); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_Construct.invokeExact(mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_INT, _0), mrbind_test.Ffi.alloc(__arena, java.lang.foreign.ValueLayout.JAVA_FLOAT, _1), __str__2, mrbind_test.Ffi.end(__str__2), __str__3, mrbind_test.Ffi.end(__str__3)); mrbind_test.Ffi.checkException(); return __ret; } @@ -92,7 +92,7 @@ public int get_const_int_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_int_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_int_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_INT, 0); } @@ -116,7 +116,7 @@ public float get_const_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret.reinterpret(4).get(java.lang.foreign.ValueLayout.JAVA_FLOAT, 0); } @@ -140,7 +140,7 @@ public mrbind_test.mr.cs.std_string get_const_std_string_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); @@ -165,7 +165,7 @@ public mrbind_test.mr.cs.std_string get_const_std_string_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8.H0.MR_C_std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref_get_const_std_string_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); diff --git a/test/output_java/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java similarity index 79% rename from test/output_java/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java index eb36d206..4cbb58c6 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.java @@ -6,16 +6,16 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref extends mrbind_test.CppObject +public final class std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref::__destroy : null, owner);} + public std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { try { - mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Destroy.invokeExact(ptr); + mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Destroy.invokeExact(ptr); } catch (java.lang.Throwable e) { @@ -32,7 +32,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Construct()`. Some types are raw C types, see the C bindings for the details. */ - public std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref(java.lang.foreign.MemorySegment _0, java.lang.foreign.MemorySegment _1, mrbind_test.mr.cs.std_string _2, java.lang.String _3) + public std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941(java.lang.foreign.MemorySegment _0, java.lang.foreign.MemorySegment _1, mrbind_test.mr.cs.std_string _2, java.lang.String _3) { this(__ctor_construct(_0, _1, _2, _3), true, null); } @@ -42,7 +42,7 @@ private static java.lang.foreign.MemorySegment __ctor_construct(java.lang.foreig try (java.lang.foreign.Arena __arena = java.lang.foreign.Arena.ofConfined()) { java.lang.foreign.MemorySegment __str__3 = mrbind_test.Ffi.utf8(__arena, java.util.Objects.requireNonNull(_3, "_3")); - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Construct.invokeExact(_0, _1, mrbind_test.Ffi.ptrNonNull(_2, "_2"), __str__3, mrbind_test.Ffi.end(__str__3)); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_Construct.invokeExact(_0, _1, mrbind_test.Ffi.ptrNonNull(_2, "_2"), __str__3, mrbind_test.Ffi.end(__str__3)); mrbind_test.Ffi.checkException(); return __ret; } @@ -66,7 +66,7 @@ public java.lang.foreign.MemorySegment get_int_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_int_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_int_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -90,7 +90,7 @@ public java.lang.foreign.MemorySegment get_float_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_float_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); return __ret; } @@ -114,7 +114,7 @@ public mrbind_test.mr.cs.std_string get_std_string_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); @@ -139,7 +139,7 @@ public mrbind_test.mr.cs.std_string get_std_string_rvalue_ref() { try { - java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_rvalue_ref.invokeExact(rawPointer()); + java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941.H0.MR_C_std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref_get_std_string_rvalue_ref.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; return new mrbind_test.mr.cs.std_string(__ret, false, __owner); diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java index f82d6439..beecce1b 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float.java @@ -223,13 +223,13 @@ public boolean contains(mrbind_test.mr.stdcontainers.NonAssignable key) * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_find()`. */ - public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator find(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 find(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_map_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_find.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -273,13 +273,13 @@ public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_ * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_begin()`. */ - public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator begin() + public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_map_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -296,7 +296,7 @@ public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_ * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 iter) { try { @@ -369,13 +369,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_Non * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_end()`. */ - public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator end() + public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_map_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -392,7 +392,7 @@ public mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_ * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 iter) { try { diff --git a/test/output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java similarity index 93% rename from test/output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java index 7f7a0983..84fe1007 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator extends mrbind_test.CppObject +public final class std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator::__destroy : null, owner);} + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_DefaultConstruct()`. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator() + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_ConstructFromAnother()`. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator other) + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713 other) { try { @@ -105,7 +105,7 @@ public void assignFromAnother(mrbind_test.mr.cs.std_unordered_map_MR_StdContaine * * Calls `MR_C_std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator_from_mutable()`. */ - public std_unordered_map_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_iterator iter) + public std_unordered_map_MR_StdContainers_NonAssignable_float_const_ite__97007713(mrbind_test.mr.cs.std_unordered_map_MR_StdContainers_NonAssignable_float_iterator iter) { this(__ctor_from_mutable(iter), true, null); } diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java index 1e8f792e..4d713520 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float.java @@ -198,13 +198,13 @@ public long count(mrbind_test.mr.stdcontainers.NonAssignable key) * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator find(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 find(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -223,13 +223,13 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find_mut()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator find_mut(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 find_mut(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_find_mut.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -248,13 +248,13 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator begin() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -271,7 +271,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 iter) { try { @@ -296,13 +296,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainer * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin_mut()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator begin_mut() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 begin_mut() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_begin_mut.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -319,7 +319,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_begin_mut()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { try { @@ -344,13 +344,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainer * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator end() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -367,7 +367,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 iter) { try { @@ -392,13 +392,13 @@ public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_ * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end_mut()`. */ - public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator end_mut() + public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 end_mut() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multimap_MR_StdContainers_NonAssignable_float.H0.MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_end_mut.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -415,7 +415,7 @@ public mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_f * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_is_end_mut()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { try { diff --git a/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java similarity index 92% rename from test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java index 71f0330b..68a4cdca 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator extends mrbind_test.CppObject +public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator::__destroy : null, owner);} + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_DefaultConstruct()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator() + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_ConstructFromAnother()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator other) + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285 other) { try { @@ -105,12 +105,12 @@ public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdCon * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator_from_mutable()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_const_iterator(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_cons__8276285(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { this(__ctor_from_mutable(iter), true, null); } - private static java.lang.foreign.MemorySegment __ctor_from_mutable(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator iter) + private static java.lang.foreign.MemorySegment __ctor_from_mutable(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 iter) { try { diff --git a/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java similarity index 93% rename from test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java index f7672c58..c45e2ea0 100644 --- a/test/output_java/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator extends mrbind_test.CppObject +public final class std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator::__destroy : null, owner);} + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator_DefaultConstruct()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator() + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator_ConstructFromAnother()`. */ - public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator other) + public std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multimap_MR_StdContainers_NonAssignable_float_iter__8fb8fc8 other) { try { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java index da707bac..bfd13316 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable.java @@ -198,13 +198,13 @@ public long count(mrbind_test.mr.stdcontainers.NonAssignable key) * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_find()`. */ - public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator find(mrbind_test.mr.stdcontainers.NonAssignable key) + public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 find(mrbind_test.mr.stdcontainers.NonAssignable key) { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multiset_MR_StdContainers_NonAssignable.H0.MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_find.invokeExact(rawPointer(), mrbind_test.Ffi.ptrNonNull(key, "key")); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -223,13 +223,13 @@ public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_c * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_begin()`. */ - public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator begin() + public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multiset_MR_StdContainers_NonAssignable.H0.MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -246,7 +246,7 @@ public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_c * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 iter) { try { @@ -271,13 +271,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainer * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_end()`. */ - public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator end() + public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_unordered_multiset_MR_StdContainers_NonAssignable.H0.MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -294,7 +294,7 @@ public mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_c * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 iter) { try { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java similarity index 91% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java index 484b26bc..6d78a7dd 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator extends mrbind_test.CppObject +public final class std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator::__destroy : null, owner);} + public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator_DefaultConstruct()`. */ - public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator() + public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator_ConstructFromAnother()`. */ - public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator other) + public std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_unordered_multiset_MR_StdContainers_NonAssignable_const_iter__8fb8fc8 other) { try { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java index a3d8d80c..85c45a9d 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible.java @@ -554,7 +554,7 @@ public void erase_at_mutable_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_ * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_insert_at_iter()`. */ - public void insert_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator position, mrbind_test.mr.stdcontainers.NonDefaultConstructible new_elem) + public void insert_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 position, mrbind_test.mr.stdcontainers.NonDefaultConstructible new_elem) { try { @@ -578,7 +578,7 @@ public void insert_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefa * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_erase_at_iter()`. */ - public void erase_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator position) + public void erase_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 position) { try { @@ -602,13 +602,13 @@ public void erase_at_iter(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefau * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_begin()`. */ - public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator begin() + public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 begin() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_vector_MR_StdContainers_NonDefaultConstructible.H0.MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_begin.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -625,7 +625,7 @@ public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_con * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_is_begin()`. */ - public boolean is_begin(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator iter) + public boolean is_begin(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 iter) { try { @@ -698,13 +698,13 @@ public boolean is_begin(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefault * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_end()`. */ - public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator end() + public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 end() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.std_vector_MR_StdContainers_NonDefaultConstructible.H0.MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_end.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(__ret, true, null); + return new mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -721,7 +721,7 @@ public mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_con * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_is_end()`. */ - public boolean is_end(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator iter) + public boolean is_end(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 iter) { try { @@ -793,7 +793,7 @@ public boolean is_end(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultCo * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_to_index()`. */ - public long to_index(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator iter) + public long to_index(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 iter) { try { diff --git a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java similarity index 92% rename from test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java rename to test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java index f3f4e76e..4eb85c1e 100644 --- a/test/output_java_fixed_typedefs/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/cs/std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67.java @@ -6,10 +6,10 @@ * Instances created here own their C++ objects, see `CppObject`. */ @java.lang.SuppressWarnings({"restricted", "cast"}) -public final class std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator extends mrbind_test.CppObject +public final class std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 extends mrbind_test.CppObject { /** Wraps a pointer from the C bindings. If `owned`, the object is destroyed when the wrapper dies. `owner` is kept alive as long as this wrapper is. Not for normal use. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator::__destroy : null, owner);} + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(java.lang.foreign.MemorySegment ptr, boolean owned, java.lang.Object owner) {super(ptr, owned ? std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67::__destroy : null, owner);} private static void __destroy(java.lang.foreign.MemorySegment ptr) { @@ -28,7 +28,7 @@ private static void __destroy(java.lang.foreign.MemorySegment ptr) * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_DefaultConstruct()`. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator() + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67() { this(__ctor_defaultConstruct(), true, null); } @@ -53,12 +53,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_ConstructFromAnother()`. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator other) + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 other) { this(__ctor_constructFromAnother(other), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator other) + private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 other) { try { @@ -82,7 +82,7 @@ private static java.lang.foreign.MemorySegment __ctor_constructFromAnother(mrbin * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_AssignFromAnother()`. */ - public void assignFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator other) + public void assignFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67 other) { try { @@ -105,7 +105,7 @@ public void assignFromAnother(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonD * * Calls `MR_C_std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator_from_mutable()`. */ - public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterator(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_iterator iter) + public std_vector_MR_StdContainers_NonDefaultConstructible_const_iterat__7063b67(mrbind_test.mr.cs.std_vector_MR_StdContainers_NonDefaultConstructible_iterator iter) { this(__ctor_from_mutable(iter), true, null); } diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/csharp/Functions.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/csharp/Functions.java index c7a31e5a..0066c60c 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/csharp/Functions.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/csharp/Functions.java @@ -6334,13 +6334,13 @@ public static mrbind_test.mr.cs.std_tuple_const_int_std_string get_tuple_const() * * Calls `MR_CSharp_get_tuple_refs()`. */ - public static mrbind_test.mr.cs.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref get_tuple_refs() + public static mrbind_test.mr.cs.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941 get_tuple_refs() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_refs.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rvalue_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_int_ref_float_rvalue_ref_std_string_ref_std_string_rva__d6d42941(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -6353,13 +6353,13 @@ public static mrbind_test.mr.cs.std_tuple_int_ref_float_rvalue_ref_std_string_re * * Calls `MR_CSharp_get_tuple_crefs()`. */ - public static mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref get_tuple_crefs() + public static mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8 get_tuple_crefs() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_crefs.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string_ref_const_std_string_rvalue_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_const_int_ref_const_float_rvalue_ref_const_std_string___80503fe8(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -6391,13 +6391,13 @@ public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_const_MR_CShar * * Calls `MR_CSharp_get_tuple_exposed_lvalue_ref()`. */ - public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref get_tuple_exposed_lvalue_ref() + public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140 get_tuple_exposed_lvalue_ref() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_exposed_lvalue_ref.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLayout_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_CSharp_ExposedLay__1bab9140(__ret, true, null); } catch (java.lang.Throwable __e) { @@ -6410,13 +6410,13 @@ public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_ref_const_MR_C * * Calls `MR_CSharp_get_tuple_exposed_rvalue_ref()`. */ - public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref get_tuple_exposed_rvalue_ref() + public static mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14 get_tuple_exposed_rvalue_ref() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H1.MR_CSharp_get_tuple_exposed_rvalue_ref.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_ExposedLayout_rvalue_ref(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_MR_CSharp_ExposedLayout_rvalue_ref_const_MR_CSharp_Exp__2c745d14(__ret, true, null); } catch (java.lang.Throwable __e) { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/csharp/TestStdFunction.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/csharp/TestStdFunction.java index d2fc362c..486526f6 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/csharp/TestStdFunction.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/csharp/TestStdFunction.java @@ -60,12 +60,12 @@ private static java.lang.foreign.MemorySegment __ctor_defaultConstruct() * * Calls `MR_CSharp_TestStdFunction_ConstructFrom()`. */ - public TestStdFunction(mrbind_test.mr.cs.std_function_int_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int_int f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC f4, mrbind_test.mr.cs.std_function_int_ref_from_int_ref_int_rvalue_ref f5, mrbind_test.mr.cs.std_function_int_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) + public TestStdFunction(mrbind_test.mr.cs.std_function_int_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int_int f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 f4, mrbind_test.mr.cs.std_function_int_ref_from_int_ref_int_rvalue_ref f5, mrbind_test.mr.cs.std_function_int_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) { this(__ctor_constructFrom(f1, f2, f3, f4, f5, f6, f7), true, null); } - private static java.lang.foreign.MemorySegment __ctor_constructFrom(mrbind_test.mr.cs.std_function_int_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int_int f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC f4, mrbind_test.mr.cs.std_function_int_ref_from_int_ref_int_rvalue_ref f5, mrbind_test.mr.cs.std_function_int_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) + private static java.lang.foreign.MemorySegment __ctor_constructFrom(mrbind_test.mr.cs.std_function_int_from_std_string f1, mrbind_test.mr.cs.std_function_std_string_from_int_int f2, mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 f3, mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 f4, mrbind_test.mr.cs.std_function_int_ref_from_int_ref_int_rvalue_ref f5, mrbind_test.mr.cs.std_function_int_rvalue_ref f6, mrbind_test.mr.cs.std_function_void f7) { try { @@ -319,14 +319,14 @@ public void setF3(mrbind_test.mr.cs.std_function_MR_CSharp_E1_from_MR_CSharp_E1 * * Calls `MR_CSharp_TestStdFunction_Get_f4()`. */ - public mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC f4() + public mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 f4() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_csharp.H6.MR_CSharp_TestStdFunction_Get_f4.invokeExact(rawPointer()); mrbind_test.Ffi.checkException(); java.lang.Object __owner = this; - return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC(__ret, false, __owner); + return new mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873(__ret, false, __owner); } catch (java.lang.Throwable __e) { @@ -344,7 +344,7 @@ public mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_Ex * * Calls `MR_CSharp_TestStdFunction_Set_f4()`. */ - public void setF4(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayoutC value) + public void setF4(mrbind_test.mr.cs.std_function_MR_CSharp_ExposedLayoutC_from_MR_CSharp_ExposedLayo__90003873 value) { try { diff --git a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/stdtuplelike/Functions.java b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/stdtuplelike/Functions.java index 5940ada2..ad79d06a 100644 --- a/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/stdtuplelike/Functions.java +++ b/test/output_java_fixed_typedefs_64_only/src/mrbind_test/mr/stdtuplelike/Functions.java @@ -189,13 +189,13 @@ public static mrbind_test.mr.cs.std_tuple_int_float GetTuple() * * Calls `MR_StdTupleLike_GetTuple2()`. */ - public static mrbind_test.mr.cs.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a GetTuple2() + public static mrbind_test.mr.cs.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048 GetTuple2() { try { java.lang.foreign.MemorySegment __ret = (java.lang.foreign.MemorySegment)mrbind_test.ffi.MR.test_std_tuple_like.H0.MR_StdTupleLike_GetTuple2.invokeExact(); mrbind_test.Ffi.checkException(); - return new mrbind_test.mr.cs.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref_const_float_ref_int_rvalue_ref_float__e0da444a(__ret, true, null); + return new mrbind_test.mr.cs.std_tuple_const_int_const_float_int_ref_float_ref_const_int_ref___1836f048(__ret, true, null); } catch (java.lang.Throwable __e) {