Patch: FYI: remove NUM_OBJECT_METHODS macro

Patch: FYI: remove NUM_OBJECT_METHODS macro

[Tom Tromey]

I'm checking this in on the trunk and the 4.1 branch.

This removes a useless macro and its correspondingly confusing comment.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

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

Index: java/lang/natClassLoader.cc
===================================================================
--- java/lang/natClassLoader.cc	(revision 108588)
+++ java/lang/natClassLoader.cc	(working copy)
@@ -415,8 +415,6 @@
 
   // 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.
Index: include/jvm.h
===================================================================
--- include/jvm.h	(revision 108588)
+++ include/jvm.h	(working copy)
@@ -75,10 +75,6 @@
   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;