Merge branch 'master' into java-ffi-android

[nit.git] / lib / jvm.nit

diff --git a/lib/jvm.nit b/lib/jvm.nit
index c969ecd..8a07b2a 100644 (file)
--- a/lib/jvm.nit
+++ b/lib/jvm.nit
@@ -118,7 +118,7 @@ extern class JavaVM `{JavaVM *`}
        # Create the JVM, returns its handle and store the a pointer to JniEnv in `env_ref`
        #
        # Unavailable on Android, where you cannot instanciate a new JVM.
-       new(args: JavaVMInitArgs, env_ref: JniEnvRef) import jni_error, JniEnvRef.jni_env=, JniEnv as nullable `{
+       new(args: JavaVMInitArgs, env_ref: JniEnvRef) import jni_error, JniEnvRef.jni_env=, JniEnv.as nullable `{
 
        #ifdef ANDROID
                JavaVM_jni_error(NULL, "JVM creation not supported on Android", 0);
@@ -256,7 +256,7 @@ extern class JniEnv `{JNIEnv *`}
                return (char*)(*recv)->GetStringUTFChars(recv, (jstring)jobj, NULL);
        `}
 
-       private fun convert_args_to_jni(args: nullable Array[nullable Object]): Pointer import Array[nullable Object] as not nullable, Array[nullable Object].[], Array[nullable Object].length, nullable Object.as(Int), nullable Object.as(Char), nullable Object.as(Bool), nullable Object.as(Float), nullable Object.as(JavaObject), nullable Object.as(String), String.to_cstring, String.length `{
+       private fun convert_args_to_jni(args: nullable Array[nullable Object]): Pointer import Array[nullable Object].as not nullable, Array[nullable Object].[], Array[nullable Object].length, nullable Object.as(Int), nullable Object.as(Char), nullable Object.as(Bool), nullable Object.as(Float), nullable Object.as(JavaObject), nullable Object.as(String), String.to_cstring, String.length `{
                if(nullable_Array_of_nullable_Object_is_null(args)){
                        return NULL;
                }