From cb0be2e79f4e051e90140d5183696ba663b6b1ab Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 3 Nov 2004 22:53:20 +0000 Subject: [PATCH] jni.cc (_Jv_JNI_NewObjectArray): Fixed return type. * jni.cc (_Jv_JNI_NewObjectArray): Fixed return type. * include/jni.h (struct JNINativeInterface) : Now returns jobjectArray. (_Jv_JNIEnv::NewObjectArray): Likewise. From-SVN: r90041 --- libjava/ChangeLog | 7 +++++++ libjava/include/jni.h | 4 ++-- libjava/jni.cc | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3f8e756..631679d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2004-11-03 Tom Tromey + + * jni.cc (_Jv_JNI_NewObjectArray): Fixed return type. + * include/jni.h (struct JNINativeInterface) : Now + returns jobjectArray. + (_Jv_JNIEnv::NewObjectArray): Likewise. + 2004-11-01 Tom Tromey * verify.cc (state::check_no_uninitialized_objects): Removed. diff --git a/libjava/include/jni.h b/libjava/include/jni.h index 51fa7cb..7765d3d 100644 --- a/libjava/include/jni.h +++ b/libjava/include/jni.h @@ -555,7 +555,7 @@ struct JNINativeInterface const char * (JNICALL *GetStringUTFChars) (JNIEnv *, jstring, jboolean *); void (JNICALL *ReleaseStringUTFChars) (JNIEnv *, jstring, const char *); jsize (JNICALL *GetArrayLength) (JNIEnv *, jarray); - jarray (JNICALL *NewObjectArray) (JNIEnv *, jsize, jclass, jobject); + jobjectArray (JNICALL *NewObjectArray) (JNIEnv *, jsize, jclass, jobject); jobject (JNICALL *GetObjectArrayElement) (JNIEnv *, jobjectArray, jsize); void (JNICALL *SetObjectArrayElement) (JNIEnv *, jobjectArray, jsize, jobject); @@ -1380,7 +1380,7 @@ public: jsize GetArrayLength (jarray val0) { return p->GetArrayLength (this, val0); } - jarray NewObjectArray (jsize val0, jclass cl1, jobject obj2) + jobjectArray NewObjectArray (jsize val0, jclass cl1, jobject obj2) { return p->NewObjectArray (this, val0, cl1, obj2); } jobject GetObjectArrayElement (jobjectArray val0, jsize val1) diff --git a/libjava/jni.cc b/libjava/jni.cc index 53491cb..6d8fd9d 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -1396,7 +1396,7 @@ _Jv_JNI_GetArrayLength (JNIEnv *, jarray array) return unwrap (array)->length; } -static jarray JNICALL +static jobjectArray JNICALL _Jv_JNI_NewObjectArray (JNIEnv *env, jsize length, jclass elementClass, jobject init) { @@ -1407,7 +1407,7 @@ _Jv_JNI_NewObjectArray (JNIEnv *env, jsize length, _Jv_CheckCast (elementClass, init); jarray result = JvNewObjectArray (length, elementClass, init); - return (jarray) wrap_value (env, result); + return (jobjectArray) wrap_value (env, result); } catch (jthrowable t) { -- 2.7.4