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/large_object_space_test.cc | |
| 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/large_object_space_test.cc')
| -rw-r--r-- | runtime/gc/space/large_object_space_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/gc/space/large_object_space_test.cc b/runtime/gc/space/large_object_space_test.cc index c5d8abc..e17bad8 100644 --- a/runtime/gc/space/large_object_space_test.cc +++ b/runtime/gc/space/large_object_space_test.cc @@ -55,7 +55,7 @@ void LargeObjectSpaceTest::LargeObjectTest() { ASSERT_EQ(allocation_size, los->AllocationSize(obj, nullptr)); ASSERT_GE(allocation_size, request_size); // Fill in our magic value. - byte magic = (request_size & 0xFF) | 1; + uint8_t magic = (request_size & 0xFF) | 1; memset(obj, magic, request_size); requests.push_back(std::make_pair(obj, request_size)); } @@ -73,9 +73,9 @@ void LargeObjectSpaceTest::LargeObjectTest() { mirror::Object* obj = requests.back().first; size_t request_size = requests.back().second; requests.pop_back(); - byte magic = (request_size & 0xFF) | 1; + uint8_t magic = (request_size & 0xFF) | 1; for (size_t k = 0; k < request_size; ++k) { - ASSERT_EQ(reinterpret_cast<const byte*>(obj)[k], magic); + ASSERT_EQ(reinterpret_cast<const uint8_t*>(obj)[k], magic); } ASSERT_GE(los->Free(Thread::Current(), obj), request_size); } |