diff options
| author | 2016-08-31 17:49:55 +0000 | |
|---|---|---|
| committer | 2016-08-31 17:49:55 +0000 | |
| commit | 3d08238729dedecba73ddc0b42bc6bbf4806ecae (patch) | |
| tree | 92989553b03c704f79e2aae907b3b10479bc830e /compiler/compiler.h | |
| parent | 081e7a16c4fcbdb014441a236e12f58eb89ff99a (diff) | |
| parent | bdf7f1c3ab65ccb70f62db5ab31dba060632d458 (diff) | |
Merge "ART: SHARED_REQUIRES to REQUIRES_SHARED"
Diffstat (limited to 'compiler/compiler.h')
| -rw-r--r-- | compiler/compiler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/compiler.h b/compiler/compiler.h index a955f3c481..9e5fb83121 100644 --- a/compiler/compiler.h +++ b/compiler/compiler.h @@ -69,12 +69,12 @@ class Compiler { jit::JitCodeCache* code_cache ATTRIBUTE_UNUSED, ArtMethod* method ATTRIBUTE_UNUSED, bool osr ATTRIBUTE_UNUSED) - SHARED_REQUIRES(Locks::mutator_lock_) { + REQUIRES_SHARED(Locks::mutator_lock_) { return false; } virtual uintptr_t GetEntryPointOf(ArtMethod* method) const - SHARED_REQUIRES(Locks::mutator_lock_) = 0; + REQUIRES_SHARED(Locks::mutator_lock_) = 0; uint64_t GetMaximumCompilationTimeBeforeWarning() const { return maximum_compilation_time_before_warning_; |