natClassLoader.cc (_Jv_NewArrayClass): Don't reference NUM_OBJECT_METHODS.

	* java/lang/natClassLoader.cc (_Jv_NewArrayClass): Don't
	reference NUM_OBJECT_METHODS.
	* include/jvm.h (NUM_OBJECT_METHODS): Removed.

From-SVN: r108956

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e3d2b03f2317f524e2f20d626e4c76e782fc71f8..2a2be7e96c10ff36797265cbc7b1c12bc55a51d9 100644 (file)
--- 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 85caa40e23f4d51369a55a4152f202e5f4ca4801..ca0aea8000e1dfb5de643a0fd31d83a382b3b810 100644 (file)
--- 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 43016bf5e63e6b6ef0020cd34a63672bef4c4cb2..cfb061291a781f0bf61f8d1c3962e09b935b23a8 100644 (file)
--- 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.