diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-11-13 15:41:31 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-11-13 15:41:31 -0800 |
| commit | b0bad8f3864dc9c8745736fe68efe513b2b84932 (patch) | |
| tree | a94f7bf6f6e1d5dc257bec928359bad16623eada /test/core/support/alloc_test.cc | |
| parent | e52772451a7bbf4f3f7b72cfc369781fd74a6930 (diff) | |
| parent | a61abff6adfd035560d20bc255c01c6c83d22091 (diff) | |
Merge pull request #13349 from ctiller/lfe3
Convert all uses of NULL to nullptr
Diffstat (limited to 'test/core/support/alloc_test.cc')
| -rw-r--r-- | test/core/support/alloc_test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/core/support/alloc_test.cc b/test/core/support/alloc_test.cc index ee590366b9..6074c6e6e7 100644 --- a/test/core/support/alloc_test.cc +++ b/test/core/support/alloc_test.cc @@ -30,11 +30,12 @@ static void test_custom_allocs() { const gpr_allocation_functions default_fns = gpr_get_allocation_functions(); intptr_t addr_to_free = 0; char* i; - gpr_allocation_functions fns = {fake_malloc, NULL, fake_realloc, fake_free}; + gpr_allocation_functions fns = {fake_malloc, nullptr, fake_realloc, + fake_free}; gpr_set_allocation_functions(fns); GPR_ASSERT((void*)(size_t)0xdeadbeef == gpr_malloc(0xdeadbeef)); - GPR_ASSERT((void*)(size_t)0xcafed00d == gpr_realloc(0, 0xcafed00d)); + GPR_ASSERT((void*)(size_t)0xcafed00d == gpr_realloc(nullptr, 0xcafed00d)); gpr_free(&addr_to_free); GPR_ASSERT(addr_to_free == (intptr_t)0xdeadd00d); |