This commit introduces C++ wrapper classes for Java heap objects.

[cacao.git] / src / vm / vm.cpp

diff --git a/src/vm/vm.cpp b/src/vm/vm.cpp
index 2000a5480105b96435331b4240b24a149aade64d..660f54544e4199a28d388ae40de3ca66593a7bc4 100644 (file)
--- a/src/vm/vm.cpp
+++ b/src/vm/vm.cpp
@@ -49,16 +49,6 @@
 #include "native/localref.h"
 #include "native/native.h"
 
-#include "native/include/java_lang_Object.h"             /* required by j.l.C */
-#include "native/include/java_lang_String.h"             /* required by j.l.C */
-
-#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
-# include "native/include/java_nio_ByteBuffer.h"        /* required by j.l.CL */
-# include "native/include/java_lang_ClassLoader.h"       /* required by j.l.C */
-#endif
-
-#include "native/include/java_lang_Class.h"
-
 #include "native/vm/nativevm.h"
 
 #include "threads/lock-common.h"
@@ -820,8 +810,9 @@ VM::VM(JavaVMInitArgs* vm_args)
           is smaller or equal than the assumption made in
           src/vmcore/class.h. */
 
-       if (sizeof(java_lang_Class) > sizeof(dummy_java_lang_Class))
-               vm_abort("vm_create: java_lang_Class structure is bigger than classinfo.object (%d > %d)", sizeof(java_lang_Class), sizeof(dummy_java_lang_Class));
+#warning FIXME We need to check the size of java.lang.Class!!!
+//     if (sizeof(java_lang_Class) > sizeof(dummy_java_lang_Class))
+//             vm_abort("vm_create: java_lang_Class structure is bigger than classinfo.object (%d > %d)", sizeof(java_lang_Class), sizeof(dummy_java_lang_Class));
 
        /* set the VM starttime */