diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-11-04 13:20:49 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-11-04 13:20:49 -0700 |
| commit | b65e234f7af6df1625ccd4dec386e0fa2f573eb7 (patch) | |
| tree | 07071573c03e526c16fbe3bfd487a2f3060503fb /test/cpp/end2end/streaming_throughput_test.cc | |
| parent | 31c5ee230369b758978c5e4e87911d759a7f9184 (diff) | |
| parent | 4736c55e0f923b8f3b8713449500a43ab8686ae3 (diff) | |
Merge github.com:grpc/grpc into fuzzit
Diffstat (limited to 'test/cpp/end2end/streaming_throughput_test.cc')
| -rw-r--r-- | test/cpp/end2end/streaming_throughput_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/cpp/end2end/streaming_throughput_test.cc b/test/cpp/end2end/streaming_throughput_test.cc index fbef761ca9..302583766b 100644 --- a/test/cpp/end2end/streaming_throughput_test.cc +++ b/test/cpp/end2end/streaming_throughput_test.cc @@ -121,9 +121,9 @@ class TestServiceImpl : public ::grpc::testing::EchoTestService::Service { } // Only implement the one method we will be calling for brevity. - Status BidiStream(ServerContext* context, - ServerReaderWriter<EchoResponse, EchoRequest>* stream) - GRPC_OVERRIDE { + Status BidiStream( + ServerContext* context, + ServerReaderWriter<EchoResponse, EchoRequest>* stream) override { EchoRequest request; gpr_atm should_exit; gpr_atm_rel_store(&should_exit, static_cast<gpr_atm>(0)); @@ -147,7 +147,7 @@ class TestServiceImpl : public ::grpc::testing::EchoTestService::Service { class End2endTest : public ::testing::Test { protected: - void SetUp() GRPC_OVERRIDE { + void SetUp() override { int port = grpc_pick_unused_port_or_die(); server_address_ << "localhost:" << port; // Setup server @@ -158,7 +158,7 @@ class End2endTest : public ::testing::Test { server_ = builder.BuildAndStart(); } - void TearDown() GRPC_OVERRIDE { server_->Shutdown(); } + void TearDown() override { server_->Shutdown(); } void ResetStub() { std::shared_ptr<Channel> channel = |