diff options
author | Yi Kong <yikong@google.com> | 2018-08-02 14:43:21 -0700 |
---|---|---|
committer | Yi Kong <yikong@google.com> | 2018-08-02 14:43:21 -0700 |
commit | 4b22b34c698db8aa59343d0a5af89fc737532bce (patch) | |
tree | 985c0e28dcdf5a497737690b50d31c4eb7bbda85 /openjdkjvm/OpenjdkJvm.cc | |
parent | 9e53f5f19167848d043f91e6d20436e9b568b55a (diff) |
Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning.
Test: m
Bug: 68236239
Change-Id: Id869744db54b5b366454a5e13b467ac1f4df2845
Diffstat (limited to 'openjdkjvm/OpenjdkJvm.cc')
-rw-r--r-- | openjdkjvm/OpenjdkJvm.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openjdkjvm/OpenjdkJvm.cc b/openjdkjvm/OpenjdkJvm.cc index df002b6efa..8d0200c346 100644 --- a/openjdkjvm/OpenjdkJvm.cc +++ b/openjdkjvm/OpenjdkJvm.cc @@ -187,7 +187,7 @@ JNIEXPORT int jio_fprintf(FILE* fp, const char* fmt, ...) { } JNIEXPORT int jio_vfprintf(FILE* fp, const char* fmt, va_list args) { - assert(fp != NULL); + assert(fp != nullptr); return vfprintf(fp, fmt, args); } @@ -203,7 +203,7 @@ JNIEXPORT void* JVM_FindLibraryEntry(void* handle, const char* name) { JNIEXPORT jlong JVM_CurrentTimeMillis(JNIEnv* env ATTRIBUTE_UNUSED, jclass clazz ATTRIBUTE_UNUSED) { struct timeval tv; - gettimeofday(&tv, (struct timezone *) NULL); + gettimeofday(&tv, (struct timezone *) nullptr); jlong when = tv.tv_sec * 1000LL + tv.tv_usec / 1000; return when; } @@ -319,8 +319,8 @@ JNIEXPORT jstring JVM_NativeLoad(JNIEnv* env, jstring javaFilename, jobject javaLoader) { ScopedUtfChars filename(env, javaFilename); - if (filename.c_str() == NULL) { - return NULL; + if (filename.c_str() == nullptr) { + return nullptr; } std::string error_msg; @@ -348,7 +348,7 @@ JNIEXPORT void JVM_SetThreadPriority(JNIEnv* env, jobject jthread, jint prio) { art::ScopedObjectAccess soa(env); art::MutexLock mu(soa.Self(), *art::Locks::thread_list_lock_); art::Thread* thread = art::Thread::FromManagedThread(soa, jthread); - if (thread != NULL) { + if (thread != nullptr) { thread->SetNativePriority(prio); } } @@ -421,7 +421,7 @@ JNIEXPORT void JVM_SetNativeThreadName(JNIEnv* env, jobject jthread, jstring jav art::SuspendReason::kInternal, &timed_out); } - if (thread != NULL) { + if (thread != nullptr) { { art::ScopedObjectAccess soa(env); thread->SetThreadName(name.c_str()); |