diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-10-06 01:49:32 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-10-06 01:49:32 +0000 |
| commit | 1d336a099d6c7f97e4fe1eec00d3906abf3dc617 (patch) | |
| tree | 92945f2a30eaa7e0f3d79dd9f1dac801adf8bbf4 /libjava/prims.cc | |
| parent | 331fe257d6f76701c2a2304cf95392026933bd67 (diff) | |
| download | gcc-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/prims.cc')
| -rw-r--r-- | libjava/prims.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libjava/prims.cc b/libjava/prims.cc index ef88190..8ca05da 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -67,9 +67,6 @@ details. */ #include <ltdl.h> #endif -#define ObjectClass _CL_Q34java4lang6Object -extern java::lang::Class ObjectClass; - // We allocate a single OutOfMemoryError exception which we keep // around for use if we run out of memory. static java::lang::OutOfMemoryError *no_memory; @@ -358,7 +355,8 @@ _Jv_AllocObject (jclass klass, jint size) // implementation would look for Object.finalize in Object's method // table at startup, and then use that information to find the // appropriate index in the method vector. - if (klass->vtable->get_finalizer() != ObjectClass.vtable->get_finalizer()) + if (klass->vtable->get_finalizer() + != java::lang::Object::class$.vtable->get_finalizer()) _Jv_RegisterFinalizer (obj, _Jv_FinalizeObject); #ifdef ENABLE_JVMPI @@ -915,7 +913,7 @@ _Jv_RunMain (const char *name, int argc, const char **argv, bool is_jar) arg_vec = JvConvertArgv (1, &_Jv_Jar_Class_Path); main_thread = - new gnu::gcj::runtime::FirstThread (&_CL_Q43gnu3gcj7runtime11FirstThread, + new gnu::gcj::runtime::FirstThread (&gnu::gcj::runtime::FirstThread::class$, arg_vec); main_thread->start(); _Jv_ThreadWait (); |