git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jni.cc (_Jv_JNI_NewObjectArray): Fixed return type. 

* jni.cc (_Jv_JNI_NewObjectArray): Fixed return type.
	* include/jni.h (struct JNINativeInterface) <NewObjectArray>: Now
	returns jobjectArray.
	(_Jv_JNIEnv::NewObjectArray): Likewise.

From-SVN: r90041
This commit is contained in:
Tom Tromey 2004-11-03 22:53:20 +00:00 committed by Tom Tromey
parent 939347bb51
commit cb0be2e79f
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -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> 2004-11-01 Tom Tromey <tromey@redhat.com>
* verify.cc (state::check_no_uninitialized_objects): Removed. * verify.cc (state::check_no_uninitialized_objects): Removed.

4
libjava/include/jni.h
View File

@ -555,7 +555,7 @@ struct JNINativeInterface
const char * (JNICALL *GetStringUTFChars) (JNIEnv *, jstring, jboolean *); const char * (JNICALL *GetStringUTFChars) (JNIEnv *, jstring, jboolean *);
void (JNICALL *ReleaseStringUTFChars) (JNIEnv *, jstring, const char *); void (JNICALL *ReleaseStringUTFChars) (JNIEnv *, jstring, const char *);
jsize (JNICALL *GetArrayLength) (JNIEnv *, jarray); 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); jobject (JNICALL *GetObjectArrayElement) (JNIEnv *, jobjectArray, jsize);
void (JNICALL *SetObjectArrayElement) (JNIEnv *, jobjectArray, jsize, void (JNICALL *SetObjectArrayElement) (JNIEnv *, jobjectArray, jsize,
jobject); jobject);
@ -1380,7 +1380,7 @@ public:
jsize GetArrayLength (jarray val0) jsize GetArrayLength (jarray val0)
{ return p->GetArrayLength (this, 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); } { return p->NewObjectArray (this, val0, cl1, obj2); }
jobject GetObjectArrayElement (jobjectArray val0, jsize val1) jobject GetObjectArrayElement (jobjectArray val0, jsize val1)

4
libjava/jni.cc
View File

@ -1396,7 +1396,7 @@ _Jv_JNI_GetArrayLength (JNIEnv *, jarray array)
return unwrap (array)->length; return unwrap (array)->length;
} }
static jarray JNICALL static jobjectArray JNICALL
_Jv_JNI_NewObjectArray (JNIEnv *env, jsize length, _Jv_JNI_NewObjectArray (JNIEnv *env, jsize length,
jclass elementClass, jobject init) jclass elementClass, jobject init)
{ {
@ -1407,7 +1407,7 @@ _Jv_JNI_NewObjectArray (JNIEnv *env, jsize length,
_Jv_CheckCast (elementClass, init); _Jv_CheckCast (elementClass, init);
jarray result = JvNewObjectArray (length, elementClass, init); jarray result = JvNewObjectArray (length, elementClass, init);
return (jarray) wrap_value (env, result); return (jobjectArray) wrap_value (env, result);
} }
catch (jthrowable t) catch (jthrowable t)
{ {