harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcfi...@apache.org
Subject svn commit: r653522 - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm: VMInterface.cpp VMInterface.h
Date Mon, 05 May 2008 16:14:50 GMT
Author: mcfirst
Date: Mon May  5 09:14:50 2008
New Revision: 653522

URL: http://svn.apache.org/viewvc?rev=653522&view=rev
Log:
Applying the patch from HARMONY-5803 [build][linux] Build on linux-32 fails due to compilation
warnings

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp?rev=653522&r1=653521&r2=653522&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp Mon May  5 09:14:50 2008
@@ -668,9 +668,9 @@
     return object_get_vtable_offset();
 }
 
-uint64
+void*
 VMInterface::getVTableBase() {
-    return (uint64)vm_get_vtable_base_address();
+    return vm_get_vtable_base_address();
 }
 
 void*       VMInterface::getTypeHandleFromAllocationHandle(void* vmAllocationHandle)

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h?rev=653522&r1=653521&r2=653522&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h Mon May  5 09:14:50 2008
@@ -96,7 +96,7 @@
     // returns the offset of an object's virtual table
     static uint32      getVTableOffset();
     // returns the base for all vtables (addend to compressed vtable pointer)
-    static uint64      getVTableBase();
+    static void*      getVTableBase();
 
     // returns true if instance fields that are references are compressed
     static bool        areReferencesCompressed();



Mime
View raw message