From 37c23f7ec9eaf3da231e6072be099e9cfc153ed4 Mon Sep 17 00:00:00 2001 From: Monnoroch Date: Fri, 27 Jul 2018 20:57:03 +0100 Subject: [PATCH] Compute JNI function signatures correctly for object arguments. Related to #76. --- generator/src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generator/src/lib.rs b/generator/src/lib.rs index ec6fc9d..9b12022 100644 --- a/generator/src/lib.rs +++ b/generator/src/lib.rs @@ -217,10 +217,10 @@ impl JavaName { } else if is_identifier(&token, "double") { ::__signature().to_owned() } else { - "".to_string() + format!("L{}_2", self.clone().with_underscores()) } } else { - "".to_string() + format!("L{}_2", self.clone().with_underscores()) } } @@ -4532,7 +4532,7 @@ mod java_generate_tests { #[no_mangle] #[doc(hidden)] - pub unsafe extern "C" fn Java_a_b_TestClass3_objectNativeFunc3__<'a>( + pub unsafe extern "C" fn Java_a_b_TestClass3_objectNativeFunc3__La_b_TestClass3_2<'a>( raw_env: *mut ::jni_sys::JNIEnv, object: ::jni_sys::jobject, arg: <::a::b::TestClass3 as ::rust_jni::JavaType>::__JniType, @@ -4610,7 +4610,7 @@ mod java_generate_tests { #[no_mangle] #[doc(hidden)] - pub unsafe extern "C" fn Java_a_b_TestClass3_objectStaticNativeFunc3__<'a>( + pub unsafe extern "C" fn Java_a_b_TestClass3_objectStaticNativeFunc3__La_b_TestClass3_2<'a>( raw_env: *mut ::jni_sys::JNIEnv, raw_class: ::jni_sys::jclass, arg: <::a::b::TestClass3 as ::rust_jni::JavaType>::__JniType,