diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-01 21:25:41 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-01 21:25:41 -0700 |
| commit | 6e83c172f385cb45dd13bbcf41d2df8e410828c6 (patch) | |
| tree | e2c2f4ee55cfd623ea9d363286b380213748e1e8 /runtime/globals.h | |
| parent | 9a16f222cdf40e68b084316b6e768c14d4b9e020 (diff) | |
| download | art-6e83c172f385cb45dd13bbcf41d2df8e410828c6.zip art-6e83c172f385cb45dd13bbcf41d2df8e410828c6.tar.gz art-6e83c172f385cb45dd13bbcf41d2df8e410828c6.tar.bz2 | |
Replace the bool kDoReadBarrier template parameter with an enum.
Fix one kDoReadBarrier/kIsVolatile mixup in an Object::GetFieldObject
call.
Bug: 12687968
Change-Id: I896b1137b21a20c0504abd2bf3fe6f83805f3300
Diffstat (limited to 'runtime/globals.h')
| -rw-r--r-- | runtime/globals.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 { |