Fix bad merge

pull/13364/head
ncteisen 7 years ago
parent 0354c22d40
commit 3039b37a0e
  1. 19
      test/cpp/microbenchmarks/bm_error.cc

@ -251,11 +251,7 @@ static void BM_ErrorGetStatus(benchmark::State& state) {
grpc_status_code status;
grpc_slice slice;
grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(),
<<<<<<< HEAD
&status, &slice, NULL, NULL);
=======
&status, &slice, nullptr);
>>>>>>> ff2edb3eba20b30f232ded7769cab8cd20ff5009
&status, &slice, nullptr, nullptr);
}
grpc_exec_ctx_finish(&exec_ctx);
track_counters.Finish(state);
@ -269,11 +265,7 @@ static void BM_ErrorGetStatusCode(benchmark::State& state) {
while (state.KeepRunning()) {
grpc_status_code status;
grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(),
<<<<<<< HEAD
&status, NULL, NULL, NULL);
=======
&status, nullptr, nullptr);
>>>>>>> ff2edb3eba20b30f232ded7769cab8cd20ff5009
&status, nullptr, nullptr, nullptr);
}
grpc_exec_ctx_finish(&exec_ctx);
track_counters.Finish(state);
@ -286,13 +278,8 @@ static void BM_ErrorHttpError(benchmark::State& state) {
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
while (state.KeepRunning()) {
grpc_http2_error_code error;
<<<<<<< HEAD
grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), NULL,
NULL, &error, NULL);
=======
grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(),
nullptr, nullptr, &error);
>>>>>>> ff2edb3eba20b30f232ded7769cab8cd20ff5009
nullptr, nullptr, &error, nullptr);
}
grpc_exec_ctx_finish(&exec_ctx);
track_counters.Finish(state);

Loading…
Cancel
Save