diff options
| author | 2015-04-22 19:59:01 +0000 | |
|---|---|---|
| committer | 2015-04-22 19:59:02 +0000 | |
| commit | 0ad14266a71c8579cd6bebcaf42f56fae37c988f (patch) | |
| tree | d04d27d21b3c7733d784e303f01f873bb99e7770 /compiler/driver/compiler_driver-inl.h | |
| parent | 1f02f1a7b3073b8fef07770a67fbf94afad317f0 (diff) | |
| parent | 2cebb24bfc3247d3e9be138a3350106737455918 (diff) | |
Merge "Replace NULL with nullptr"
Diffstat (limited to 'compiler/driver/compiler_driver-inl.h')
| -rw-r--r-- | compiler/driver/compiler_driver-inl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index b4d46954f1..bad83359d7 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -79,7 +79,7 @@ inline ArtField* CompilerDriver::ResolveFieldWithDexFile( } if (UNLIKELY(resolved_field->IsStatic() != is_static)) { // ClassLinker can return a field of the wrong kind directly from the DexCache. - // Silently return nullptr on such incompatible class change. + // Silently return null on such incompatible class change. return nullptr; } return resolved_field; @@ -206,7 +206,7 @@ inline mirror::ArtMethod* CompilerDriver::ResolveMethod( } if (check_incompatible_class_change && UNLIKELY(resolved_method->CheckIncompatibleClassChange(invoke_type))) { - // Silently return nullptr on incompatible class change. + // Silently return null on incompatible class change. return nullptr; } return resolved_method; @@ -302,7 +302,7 @@ inline int CompilerDriver::IsFastInvoke( target_dex_cache, class_loader, NullHandle<mirror::ArtMethod>(), kVirtual); } - CHECK(called_method != NULL); + CHECK(called_method != nullptr); CHECK(!called_method->IsAbstract()); int stats_flags = kFlagMethodResolved; GetCodeAndMethodForDirectCall(/*out*/invoke_type, |