diff options
author | 2016-11-08 08:46:46 -0800 | |
---|---|---|
committer | 2016-11-08 08:46:46 -0800 | |
commit | eba86e18531c653d47b10645bd77ae4930bce563 (patch) | |
tree | ed3045218d4563257742f13e6d750c7cafa92cab /test/cpp/util/cli_call_test.cc | |
parent | 3a41bbbe9bf3da96a7aead551b43f72bd470d1c0 (diff) | |
parent | 03a58cf3873879a4e4470a437e2c0b42c75c6a7c (diff) |
Merge github.com:grpc/grpc into securityfuzzit
Diffstat (limited to 'test/cpp/util/cli_call_test.cc')
-rw-r--r-- | test/cpp/util/cli_call_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cpp/util/cli_call_test.cc b/test/cpp/util/cli_call_test.cc index 75e90f824f..2e8501b2c3 100644 --- a/test/cpp/util/cli_call_test.cc +++ b/test/cpp/util/cli_call_test.cc @@ -56,7 +56,7 @@ namespace testing { class TestServiceImpl : public ::grpc::testing::EchoTestService::Service { public: Status Echo(ServerContext* context, const EchoRequest* request, - EchoResponse* response) GRPC_OVERRIDE { + EchoResponse* response) override { if (!context->client_metadata().empty()) { for (std::multimap<grpc::string_ref, grpc::string_ref>::const_iterator iter = context->client_metadata().begin(); @@ -75,7 +75,7 @@ class CliCallTest : public ::testing::Test { protected: CliCallTest() {} - void SetUp() GRPC_OVERRIDE { + void SetUp() override { int port = grpc_pick_unused_port_or_die(); server_address_ << "localhost:" << port; // Setup server @@ -86,7 +86,7 @@ class CliCallTest : public ::testing::Test { server_ = builder.BuildAndStart(); } - void TearDown() GRPC_OVERRIDE { server_->Shutdown(); } + void TearDown() override { server_->Shutdown(); } void ResetStub() { channel_ = |