From 307719b97143646f73530f046493efc507351385 Mon Sep 17 00:00:00 2001 From: bothner Date: Thu, 12 Aug 2004 06:53:42 +0000 Subject: * gcj/javaprims.h (_Jv_Utf8Const): Change struct to a class, with private fields and access methods. (_Jv_NewStringUTF, _Jv_hashUtf8String): New function declarations. * gcj/cni.h (_Jv_NewStringUTF): Move to javaprims.h. * prims.cc (_Jv_Utf8COnst::init): New method implementation. ( _Jv_makeUtf8Const): Rewrite using new constructors. (hashUtf8String): Rename to +_Jv_hashUtf8String and make non-static. * defineclass.cc: Use new _Utf8Const access/convenience methods. * jni.cc: Likewise. * resolve.cc: Likewise. * gcj/field.h: Likewise. * include/jvm.h: Likewise. * java/lang/Class.h: Likewise. * java/lang/natClass.cc: Likwise. * java/lang/natClassLoader.cc: Likewise * java/lang/reflect/natMethod.cc: Likewise * verify.cc: Likewise. (_Jv_BytecodeVerifier::make_utf8_const): Optimize. (~_Jv_BytecodeVerifier): Don't need second _Jv_Free call. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@85854 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/reflect/natMethod.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libjava/java/lang/reflect') diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc index 8f9efdbb53b..58b1cf6fecd 100644 --- a/libjava/java/lang/reflect/natMethod.cc +++ b/libjava/java/lang/reflect/natMethod.cc @@ -246,7 +246,7 @@ _Jv_GetTypesFromSignature (jmethodID method, _Jv_Utf8Const* sig = method->signature; java::lang::ClassLoader *loader = declaringClass->getClassLoaderInternal(); - char *ptr = sig->data; + char *ptr = sig->chars(); int numArgs = 0; /* First just count the number of parameters. */ for (; ; ptr++) @@ -283,7 +283,7 @@ _Jv_GetTypesFromSignature (jmethodID method, JArray *args = (JArray *) JvNewObjectArray (numArgs, &java::lang::Class::class$, NULL); jclass* argPtr = elements (args); - for (ptr = sig->data; *ptr != '\0'; ptr++) + for (ptr = sig->chars(); *ptr != '\0'; ptr++) { int num_arrays = 0; jclass type; -- cgit v1.2.3