diff options
| author | Colin Cross <ccross@android.com> | 2020-04-03 18:19:07 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-04-06 20:27:32 +0000 |
| commit | 915ad6a067adda03c987071e458da5d28826702f (patch) | |
| tree | 24108994e7ead42768be7a55317608fd0af95ab1 /jni/com_android_providers_media_FuseDaemon.cpp | |
| parent | 205d35977477b540f5941e5e22f3af5943730942 (diff) | |
| download | MediaProvider-915ad6a067adda03c987071e458da5d28826702f.tar.gz | |
Use CHECK instead of CHECK_EQ to compare against nullptr
Using CHECK_EQ(..., nullptr) or CHECK_NE(..., nullptr) causes errors
when building with the platform version of libc++:
packages/providers/MediaProvider/jni/com_android_providers_media_FuseDaemon.cpp:95:9: error: use of overloaded operator '<<' is ambiguous (with operand types 'basic_ostream<char, std::__1::char_traits<char> >' and 'nullptr_t')
packages/providers/MediaProvider/jni/MediaProviderWrapper.cpp:424:5: error: use of overloaded operator '<<' is ambiguous (with operand types 'basic_ostream<char, std::__1::char_traits<char> >' and 'nullptr_t')
packages/providers/MediaProvider/jni/MediaProviderWrapper.cpp:426:5: error: use of overloaded operator '<<' is ambiguous (with operand types 'basic_ostream<char, std::__1::char_traits<char> >' and 'nullptr_t')
Use CHECK(... == nullptr) or CHECK(... != nullptr) instead.
Bug: 149591340
Test: m libfuse_jni
Change-Id: I00dd9a2b8d088d1dd4a2dd91cc6c2e0d603693c9
Diffstat (limited to 'jni/com_android_providers_media_FuseDaemon.cpp')
| -rw-r--r-- | jni/com_android_providers_media_FuseDaemon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jni/com_android_providers_media_FuseDaemon.cpp b/jni/com_android_providers_media_FuseDaemon.cpp index fe4848f73..66aea9b06 100644 --- a/jni/com_android_providers_media_FuseDaemon.cpp +++ b/jni/com_android_providers_media_FuseDaemon.cpp @@ -92,7 +92,7 @@ void com_android_providers_media_FuseDaemon_invalidate_fuse_dentry_cache(JNIEnv* return; } - CHECK_EQ(pthread_getspecific(fuse::MediaProviderWrapper::gJniEnvKey), nullptr); + CHECK(pthread_getspecific(fuse::MediaProviderWrapper::gJniEnvKey) == nullptr); daemon->InvalidateFuseDentryCache(utf_chars_path.c_str()); } // TODO(b/145741152): Throw exception |