[vmkit-commits] [vmkit] r61631 - in /vmkit/trunk/lib/JnJVM: Classpath/ClasspathConstructor.cpp VMCore/JavaObject.cpp VMCore/JnjvmClassLoader.cpp VMCore/JnjvmModule.cpp VMCore/LockedMap.h VMCore/VirtualTables.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sun Jan  4 14:21:19 2009
New Revision: 61631

URL: http://llvm.org/viewvc/llvm-project?rev=61631&view=rev
Log:
Fix includes.


Modified:
    vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
    vmkit/trunk/lib/JnJVM/VMCore/LockedMap.h
    vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp

Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp?rev=61631&r1=61630&r2=61631&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp Sun Jan  4 14:21:19 2009
@@ -15,6 +15,7 @@
 #include "JavaClass.h"
 #include "JavaObject.h"
 #include "JavaThread.h"
+#include "JavaTypes.h"
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
 #include "JnjvmClassLoader.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp?rev=61631&r1=61630&r2=61631&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp Sun Jan  4 14:21:19 2009
@@ -14,6 +14,7 @@
 #include "JavaClass.h"
 #include "JavaObject.h"
 #include "JavaThread.h"
+#include "JavaTypes.h"
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
 

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp?rev=61631&r1=61630&r2=61631&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Sun Jan  4 14:21:19 2009
@@ -35,6 +35,7 @@
 #include "ClasspathReflect.h"
 #include "JavaClass.h"
 #include "JavaConstantPool.h"
+#include "JavaString.h"
 #include "JavaThread.h"
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
@@ -43,6 +44,7 @@
 #include "JnjvmModuleProvider.h"
 #include "LockedMap.h"
 #include "Reader.h"
+#include "Zip.h"
 
 using namespace jnjvm;
 

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=61631&r1=61630&r2=61631&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Sun Jan  4 14:21:19 2009
@@ -18,6 +18,7 @@
 
 #include "JavaCache.h"
 #include "JavaJIT.h"
+#include "JavaString.h"
 #include "JavaThread.h"
 #include "JavaTypes.h"
 #include "JavaUpcalls.h"

Modified: vmkit/trunk/lib/JnJVM/VMCore/LockedMap.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/LockedMap.h?rev=61631&r1=61630&r2=61631&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/LockedMap.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/LockedMap.h Sun Jan  4 14:21:19 2009
@@ -18,7 +18,7 @@
 
 #include <map>
 
-#include <string.h>
+#include <cstring>
 
 #include "types.h"
 
@@ -27,15 +27,16 @@
 #include "mvm/PrintBuffer.h"
 #include "mvm/Threads/Locks.h"
 
-#include "JavaArray.h"
-#include "JavaClass.h"
-#include "JavaTypes.h"
-#include "JavaString.h"
-#include "Zip.h"
+#include "JavaArray.h" // for comparing UTF8s
 
 namespace jnjvm {
 
 class JavaObject;
+class JavaString;
+class Signdef;
+class Typedef;
+class UserCommonClass;
+class UserClassArray;
 
 struct ltutf8
 {

Modified: vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp?rev=61631&r1=61630&r2=61631&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp Sun Jan  4 14:21:19 2009
@@ -12,6 +12,7 @@
 #include "JavaArray.h"
 #include "JavaClass.h"
 #include "JavaObject.h"
+#include "JavaString.h"
 #include "JavaThread.h"
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"