diff options
| author |  Mark D. Roth <roth@google.com> | 2016-11-03 09:23:47 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-11-03 09:23:47 -0700 |
| commit | d3f25b3dfe25b7b4a39d6f148b616e9be6ba1347 (patch) | |
| tree | 46adee9ad3c163e4aaedde22b6b82d3210de6e4a /include/grpc++/impl/codegen/client_context.h | |
| parent | 6c8492de8a27b3b6afa3533543eeac167b5c94cc (diff) | |
| parent | b37ace5d279925ecd7f8dd6dca03e20cb066ae50 (diff) | |
Merge remote-tracking branch 'upstream/master' into remove_fake_resolver
Diffstat (limited to 'include/grpc++/impl/codegen/client_context.h')
| -rw-r--r-- | include/grpc++/impl/codegen/client_context.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/grpc++/impl/codegen/client_context.h b/include/grpc++/impl/codegen/client_context.h index a330ed06bb..777b2f8847 100644 --- a/include/grpc++/impl/codegen/client_context.h +++ b/include/grpc++/impl/codegen/client_context.h @@ -51,6 +51,7 @@ #include <map> #include <memory> +#include <mutex> #include <string> #include <grpc++/impl/codegen/config.h> @@ -59,7 +60,6 @@ #include <grpc++/impl/codegen/security/auth_context.h> #include <grpc++/impl/codegen/status.h> #include <grpc++/impl/codegen/string_ref.h> -#include <grpc++/impl/codegen/sync.h> #include <grpc++/impl/codegen/time.h> #include <grpc/impl/codegen/compression_types.h> #include <grpc/impl/codegen/propagation_bits.h> @@ -235,12 +235,10 @@ class ClientContext { /// DEPRECATED: Use set_wait_for_ready() instead. void set_fail_fast(bool fail_fast) { set_wait_for_ready(!fail_fast); } -#ifndef GRPC_CXX0X_NO_CHRONO /// Return the deadline for the client call. std::chrono::system_clock::time_point deadline() const { return Timespec2Timepoint(deadline_); } -#endif // !GRPC_CXX0X_NO_CHRONO /// Return a \a gpr_timespec representation of the client call's deadline. gpr_timespec raw_deadline() const { return deadline_; } @@ -368,7 +366,7 @@ class ClientContext { bool idempotent_; bool cacheable_; std::shared_ptr<Channel> channel_; - grpc::mutex mu_; + std::mutex mu_; grpc_call* call_; bool call_canceled_; gpr_timespec deadline_; |