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/well_known_classes.cc | |
| parent | 1f02f1a7b3073b8fef07770a67fbf94afad317f0 (diff) | |
| download | art-2cebb24bfc3247d3e9be138a3350106737455918.zip art-2cebb24bfc3247d3e9be138a3350106737455918.tar.gz art-2cebb24bfc3247d3e9be138a3350106737455918.tar.bz2 | |
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/well_known_classes.cc')
| -rw-r--r-- | runtime/well_known_classes.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc index f57f9c4..a803df8 100644 --- a/runtime/well_known_classes.cc +++ b/runtime/well_known_classes.cc @@ -78,7 +78,7 @@ jmethodID WellKnownClasses::java_lang_ref_ReferenceQueue_add; jmethodID WellKnownClasses::java_lang_reflect_Proxy_invoke; jmethodID WellKnownClasses::java_lang_Runtime_nativeLoad; jmethodID WellKnownClasses::java_lang_Short_valueOf; -jmethodID WellKnownClasses::java_lang_System_runFinalization = NULL; +jmethodID WellKnownClasses::java_lang_System_runFinalization = nullptr; jmethodID WellKnownClasses::java_lang_Thread_init; jmethodID WellKnownClasses::java_lang_Thread_run; jmethodID WellKnownClasses::java_lang_Thread__UncaughtExceptionHandler_uncaughtException; @@ -123,7 +123,7 @@ jfieldID WellKnownClasses::org_apache_harmony_dalvik_ddmc_Chunk_type; static jclass CacheClass(JNIEnv* env, const char* jni_class_name) { ScopedLocalRef<jclass> c(env, env->FindClass(jni_class_name)); - if (c.get() == NULL) { + if (c.get() == nullptr) { LOG(FATAL) << "Couldn't find class: " << jni_class_name; } return reinterpret_cast<jclass>(env->NewGlobalRef(c.get())); @@ -134,7 +134,7 @@ static jfieldID CacheField(JNIEnv* env, jclass c, bool is_static, jfieldID fid = (is_static ? env->GetStaticFieldID(c, name, signature) : env->GetFieldID(c, name, signature)); - if (fid == NULL) { + if (fid == nullptr) { ScopedObjectAccess soa(env); std::ostringstream os; WellKnownClasses::ToClass(c)->DumpClass(os, mirror::Class::kDumpClassFullDetail); @@ -149,7 +149,7 @@ jmethodID CacheMethod(JNIEnv* env, jclass c, bool is_static, jmethodID mid = (is_static ? env->GetStaticMethodID(c, name, signature) : env->GetMethodID(c, name, signature)); - if (mid == NULL) { + if (mid == nullptr) { ScopedObjectAccess soa(env); std::ostringstream os; WellKnownClasses::ToClass(c)->DumpClass(os, mirror::Class::kDumpClassFullDetail); |