diff options
| author |  Vijay Pai <vpai@google.com> | 2016-11-01 17:16:55 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-11-01 17:16:55 -0700 |
| commit | 320ed13d3e6c568d3db6a39b85ebbc080f7ee083 (patch) | |
| tree | 8da3eeb3e495031e6cebbc2ca1d31f2354db98ae /include/grpc++/server.h | |
| parent | 5c41bab92cb65d57def5eca8f83da1beb4ae5f40 (diff) | |
Deprecate grpc::thread and sync in favor of std::thread,mutex,etc
Diffstat (limited to 'include/grpc++/server.h')
| -rw-r--r-- | include/grpc++/server.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/grpc++/server.h b/include/grpc++/server.h index 8035c63da4..fba9952e6e 100644 --- a/include/grpc++/server.h +++ b/include/grpc++/server.h @@ -34,8 +34,10 @@ #ifndef GRPCXX_SERVER_H #define GRPCXX_SERVER_H +#include <condition_variable> #include <list> #include <memory> +#include <mutex> #include <vector> #include <grpc++/completion_queue.h> @@ -43,7 +45,6 @@ #include <grpc++/impl/codegen/grpc_library.h> #include <grpc++/impl/codegen/server_interface.h> #include <grpc++/impl/rpc_service_method.h> -#include <grpc++/impl/sync.h> #include <grpc++/security/server_credentials.h> #include <grpc++/support/channel_arguments.h> #include <grpc++/support/config.h> @@ -197,12 +198,12 @@ class Server final : public ServerInterface, private GrpcLibraryCodegen { std::vector<std::unique_ptr<SyncRequestThreadManager>> sync_req_mgrs_; // Sever status - grpc::mutex mu_; + std::mutex mu_; bool started_; bool shutdown_; bool shutdown_notified_; // Was notify called on the shutdown_cv_ - grpc::condition_variable shutdown_cv_; + std::condition_variable shutdown_cv_; std::shared_ptr<GlobalCallbacks> global_callbacks_; |