diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-04-21 16:50:40 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-04-22 12:44:27 -0700 |
| commit | 2cebb24bfc3247d3e9be138a3350106737455918 (patch) | |
| tree | d04d27d21b3c7733d784e303f01f873bb99e7770 /runtime/art_field-inl.h | |
| parent | 1f02f1a7b3073b8fef07770a67fbf94afad317f0 (diff) | |
| download | android_art-2cebb24bfc3247d3e9be138a3350106737455918.tar.gz android_art-2cebb24bfc3247d3e9be138a3350106737455918.tar.bz2 android_art-2cebb24bfc3247d3e9be138a3350106737455918.zip | |
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/art_field-inl.h')
| -rw-r--r-- | runtime/art_field-inl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/art_field-inl.h b/runtime/art_field-inl.h index a2625e2d42..4991ad7513 100644 --- a/runtime/art_field-inl.h +++ b/runtime/art_field-inl.h @@ -80,7 +80,7 @@ inline void ArtField::Set32(mirror::Object* object, uint32_t new_value) { } inline uint64_t ArtField::Get64(mirror::Object* object) { - DCHECK(object != NULL) << PrettyField(this); + DCHECK(object != nullptr) << PrettyField(this); DCHECK(!IsStatic() || (object == GetDeclaringClass()) || !Runtime::Current()->IsStarted()); if (UNLIKELY(IsVolatile())) { return object->GetField64Volatile(GetOffset()); @@ -90,7 +90,7 @@ inline uint64_t ArtField::Get64(mirror::Object* object) { template<bool kTransactionActive> inline void ArtField::Set64(mirror::Object* object, uint64_t new_value) { - DCHECK(object != NULL) << PrettyField(this); + DCHECK(object != nullptr) << PrettyField(this); DCHECK(!IsStatic() || (object == GetDeclaringClass()) || !Runtime::Current()->IsStarted()); if (UNLIKELY(IsVolatile())) { object->SetField64Volatile<kTransactionActive>(GetOffset(), new_value); @@ -100,7 +100,7 @@ inline void ArtField::Set64(mirror::Object* object, uint64_t new_value) { } inline mirror::Object* ArtField::GetObj(mirror::Object* object) { - DCHECK(object != NULL) << PrettyField(this); + DCHECK(object != nullptr) << PrettyField(this); DCHECK(!IsStatic() || (object == GetDeclaringClass()) || !Runtime::Current()->IsStarted()); if (UNLIKELY(IsVolatile())) { return object->GetFieldObjectVolatile<mirror::Object>(GetOffset()); @@ -110,7 +110,7 @@ inline mirror::Object* ArtField::GetObj(mirror::Object* object) { template<bool kTransactionActive> inline void ArtField::SetObj(mirror::Object* object, mirror::Object* new_value) { - DCHECK(object != NULL) << PrettyField(this); + DCHECK(object != nullptr) << PrettyField(this); DCHECK(!IsStatic() || (object == GetDeclaringClass()) || !Runtime::Current()->IsStarted()); if (UNLIKELY(IsVolatile())) { object->SetFieldObjectVolatile<kTransactionActive>(GetOffset(), new_value); |