| commit | b4ce400666dce548691a9e0e65cf0193077ca3dc | [log] [tgz] |
|---|---|---|
| author | Colin Cross <[email protected]> | Fri Feb 04 15:55:23 2022 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Feb 04 15:55:23 2022 +0000 |
| tree | 910ef5935fe17815df70a1858bb3bf37d08315a1 | |
| parent | 0f524276c40cfa9c2ffcc75b5c3d655eb24b90de [diff] | |
| parent | 4fd8f6d047834721b8524aac9ba2a3885ccb1877 [diff] |
Use nullptr instead of reinterpret_cast of NULL to pointer type am: d524f97614 am: e079d61912 am: e9ddf7d93d am: 4fd8f6d047 Original change: https://android-review.googlesource.com/c/platform/external/libchrome/+/1972019 Change-Id: Ifabfd4aa1e83ca18b6f788aa2b86a8651d21784d
diff --git a/base/threading/thread_local_storage_unittest.cc b/base/threading/thread_local_storage_unittest.cc index 9062ff0..64bc398 100644 --- a/base/threading/thread_local_storage_unittest.cc +++ b/base/threading/thread_local_storage_unittest.cc
@@ -84,9 +84,9 @@ 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);