diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-08 12:43:28 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-09 16:05:58 -0700 |
| commit | 13735955f39b3b304c37d2b2840663c131262c18 (patch) | |
| tree | 0a731ac42b8230f9929172fa3e3d8051874e2b18 /runtime/gc/space/bump_pointer_space-inl.h | |
| parent | 25b18bbdaa36ff936eb44f228f0518d4223e9d52 (diff) | |
| download | art-13735955f39b3b304c37d2b2840663c131262c18.zip art-13735955f39b3b304c37d2b2840663c131262c18.tar.gz art-13735955f39b3b304c37d2b2840663c131262c18.tar.bz2 | |
stdint types all the way!
Change-Id: I4e4ef3a2002fc59ebd9097087f150eaf3f2a7e08
Diffstat (limited to 'runtime/gc/space/bump_pointer_space-inl.h')
| -rw-r--r-- | runtime/gc/space/bump_pointer_space-inl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/gc/space/bump_pointer_space-inl.h b/runtime/gc/space/bump_pointer_space-inl.h index ee3c979..9f1f953 100644 --- a/runtime/gc/space/bump_pointer_space-inl.h +++ b/runtime/gc/space/bump_pointer_space-inl.h @@ -41,7 +41,7 @@ inline mirror::Object* BumpPointerSpace::AllocThreadUnsafe(Thread* self, size_t size_t* usable_size) { Locks::mutator_lock_->AssertExclusiveHeld(self); num_bytes = RoundUp(num_bytes, kAlignment); - byte* end = end_.LoadRelaxed(); + uint8_t* end = end_.LoadRelaxed(); if (end + num_bytes > growth_end_) { return nullptr; } @@ -59,8 +59,8 @@ inline mirror::Object* BumpPointerSpace::AllocThreadUnsafe(Thread* self, size_t inline mirror::Object* BumpPointerSpace::AllocNonvirtualWithoutAccounting(size_t num_bytes) { DCHECK(IsAligned<kAlignment>(num_bytes)); - byte* old_end; - byte* new_end; + uint8_t* old_end; + uint8_t* new_end; do { old_end = end_.LoadRelaxed(); new_end = old_end + num_bytes; |