diff options
author | Yuchen Zeng <y-zeng@users.noreply.github.com> | 2016-11-15 21:17:00 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-15 21:17:00 -0800 |
commit | 7647b2eb0a02cdf7221e5487ac1d9510aea8462e (patch) | |
tree | 74ca2aa1e43a4c7e80cea31d34efa4030fac5c15 | |
parent | b3724c4bb6c7b5c40db5ba62032f5f955ca0135b (diff) | |
parent | 0377f7a6f728f105d80e3f4ce0b1b64481453899 (diff) |
Merge pull request #8761 from y-zeng/fix_conflict
Fix symbol conflicts in grpc_tool_test
-rw-r--r-- | test/cpp/util/grpc_tool_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/util/grpc_tool_test.cc b/test/cpp/util/grpc_tool_test.cc index 5ab054d04a..1ff8172306 100644 --- a/test/cpp/util/grpc_tool_test.cc +++ b/test/cpp/util/grpc_tool_test.cc @@ -112,8 +112,6 @@ size_t ArraySize(T& a) { static_cast<size_t>(!(sizeof(a) % sizeof(*(a))))); } -} // namespame - class TestServiceImpl : public ::grpc::testing::EchoTestService::Service { public: Status Echo(ServerContext* context, const EchoRequest* request, @@ -132,6 +130,8 @@ class TestServiceImpl : public ::grpc::testing::EchoTestService::Service { } }; +} // namespace + class GrpcToolTest : public ::testing::Test { protected: GrpcToolTest() {} |