summaryrefslogtreecommitdiffstats
path: root/runtime/gc
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-04-25 17:15:12 -0700
committerAndreas Gampe <agampe@google.com>2014-04-25 17:15:12 -0700
commit59e676038383cbbf5997601bc16b04b8d1cdca68 (patch)
treee3aa628c32a81da9d3acf56f8a6901943d3f2bfc /runtime/gc
parent4d2143539beb0d714135c28ece2d1903bd40feb9 (diff)
downloadart-59e676038383cbbf5997601bc16b04b8d1cdca68.zip
art-59e676038383cbbf5997601bc16b04b8d1cdca68.tar.gz
art-59e676038383cbbf5997601bc16b04b8d1cdca68.tar.bz2
Rosalloc: fix signature for 64b
Change-Id: I56df1df0118a0aa1584e51fb574902f7eb88cd80
Diffstat (limited to 'runtime/gc')
-rw-r--r--runtime/gc/allocator/rosalloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/allocator/rosalloc.h b/runtime/gc/allocator/rosalloc.h
index 714230b..f7fa2da 100644
--- a/runtime/gc/allocator/rosalloc.h
+++ b/runtime/gc/allocator/rosalloc.h
@@ -259,7 +259,7 @@ class RosAlloc {
void MarkThreadLocalFreeBitMap(void* ptr);
// Last word mask, all of the bits in the last word which aren't valid slots are set to
// optimize allocation path.
- static size_t GetBitmapLastVectorMask(size_t num_slots, size_t num_vec);
+ static uint32_t GetBitmapLastVectorMask(size_t num_slots, size_t num_vec);
// Returns true if all the slots in the run are not in use.
bool IsAllFree();
// Returns true if all the slots in the run are in use.