aboutsummaryrefslogtreecommitdiff
path: root/libjava/gcj
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>2000-10-06 01:49:32 +0000
committerTom Tromey <tromey@gcc.gnu.org>2000-10-06 01:49:32 +0000
commit1d336a099d6c7f97e4fe1eec00d3906abf3dc617 (patch)
tree92945f2a30eaa7e0f3d79dd9f1dac801adf8bbf4 /libjava/gcj
parent331fe257d6f76701c2a2304cf95392026933bd67 (diff)
downloadgcc-1d336a099d6c7f97e4fe1eec00d3906abf3dc617.zip
gcc-1d336a099d6c7f97e4fe1eec00d3906abf3dc617.tar.gz
gcc-1d336a099d6c7f97e4fe1eec00d3906abf3dc617.tar.bz2
natField.cc (BooleanClass): Don't define.
* java/lang/reflect/natField.cc (BooleanClass): Don't define. * java/lang/reflect/natArray.cc (BooleanClass): Don't define. * java/lang/Class.h (Object): Added `class$' field. * java/lang/Object.h (Object): Added `class$' field. * defineclass.cc (ClassClass): Use `class$' form. (ClassObject): Likewise. * resolve.cc (ClassObject): Use `class$' form. (ObjectClass): Likewise. * interpret.cc (ClassError): Removed. * java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Use `class$' form. (IntegerClass): Likewise. * java/net/natPlainSocketImpl.cc (BooleanClass): Use `class$' form. * java/lang/natClassLoader.cc (CloneableClass): Use `class$' form. (ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass, SerializableClass): Likewise. Include Serializable.h, Cloneable.h. * java/lang/natSystem.cc (SystemClass): Removed. (init_properties): Use `class$' form. * java/lang/natObject.cc (CloneableClass): Removed. (clone): Use `class$' form. * java/lang/natClass.cc (CloneableClass): Use `class$' form. (ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass, ConstructorClass): Likewise. * java/lang/reflect/natMethod.cc (ObjectClass): Use `class$' form. (ClassClass, VoidClass, ByteClass, ShortClass, CharacterClass, IntegerClass, LongClass, FloatClass, DoubleClass): Likewise. * java/io/natObjectInputStream.cc (ObjectClass): Use `class$' form. (ClassClass): Likewise. * include/jvm.h (StringClass): Use `class$' form. * prims.cc (ObjectClass): Removed. (_Jv_RunMain): Use `class$' form. (_Jv_AllocObject): Likewise. * jni.cc (ClassClass): Use `class$' form. (ThrowableClass): Likewise. (ObjectClass): Likewise. (MethodClass): Likewise. (ThreadGroupClass): Likewise. (NativeThreadClass): Likewise. * boehm.cc (ObjectClass): Removed. (ClassClass): Removed. (_Jv_MarkObj): Use `class$' form. * gcj/field.h (JvFieldIsRef): Use `class$' form. Include RawData.h. From-SVN: r36740
Diffstat (limited to 'libjava/gcj')
-rw-r--r--libjava/gcj/field.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/libjava/gcj/field.h b/libjava/gcj/field.h
index 0ad381c..9279c83 100644
--- a/libjava/gcj/field.h
+++ b/libjava/gcj/field.h
@@ -14,6 +14,7 @@ details. */
#include <java/lang/Class.h>
#include <java/lang/reflect/Field.h>
#include <java/lang/reflect/Modifier.h>
+#include <gnu/gcj/RawData.h>
#define _Jv_FIELD_UNRESOLVED_FLAG 0x8000
#define _Jv_FIELD_CONSTANT_VALUE 0x4000
@@ -179,9 +180,7 @@ JvNumStaticFields (jclass klass)
extern inline jboolean
JvFieldIsRef (jfieldID field)
{
- // gnu.gcj.RawData.class is _CL_Q33gnu3gcj7RawData
- extern java::lang::Class _CL_Q33gnu3gcj7RawData;
- return field->isRef () && field->type != &_CL_Q33gnu3gcj7RawData;
+ return field->isRef () && field->type != &gnu::gcj::RawData::class$;
}
extern inline jobject