diff options
| author |  Mark D. Roth <roth@google.com> | 2017-12-01 08:56:25 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-12-01 08:56:25 -0800 |
| commit | e109ddf89f966b1f99290ec15a14ec3859049099 (patch) | |
| tree | d9505ff4cc7e19c87a740cc7d379c47810b19417 /test/cpp/microbenchmarks | |
| parent | c5d0df9e44068b82a9980e4f700ffebfbabc9ed2 (diff) | |
| parent | 44c143c587c219ddae4ec3dbce003c0bd6c6c9e6 (diff) | |
Merge remote-tracking branch 'upstream/master' into server_connection_timeout
Diffstat (limited to 'test/cpp/microbenchmarks')
| -rw-r--r-- | test/cpp/microbenchmarks/bm_fullstack_trickle.cc | 2 | ||||
| -rw-r--r-- | test/cpp/microbenchmarks/helpers.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc index bb974fad50..5e72213823 100644 --- a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc +++ b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc @@ -445,7 +445,7 @@ BENCHMARK(BM_PumpUnbalancedUnary_Trickle)->Apply(UnaryTrickleArgs); } // namespace testing } // namespace grpc -extern "C" gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); +extern gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); int main(int argc, char** argv) { ::benchmark::Initialize(&argc, argv); diff --git a/test/cpp/microbenchmarks/helpers.h b/test/cpp/microbenchmarks/helpers.h index 07be589df6..afa3e0f3ca 100644 --- a/test/cpp/microbenchmarks/helpers.h +++ b/test/cpp/microbenchmarks/helpers.h @@ -54,10 +54,10 @@ class Library { }; #ifdef GPR_LOW_LEVEL_COUNTERS -extern "C" gpr_atm gpr_mu_locks; -extern "C" gpr_atm gpr_counter_atm_cas; -extern "C" gpr_atm gpr_counter_atm_add; -extern "C" gpr_atm gpr_now_call_count; +extern gpr_atm gpr_mu_locks; +extern gpr_atm gpr_counter_atm_cas; +extern gpr_atm gpr_counter_atm_add; +extern gpr_atm gpr_now_call_count; #endif class TrackCounters { |