diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-10-20 12:57:16 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-10-20 12:57:16 -0700 |
| commit | ab71dfbbf0c5c50e6037efee1d9574618936d0ed (patch) | |
| tree | c21eabd1f14c75550cd2486b026d1dbb8ac2e5b6 | |
| parent | 10edf68eec9ec2d5520cb2cb88010090257ea946 (diff) | |
| parent | 247d413f8b59f069ec7c6575f57391332d666288 (diff) | |
Merge branch 'master' into uv_core_transport
| -rw-r--r-- | test/cpp/qps/server_async.cc | 2 | ||||
| -rw-r--r-- | test/cpp/qps/server_sync.cc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index 73a96a8443..2fcc64819b 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -57,7 +57,7 @@ namespace testing { template <class RequestType, class ResponseType, class ServiceType, class ServerContextType> -class AsyncQpsServerTest : public Server { +class AsyncQpsServerTest GRPC_FINAL : public grpc::testing::Server { public: AsyncQpsServerTest( const ServerConfig &config, diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc index c774985bfa..0caed0ab49 100644 --- a/test/cpp/qps/server_sync.cc +++ b/test/cpp/qps/server_sync.cc @@ -31,8 +31,6 @@ * */ -#include <thread> - #include <grpc++/security/server_credentials.h> #include <grpc++/server.h> #include <grpc++/server_builder.h> |