diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-03 22:53:20 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-03 22:53:20 +0000 |
| commit | c9453cf9d4a304956c75405e72fcc9dc253c6a45 (patch) | |
| tree | 23cd7c7c62febbe582e9b5f54879836b695fa331 /libjava | |
| parent | 5525676133f067f65262799dd1776c5261968552 (diff) | |
| download | gcc-c9453cf9d4a304956c75405e72fcc9dc253c6a45.tar.gz | |
* jni.cc (_Jv_JNI_NewObjectArray): Fixed return type.
* include/jni.h (struct JNINativeInterface) <NewObjectArray>: Now
returns jobjectArray.
(_Jv_JNIEnv::NewObjectArray): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90041 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/include/jni.h | 4 | ||||
| -rw-r--r-- | libjava/jni.cc | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3f8e756314a..631679dea68 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2004-11-03 Tom Tromey <tromey@redhat.com> + + * jni.cc (_Jv_JNI_NewObjectArray): Fixed return type. + * include/jni.h (struct JNINativeInterface) <NewObjectArray>: Now + returns jobjectArray. + (_Jv_JNIEnv::NewObjectArray): Likewise. + 2004-11-01 Tom Tromey <tromey@redhat.com> * verify.cc (state::check_no_uninitialized_objects): Removed. diff --git a/libjava/include/jni.h b/libjava/include/jni.h index 51fa7cbe1f6..7765d3d66de 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 53491cb606d..6d8fd9db321 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) { |