Add a cast required for assigning a ClassObject* to and Object*.

Change-Id: Iab995725ad5a97e0dc0a76de571cfe34bbd057c8

diff --git a/vm/native/java_lang_VMClassLoader.cpp b/vm/native/java_lang_VMClassLoader.cpp
index 387290c..770ce5e 100644 (file)
--- a/vm/native/java_lang_VMClassLoader.cpp
+++ b/vm/native/java_lang_VMClassLoader.cpp
@@ -154,7 +154,7 @@ static void Dalvik_java_lang_VMClassLoader_getPrimitiveClass(const u4* args,
 {
     int primType = args[0];
 
-    pResult->l = dvmFindPrimitiveClass(primType);
+    pResult->l = (Object*)dvmFindPrimitiveClass(primType);
 }
 
 /*