[vmkit-commits] [vmkit] r56204 - /vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Sep 15 06:29:19 2008
New Revision: 56204

URL: http://llvm.org/viewvc/llvm-project?rev=56204&view=rev
Log:
Use equals() instead of ==.


Modified:
    vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp

Modified: vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp?rev=56204&r1=56203&r2=56204&view=diff

==============================================================================
--- vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp Mon Sep 15 06:29:19 2008
@@ -223,10 +223,8 @@
                                uint32 nb) : 
   CommonClass(loader, n, false) {
  
-#ifndef MULTIPLE_VM
   display = (CommonClass**)malloc(sizeof(CommonClass*));
   display[0] = this;
-#endif
   primitive = true;
   status = ready;
   access = ACC_ABSTRACT | ACC_FINAL | ACC_PUBLIC;
@@ -248,12 +246,10 @@
   _baseClass = 0;
   super = ClassArray::SuperArray;
   interfaces = ClassArray::InterfacesArray;
-#ifndef MULTIPLE_VM
   depth = 1;
   display = (CommonClass**)malloc(2 * sizeof(CommonClass*));
-  display[0] = JnjvmBootstrapLoader::SuperArray;
+  display[0] = ClassArray::SuperArray;
   display[1] = this;
-#endif
   access = ACC_FINAL | ACC_ABSTRACT;
 }
 
@@ -776,7 +772,7 @@
        e = virtualMethods.end(); i != e; ++i) {
     JavaMethod* meth = i->second;
     bool pub = isPublic(meth->access);
-    if (meth->name == Jnjvm::initName && (!publicOnly || pub)) {
+    if (meth->name->equals(Jnjvm::initName) && (!publicOnly || pub)) {
       res.push_back(meth);
     }
   }
@@ -788,7 +784,7 @@
        e = virtualMethods.end(); i != e; ++i) {
     JavaMethod* meth = i->second;
     bool pub = isPublic(meth->access);
-    if (meth->name != Jnjvm::initName && (!publicOnly || pub)) {
+    if (!(meth->name->equals(Jnjvm::initName)) && (!publicOnly || pub)) {
       res.push_back(meth);
     }
   }
@@ -797,7 +793,7 @@
        e = staticMethods.end(); i != e; ++i) {
     JavaMethod* meth = i->second;
     bool pub = isPublic(meth->access);
-    if (meth->name != Jnjvm::clinitName && (!publicOnly || pub)) {
+    if (!(meth->name->equals(Jnjvm::clinitName)) && (!publicOnly || pub)) {
       res.push_back(meth);
     }
   }