diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-22 17:33:05 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-22 17:33:05 +0000 |
| commit | 188678e4170271b41f8fb6f1da6fe37a98cae9b5 (patch) | |
| tree | c8af01fde67189143c71ca516fa0d0b08166b5eb /libjava | |
| parent | 20168cf29dbef684cb40d4b196bc3df39d8e34ee (diff) | |
| download | ppe42-gcc-188678e4170271b41f8fb6f1da6fe37a98cae9b5.tar.gz ppe42-gcc-188678e4170271b41f8fb6f1da6fe37a98cae9b5.zip | |
* java/lang/natClassLoader.cc (_Jv_NewArrayClass): Don't
reference NUM_OBJECT_METHODS.
* include/jvm.h (NUM_OBJECT_METHODS): Removed.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108956 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/include/jvm.h | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e3d2b03f231..2a2be7e96c1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-12-22 Tom Tromey <tromey@redhat.com> + + * java/lang/natClassLoader.cc (_Jv_NewArrayClass): Don't + reference NUM_OBJECT_METHODS. + * include/jvm.h (NUM_OBJECT_METHODS): Removed. + 2005-12-18 Anthony Green <green@redhat.com> * gnu/java/net/natPlainDatagramSocketImplPosix.cc (getLocalAddress): diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index 85caa40e23f..ca0aea8000e 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -75,10 +75,6 @@ struct _Jv_VTable static _Jv_VTable *new_vtable (int count); }; -// Number of virtual methods on object. FIXME: it sucks that we have -// to keep this up to date by hand. -#define NUM_OBJECT_METHODS 5 - union _Jv_word { jobject o; diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 43016bf5e63..cfb061291a7 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -415,8 +415,6 @@ _Jv_NewArrayClass (jclass element, java::lang::ClassLoader *loader, // Note that `vtable_method_count' doesn't include the initial // gc_descr slot. - JvAssert (java::lang::Object::class$.vtable_method_count - == NUM_OBJECT_METHODS); int dm_count = java::lang::Object::class$.vtable_method_count; // Create a new vtable by copying Object's vtable. |
