diff options
| author | Carl Shapiro <cshapiro@google.com> | 2011-05-02 16:38:40 -0700 |
|---|---|---|
| committer | Carl Shapiro <cshapiro@google.com> | 2011-05-02 16:38:40 -0700 |
| commit | abc52911801415b57b6dceba9f56692f502cf6b0 (patch) | |
| tree | ff4b577b479ec6c27561b05898b4983ce93ac889 /vm/native/java_lang_VMClassLoader.cpp | |
| parent | 4676df05d742f30b6578272c23a8d371a29eab08 (diff) | |
Add a cast required for assigning a ClassObject* to and Object*.
Change-Id: Iab995725ad5a97e0dc0a76de571cfe34bbd057c8
Diffstat (limited to 'vm/native/java_lang_VMClassLoader.cpp')
| -rw-r--r-- | vm/native/java_lang_VMClassLoader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/native/java_lang_VMClassLoader.cpp b/vm/native/java_lang_VMClassLoader.cpp index 387290c9d..770ce5e6c 100644 --- 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); } /* |