diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2022-07-12 21:47:19 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2022-07-12 21:47:19 -0400 |
| commit | d055841ab4147dac20d5c46d04ca3a2fb13748b7 (patch) | |
| tree | 15a01389c86f10a8844ff2a86bddf46640d065e8 /absl/base/internal/low_level_alloc_test.cc | |
| parent | 2d23a3e16abfcf8f22ba850d67e972cc77e98874 (diff) | |
| parent | 273292d1cfc0a94a65082ee350509af1d113344d (diff) | |
| download | abseil-d055841ab4147dac20d5c46d04ca3a2fb13748b7.tar.gz abseil-d055841ab4147dac20d5c46d04ca3a2fb13748b7.tar.bz2 abseil-d055841ab4147dac20d5c46d04ca3a2fb13748b7.zip | |
Merge new upstream LTS 20220623.0
Diffstat (limited to 'absl/base/internal/low_level_alloc_test.cc')
| -rw-r--r-- | absl/base/internal/low_level_alloc_test.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/absl/base/internal/low_level_alloc_test.cc b/absl/base/internal/low_level_alloc_test.cc index 31abb888..8fdec09e 100644 --- a/absl/base/internal/low_level_alloc_test.cc +++ b/absl/base/internal/low_level_alloc_test.cc @@ -86,7 +86,7 @@ static void Test(bool use_new_arena, bool call_malloc_hook, int n) { AllocMap::iterator it; BlockDesc block_desc; int rnd; - LowLevelAlloc::Arena *arena = 0; + LowLevelAlloc::Arena *arena = nullptr; if (use_new_arena) { int32_t flags = call_malloc_hook ? LowLevelAlloc::kCallMallocHook : 0; arena = LowLevelAlloc::NewArena(flags); @@ -101,11 +101,10 @@ static void Test(bool use_new_arena, bool call_malloc_hook, int n) { case 0: // coin came up heads: add a block using_low_level_alloc = true; block_desc.len = rand() & 0x3fff; - block_desc.ptr = - reinterpret_cast<char *>( - arena == 0 - ? LowLevelAlloc::Alloc(block_desc.len) - : LowLevelAlloc::AllocWithArena(block_desc.len, arena)); + block_desc.ptr = reinterpret_cast<char *>( + arena == nullptr + ? LowLevelAlloc::Alloc(block_desc.len) + : LowLevelAlloc::AllocWithArena(block_desc.len, arena)); using_low_level_alloc = false; RandomizeBlockDesc(&block_desc); rnd = rand(); |