commit fc75f3ed87b55d625b6054e18645da5cbdba31c6
author Carl Shapiro <cshapiro@google.com> Tue Dec 07 11:43:38 2010 -0800
committer Carl Shapiro <cshapiro@google.com> Tue Dec 07 11:43:38 2010 -0800
tree 5e4f2844634b8ddf532f03c1328f2c7601c48e3c
parent 70624ec99772ce2c6222d066bb7f03a764c45128

Fix implicit conversions, rename reserved works, enable -Wc++-compat.

Change-Id: I06292964a6882ea2d0c17c5c962db95e46b01543

vm/interp/Jit.c

diff --git a/vm/interp/Jit.c b/vm/interp/Jit.c
index 3fafe6d..8eb9856 100644
--- a/vm/interp/Jit.c
+++ b/vm/interp/Jit.c
@@ -114,7 +114,7 @@
 
     // Create a copy of the InterpState
     memcpy(&(shadowSpace->interpState), interpState, sizeof(InterpState));
-    shadowSpace->interpState.fp = shadowSpace->shadowFP;
+    shadowSpace->interpState.fp = (u4*)shadowSpace->shadowFP;
     shadowSpace->interpState.interpStackEnd = (u1*)shadowSpace->registerSpace;
 
     // Create a copy of the stack
@@ -140,7 +140,7 @@
     Thread *self = dvmThreadSelf();
     ShadowSpace *shadowSpace = self->shadowSpace;
     // Official InterpState structure
-    InterpState *realGlue = shadowSpace->glue;
+    InterpState *realGlue = (InterpState*)shadowSpace->glue;
     shadowSpace->endPC = pc;
     shadowSpace->endShadowFP = fp;
     shadowSpace->jitExitState = exitState;