diff options
| author | Andreas Gampe <agampe@google.com> | 2014-04-26 00:18:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-26 00:18:56 +0000 |
| commit | 0db6d06d1e4dec2ac36ca9c085876eea40d46a50 (patch) | |
| tree | e3aa628c32a81da9d3acf56f8a6901943d3f2bfc | |
| parent | 4d2143539beb0d714135c28ece2d1903bd40feb9 (diff) | |
| parent | 59e676038383cbbf5997601bc16b04b8d1cdca68 (diff) | |
| download | art-0db6d06d1e4dec2ac36ca9c085876eea40d46a50.zip art-0db6d06d1e4dec2ac36ca9c085876eea40d46a50.tar.gz art-0db6d06d1e4dec2ac36ca9c085876eea40d46a50.tar.bz2 | |
Merge "Rosalloc: fix signature for 64b"
| -rw-r--r-- | runtime/gc/allocator/rosalloc.h | 2 |
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. |