| commit | 6e83c172f385cb45dd13bbcf41d2df8e410828c6 | [log] [tgz] |
|---|---|---|
| author | Hiroshi Yamauchi <yamauchi@google.com> | Thu May 01 21:25:41 2014 -0700 |
| committer | Hiroshi Yamauchi <yamauchi@google.com> | Thu May 01 21:25:41 2014 -0700 |
| tree | e2c2f4ee55cfd623ea9d363286b380213748e1e8 | |
| parent | 9a16f222cdf40e68b084316b6e768c14d4b9e020 [diff] [blame] |
Replace the bool kDoReadBarrier template parameter with an enum. Fix one kDoReadBarrier/kIsVolatile mixup in an Object::GetFieldObject call. Bug: 12687968 Change-Id: I896b1137b21a20c0504abd2bf3fe6f83805f3300
diff --git a/runtime/globals.h b/runtime/globals.h index e3c54b8..eb52a46 100644 --- a/runtime/globals.h +++ b/runtime/globals.h
@@ -20,6 +20,7 @@ #include <stddef.h> #include <stdint.h> #include "read_barrier_c.h" +#include "read_barrier_option.h" namespace art {