commit 6cdedf0332d707f89a867a8f358d09b3262bf5e0
author Ian Rogers <irogers@google.com> Thu Oct 09 16:29:40 2014 -0700
committer Ian Rogers <irogers@google.com> Thu Oct 09 16:29:40 2014 -0700
tree 2b6361252ec31acd9c2c58b3eb803ac59e93a5a5
parent 13735955f39b3b304c37d2b2840663c131262c18

Fix object header size for baker read barrier.

Change-Id: I2b4a61488b9017d22210d79a07f485f9afef3b42

runtime/mirror/object.h

diff --git a/runtime/mirror/object.h b/runtime/mirror/object.h
index 4ed96fc..1bbcf8e 100644
--- a/runtime/mirror/object.h
+++ b/runtime/mirror/object.h
@@ -62,7 +62,7 @@
 static constexpr bool kCheckFieldAssignments = false;
 
 // Size of Object.
-static constexpr uint32_t kObjectHeaderSize = kUseBrooksReadBarrier ? 16 : 8;
+static constexpr uint32_t kObjectHeaderSize = kUseBakerOrBrooksReadBarrier ? 16 : 8;
 
 // C++ mirror of java.lang.Object
 class MANAGED LOCKABLE Object {