diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-11-27 14:35:34 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-11-27 14:35:34 -0800 |
| commit | 9898212a4181fee4d9967cfbf42576b4a7f7e529 (patch) | |
| tree | da311844d93891c031b279024c0b0f3d7fe0889a /src/core/lib/support/memory.h | |
| parent | 739ff08a7f4686306ef8d5b72c2a89b12305e275 (diff) | |
| parent | fbe8ff657ccb742daedae11a1029f5628de07ce7 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-objc-void-func
Diffstat (limited to 'src/core/lib/support/memory.h')
| -rw-r--r-- | src/core/lib/support/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/support/memory.h b/src/core/lib/support/memory.h index 6b336681db..695418e3e1 100644 --- a/src/core/lib/support/memory.h +++ b/src/core/lib/support/memory.h @@ -76,7 +76,7 @@ class Allocator { pointer address(reference x) const { return &x; } const_pointer address(const_reference x) const { return &x; } pointer allocate(std::size_t n, - std::allocator<void>::const_pointer hint = 0) { + std::allocator<void>::const_pointer hint = nullptr) { return static_cast<pointer>(gpr_malloc(n * sizeof(T))); } void deallocate(T* p, std::size_t n) { gpr_free(p); } |