summaryrefslogtreecommitdiff
path: root/runtime/mirror/array.h
diff options
context:
space:
mode:
author Ian Rogers <irogers@google.com> 2014-10-08 19:15:21 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-10-08 19:15:21 +0000
commit175b2732f7e55a07094c30aa08d946189b4af97e (patch)
tree79d5ee5444a5be70130d9a75dd51831c4b15687b /runtime/mirror/array.h
parentedc34c88b8f8abd04f9c4668787403608cf0b2d4 (diff)
parent7e70b002c4552347ed1af8c002a0e13f08864f20 (diff)
Merge "Header file clean up."
Diffstat (limited to 'runtime/mirror/array.h')
-rw-r--r--runtime/mirror/array.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h
index 521d7e7fea..12bec8974e 100644
--- a/runtime/mirror/array.h
+++ b/runtime/mirror/array.h
@@ -64,13 +64,7 @@ class MANAGED Array : public Object {
return OFFSET_OF_OBJECT_MEMBER(Array, length_);
}
- static MemberOffset DataOffset(size_t component_size) {
- DCHECK(IsPowerOfTwo(component_size)) << component_size;
- size_t data_offset = RoundUp(OFFSETOF_MEMBER(Array, first_element_), component_size);
- DCHECK_EQ(RoundUp(data_offset, component_size), data_offset)
- << "Array data offset isn't aligned with component size";
- return MemberOffset(data_offset);
- }
+ static MemberOffset DataOffset(size_t component_size);
void* GetRawData(size_t component_size, int32_t index)
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {