diff options
| author |  Bill Feng <yfen@google.com> | 2018-11-26 10:15:47 -0800 |
|---|---|---|
| committer | Bill Feng <yfen@google.com> | 2018-11-26 10:15:47 -0800 |
| commit | 5810b53df3e4ef338f610a71d4a8443f665a2bc6 (patch) | |
| tree | 042d29b30e427615928c6fb3e4118112ea626276 /test/core/iomgr | |
| parent | 70f9992d77e67f90234b079eabaa33210d866c87 (diff) | |
| parent | 5ee0cdc4222a137024598579107f51767062efc2 (diff) | |
merge conflict fix
Diffstat (limited to 'test/core/iomgr')
| -rw-r--r-- | test/core/iomgr/buffer_list_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/iomgr/buffer_list_test.cc b/test/core/iomgr/buffer_list_test.cc index c7f30fa092..e104e8e91a 100644 --- a/test/core/iomgr/buffer_list_test.cc +++ b/test/core/iomgr/buffer_list_test.cc @@ -50,7 +50,7 @@ static void TestShutdownFlushesList() { grpc_core::TracedBuffer::AddNewEntry( &list, i, static_cast<void*>(&verifier_called[i])); } - grpc_core::TracedBuffer::Shutdown(&list, GRPC_ERROR_NONE); + grpc_core::TracedBuffer::Shutdown(&list, nullptr, GRPC_ERROR_NONE); GPR_ASSERT(list == nullptr); for (auto i = 0; i < NUM_ELEM; i++) { GPR_ASSERT(gpr_atm_acq_load(&verifier_called[i]) == @@ -88,7 +88,7 @@ static void TestVerifierCalledOnAck() { grpc_core::TracedBuffer::ProcessTimestamp(&list, &serr, &tss); GPR_ASSERT(gpr_atm_acq_load(&verifier_called) == static_cast<gpr_atm>(1)); GPR_ASSERT(list == nullptr); - grpc_core::TracedBuffer::Shutdown(&list, GRPC_ERROR_NONE); + grpc_core::TracedBuffer::Shutdown(&list, nullptr, GRPC_ERROR_NONE); } static void TestTcpBufferList() { |