diff options
| author | Yi Kong <yikong@google.com> | 2018-08-06 22:19:01 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-06 22:19:01 -0700 |
| commit | d03f3e6747e18a33bdcdc99a97fff8e68b4565be (patch) | |
| tree | 2320523d618cb00ef477a5a9895c0fe6b3e668ab /openjdkjvm/OpenjdkJvm.cc | |
| parent | f359269531453aebf5b28b4fab4668f7ba52605e (diff) | |
| parent | 3b36996946d8c3863c3de0b01fc8e42b6f150de7 (diff) | |
Merge "Modernize codebase by replacing NULL with nullptr" am: ca701c3e16 am: 541dc18db3
am: 3b36996946
Change-Id: I7cce293bed32dff9a40253988bed101b5c4c8839
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 df002b6efaa..8d0200c346a 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()); |