[vmkit-commits] [vmkit] r65452 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaTypes.cpp JavaTypes.h

[Nicolas Geoffray]

Author: geoffray
Date: Wed Feb 25 07:53:39 2009
New Revision: 65452

URL: http://llvm.org/viewvc/llvm-project?rev=65452&view=rev
Log:
Code cleanup. No functionality changes.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.h

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp Wed Feb 25 07:53:39 2009
@@ -21,11 +21,11 @@
 }
 
 void ArrayTypedef::tPrintBuf(mvm::PrintBuffer* buf) const {
-  CommonClass::printClassName(keyName, buf);
+  UserCommonClass::printClassName(keyName, buf);
 }
 
 void ObjectTypedef::tPrintBuf(mvm::PrintBuffer* buf) const {
-  CommonClass::printClassName(pseudoAssocClassName, buf);
+  UserCommonClass::printClassName(pseudoAssocClassName, buf);
 }
 
 const char* Typedef::printString() const {
@@ -67,11 +67,11 @@
   return buf->contents()->cString();
 }
 
-void Signdef::printWithSign(CommonClass* cl, const UTF8* name,
+void Signdef::printWithSign(UserCommonClass* cl, const UTF8* name,
                             mvm::PrintBuffer* buf) const {
   getReturnType()->tPrintBuf(buf);
   buf->write(" ");
-  CommonClass::printClassName(cl->name, buf);
+  UserCommonClass::printClassName(cl->name, buf);
   buf->write("::");
   name->printUTF8(buf);
   humanPrintArgs(buf);

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.h Wed Feb 25 07:53:39 2009
@@ -13,24 +13,12 @@
 #include "types.h"
 
 #include "mvm/Allocator.h"
-#include "mvm/Object.h"
-
-#include "JnjvmClassLoader.h"
 
 namespace jnjvm {
 
-class Classpath;
-class ClassArray;
-class CommonClass;
-class JavaArray;
-class JavaJIT;
-class JavaObject;
-class Jnjvm;
-class JnjvmBootstrapLoader;
+class UserCommonClass;
 class JnjvmClassLoader;
-class UserClassArray;
 class UserClassPrimitive;
-class UserCommonClass;
 class UTF8;
 class UTF8Map;
 
@@ -288,7 +276,7 @@
   /// printWithSign - Print the signature of a method with the method's class
   /// and name.
   ///
-  void printWithSign(CommonClass* cl, const UTF8* name,
+  void printWithSign(UserCommonClass* cl, const UTF8* name,
                      mvm::PrintBuffer* buf) const;
   
   /// Signdef - Create a new Signdef.