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

re PR libgcj/22036 (libjava/jni.cc compilation fix in cvs 2005-06-12) 

2005-06-13  Jim Huang  <jserv@kaffe.org>

	PR libgcj/22036:
	* jni.cc (_Jv_JNI_NewObjectV): Use chars() method.
	(_Jv_JNI_NewObject): Likewise.

From-SVN: r100897
This commit is contained in:
Jim Huang 2005-06-13 20:23:11 +00:00 committed by Tom Tromey
parent 885beb81ab
commit a61d70b8b5
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2005-06-13 Jim Huang <jserv@kaffe.org>
PR libgcj/22036:
* jni.cc (_Jv_JNI_NewObjectV): Use chars() method.
(_Jv_JNI_NewObject): Likewise.
2005-06-13 Tom Tromey <tromey@redhat.com> 2005-06-13 Tom Tromey <tromey@redhat.com>
PR java/21844: PR java/21844:

24
libjava/jni.cc
View File

@ -1112,10 +1112,10 @@ _Jv_JNI_NewObjectV (JNIEnv *env, jclass klass,
jmethodID id, va_list args) jmethodID id, va_list args)
{ {
JvAssert (klass && ! klass->isArray ()); JvAssert (klass && ! klass->isArray ());
JvAssert (! strcmp (id->name->data, "<init>") JvAssert (! strcmp (id->name->chars(), "<init>")
&& id->signature->length > 2 && id->signature->len() > 2
&& id->signature->data[0] == '(' && id->signature->chars()[0] == '('
&& ! strcmp (&id->signature->data[id->signature->length - 2], && ! strcmp (&id->signature->chars()[id->signature->len() - 2],
")V")); ")V"));
return _Jv_JNI_CallAnyMethodV<jobject, constructor> (env, NULL, klass, return _Jv_JNI_CallAnyMethodV<jobject, constructor> (env, NULL, klass,
@ -1126,10 +1126,10 @@ static jobject JNICALL
_Jv_JNI_NewObject (JNIEnv *env, jclass klass, jmethodID id, ...) _Jv_JNI_NewObject (JNIEnv *env, jclass klass, jmethodID id, ...)
{ {
JvAssert (klass && ! klass->isArray ()); JvAssert (klass && ! klass->isArray ());
JvAssert (! strcmp (id->name->data, "<init>") JvAssert (! strcmp (id->name->chars(), "<init>")
&& id->signature->length > 2 && id->signature->len() > 2
&& id->signature->data[0] == '(' && id->signature->chars()[0] == '('
&& ! strcmp (&id->signature->data[id->signature->length - 2], && ! strcmp (&id->signature->chars()[id->signature->len() - 2],
")V")); ")V"));
va_list args; va_list args;
@ -1148,10 +1148,10 @@ _Jv_JNI_NewObjectA (JNIEnv *env, jclass klass, jmethodID id,
jvalue *args) jvalue *args)
{ {
JvAssert (klass && ! klass->isArray ()); JvAssert (klass && ! klass->isArray ());
JvAssert (! strcmp (id->name->data, "<init>") JvAssert (! strcmp (id->name->chars(), "<init>")
&& id->signature->length > 2 && id->signature->len() > 2
&& id->signature->data[0] == '(' && id->signature->chars()[0] == '('
&& ! strcmp (&id->signature->data[id->signature->length - 2], && ! strcmp (&id->signature->chars()[id->signature->len() - 2],
")V")); ")V"));
return _Jv_JNI_CallAnyMethodA<jobject, constructor> (env, NULL, klass, return _Jv_JNI_CallAnyMethodA<jobject, constructor> (env, NULL, klass,