summaryrefslogtreecommitdiffstats
path: root/runtime/base
diff options
context:
space:
mode:
authorSebastien Hertz <shertz@google.com>2013-08-05 16:37:51 +0200
committerSebastien Hertz <shertz@google.com>2013-08-05 16:37:51 +0200
commit702a85b33c57da99e83698129a289687cdb0be1f (patch)
tree11dfed514bb83d9cef4f7bd8268bae85a89b1404 /runtime/base
parent99b1c14fc9f517f4882a596958ad2a0977d92daa (diff)
downloadart-702a85b33c57da99e83698129a289687cdb0be1f.zip
art-702a85b33c57da99e83698129a289687cdb0be1f.tar.gz
art-702a85b33c57da99e83698129a289687cdb0be1f.tar.bz2
Fix typo in mutex.h file.
Change-Id: I11db56161025285022ea1137fb7749751d14b347
Diffstat (limited to 'runtime/base')
-rw-r--r--runtime/base/mutex.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index b924798..21ba0d2 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -238,7 +238,7 @@ class LOCKABLE ReaderWriterMutex : public BaseMutex {
// Assert the current thread has exclusive access to the ReaderWriterMutex.
void AssertExclusiveHeld(const Thread* self) {
- if (kDebugLocking & (gAborting == 0)) {
+ if (kDebugLocking && (gAborting == 0)) {
CHECK(IsExclusiveHeld(self)) << *this;
}
}
@@ -246,7 +246,7 @@ class LOCKABLE ReaderWriterMutex : public BaseMutex {
// Assert the current thread doesn't have exclusive access to the ReaderWriterMutex.
void AssertNotExclusiveHeld(const Thread* self) {
- if (kDebugLocking & (gAborting == 0)) {
+ if (kDebugLocking && (gAborting == 0)) {
CHECK(!IsExclusiveHeld(self)) << *this;
}
}
@@ -257,7 +257,7 @@ class LOCKABLE ReaderWriterMutex : public BaseMutex {
// Assert the current thread has shared access to the ReaderWriterMutex.
void AssertSharedHeld(const Thread* self) {
- if (kDebugLocking & (gAborting == 0)) {
+ if (kDebugLocking && (gAborting == 0)) {
// TODO: we can only assert this well when self != NULL.
CHECK(IsSharedHeld(self) || self == NULL) << *this;
}