diff options
| author | 2015-04-21 16:50:40 -0700 | |
|---|---|---|
| committer | 2015-04-22 12:44:27 -0700 | |
| commit | 2cebb24bfc3247d3e9be138a3350106737455918 (patch) | |
| tree | d04d27d21b3c7733d784e303f01f873bb99e7770 /runtime/monitor_test.cc | |
| parent | 1f02f1a7b3073b8fef07770a67fbf94afad317f0 (diff) | |
Replace NULL with nullptr
Also fixed some lines that were too long, and a few other minor
details.
Change-Id: I6efba5fb6e03eb5d0a300fddb2a75bf8e2f175cb
Diffstat (limited to 'runtime/monitor_test.cc')
| -rw-r--r-- | runtime/monitor_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/monitor_test.cc b/runtime/monitor_test.cc index 2351463391..30cb2d835d 100644 --- a/runtime/monitor_test.cc +++ b/runtime/monitor_test.cc @@ -116,8 +116,8 @@ class CreateTask : public Task { ScopedObjectAccess soa(self); monitor_test_->thread_ = self; // Pass the Thread. - monitor_test_->object_.Get()->MonitorEnter(self); // Lock the object. This should transition - LockWord lock_after = monitor_test_->object_.Get()->GetLockWord(false); // it to thinLocked. + monitor_test_->object_.Get()->MonitorEnter(self); // Lock the object. This should transition + LockWord lock_after = monitor_test_->object_.Get()->GetLockWord(false); // it to thinLocked. LockWord::LockState new_state = lock_after.GetState(); // Cannot use ASSERT only, as analysis thinks we'll keep holding the mutex. |