[vmkit-commits] [vmkit] r136810 - in /vmkit/trunk/lib/J3/VMCore: JavaString.cpp JavaString.h LockedMap.h

[Nicolas Geoffray]

Author: geoffray
Date: Wed Aug  3 15:46:46 2011
New Revision: 136810

URL: http://llvm.org/viewvc/llvm-project?rev=136810&view=rev
Log:
Please g++ 4.0 headers on mac.

Modified:
    vmkit/trunk/lib/J3/VMCore/JavaString.cpp
    vmkit/trunk/lib/J3/VMCore/JavaString.h
    vmkit/trunk/lib/J3/VMCore/LockedMap.h

Modified: vmkit/trunk/lib/J3/VMCore/JavaString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaString.cpp?rev=136810&r1=136809&r2=136810&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaString.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaString.cpp Wed Aug  3 15:46:46 2011
@@ -19,7 +19,7 @@
 
 JavaVirtualTable* JavaString::internStringVT = 0;
 
-JavaString* JavaString::stringDup(const ArrayUInt16*& _array, Jnjvm* vm) {
+JavaString* JavaString::stringDup(const ArrayUInt16 *const& _array, Jnjvm* vm) {
   
   JavaString* res = 0;
   const ArrayUInt16* array = _array;

Modified: vmkit/trunk/lib/J3/VMCore/JavaString.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaString.h?rev=136810&r1=136809&r2=136810&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaString.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaString.h Wed Aug  3 15:46:46 2011
@@ -40,7 +40,7 @@
     return self->value;
   }
   
-  static JavaString* stringDup(const ArrayUInt16*& array, Jnjvm* vm);
+  static JavaString* stringDup(const ArrayUInt16 *const & array, Jnjvm* vm);
 
   /// internalToJava - Creates a copy of the UTF8 at its given offset and size
   /// with all its '.' replaced by '/'. The JVM bytecode reference classes in

Modified: vmkit/trunk/lib/J3/VMCore/LockedMap.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/LockedMap.h?rev=136810&r1=136809&r2=136810&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/LockedMap.h (original)
+++ vmkit/trunk/lib/J3/VMCore/LockedMap.h Wed Aug  3 15:46:46 2011
@@ -39,19 +39,19 @@
 class UserClassArray;
 
 struct ltarray16 {
-  bool operator()(const ArrayUInt16* s1, const ArrayUInt16* s2) const;
+  bool operator()(const ArrayUInt16 *const s1, const ArrayUInt16 *const s2) const;
 };
 
 class StringMap : public mvm::PermanentObject {
 public:
-  typedef std::map<const ArrayUInt16*, JavaString*, ltarray16>::iterator iterator;
-  typedef JavaString* (*funcCreate)(const ArrayUInt16*& V, Jnjvm* vm);
+  typedef std::map<const ArrayUInt16 *const, JavaString*, ltarray16>::iterator iterator;
+  typedef JavaString* (*funcCreate)(const ArrayUInt16 *const& V, Jnjvm* vm);
 
   mvm::LockNormal lock;
-  std::map<const ArrayUInt16*, JavaString*, ltarray16,
-           std::allocator<std::pair<const ArrayUInt16*, JavaString*> > > map;
+  std::map<const ArrayUInt16 *const, JavaString*, ltarray16,
+           std::allocator<std::pair<const ArrayUInt16 *const, JavaString*> > > map;
   
-  inline JavaString* lookupOrCreate(const ArrayUInt16* array, Jnjvm* vm, funcCreate func) {
+  inline JavaString* lookupOrCreate(const ArrayUInt16 *const array, Jnjvm* vm, funcCreate func) {
     JavaString* res = 0;
     llvm_gcroot(res, 0);
     llvm_gcroot(array, 0);
@@ -69,14 +69,14 @@
     }
   }
   
-  inline void remove(const ArrayUInt16* array) {
+  inline void remove(const ArrayUInt16 *const array) {
     llvm_gcroot(array, 0);
     lock.lock();
     map.erase(array);
     lock.unlock();
   }
-  
-  inline JavaString* lookup(const ArrayUInt16* array) {
+
+  inline JavaString* lookup(const ArrayUInt16 *const array) {
     llvm_gcroot(array, 0);
     lock.lock();
     iterator End = map.end();
@@ -85,7 +85,7 @@
     return I != End ? ((JavaString*)(I->second)) : 0; 
   }
 
-  inline void hash(const ArrayUInt16* array, JavaString* str) {
+  inline void hash(const ArrayUInt16 *const array, JavaString* str) {
     llvm_gcroot(array, 0);
     llvm_gcroot(str, 0);
     lock.lock();
@@ -93,12 +93,12 @@
     lock.unlock();
   }
 
-  inline void removeUnlocked(const ArrayUInt16* array, JavaString* str) {
+  inline void removeUnlocked(const ArrayUInt16 *const array, JavaString* str) {
     llvm_gcroot(str, 0);
     llvm_gcroot(array, 0);
     iterator End = map.end();
     iterator I = map.find(array);
-    
+
     if (I != End && I->second == str) map.erase(I); 
   }