Merge branch 'master' into rpc_mgr

8 years ago · 042aec990a
parent 6135535ca7 247d413f8b
commit 042aec990a
2 changed files with 1 additions and 3 deletions
--- 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,
--- 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>