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/alloc/Heap.c

diff --git a/vm/alloc/Heap.c b/vm/alloc/Heap.c
index 7e47e73..3ede125 100644
--- a/vm/alloc/Heap.c
+++ b/vm/alloc/Heap.c
@@ -458,7 +458,7 @@
          * internal tracking list.
          */
         if ((flags & ALLOC_DONT_TRACK) == 0) {
-            dvmAddTrackedAlloc(ptr, NULL);
+            dvmAddTrackedAlloc((Object*)ptr, NULL);
         }
     } else {
         /*