diff options
| author | Colin Cross <ccross@google.com> | 2022-02-04 15:41:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-04 15:41:35 +0000 |
| commit | 4fd8f6d047834721b8524aac9ba2a3885ccb1877 (patch) | |
| tree | 910ef5935fe17815df70a1858bb3bf37d08315a1 | |
| parent | d7135457d73216495afd8a0115efeb347d20b1ea (diff) | |
| parent | e9ddf7d93d33ffdfebf22f7307ebb68dcbc7a91a (diff) | |
| download | libchrome-4fd8f6d047834721b8524aac9ba2a3885ccb1877.tar.gz | |
Use nullptr instead of reinterpret_cast of NULL to pointer type am: d524f97614 am: e079d61912 am: e9ddf7d93d
Original change: https://android-review.googlesource.com/c/platform/external/libchrome/+/1972019
Change-Id: I2efc80b1d1cee60f3282e12b9e7fa2f143f1fbee
| -rw-r--r-- | base/threading/thread_local_storage_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/threading/thread_local_storage_unittest.cc b/base/threading/thread_local_storage_unittest.cc index 9062ff0c7f..64bc398cea 100644 --- a/base/threading/thread_local_storage_unittest.cc +++ b/base/threading/thread_local_storage_unittest.cc @@ -84,9 +84,9 @@ class ThreadLocalStorageRunner : public DelegateSimpleThread::Delegate { void ThreadLocalStorageCleanup(void *value) { - int *ptr = reinterpret_cast<int*>(value); + int *ptr = static_cast<int*>(value); // Destructors should never be called with a NULL. - ASSERT_NE(reinterpret_cast<int*>(NULL), ptr); + ASSERT_NE(nullptr, ptr); if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); |