aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc++/client_context.h
diff options
context:
space:
mode:
authorGravatar Julien Boeuf <jboeuf@google.com>2015-11-17 20:55:13 -0800
committerGravatar Julien Boeuf <jboeuf@google.com>2015-11-17 20:55:13 -0800
commit232d625a840821d21115bc50820caf7a7ad7772d (patch)
treecdfb34ab103d19d85db03ba22be6a3000a06decb /include/grpc++/client_context.h
parent6049ebd8d2a59aa5dc39a4299ac7599ba8e60c50 (diff)
parent930df6f13cc124cc1b2483176bba6f5820505655 (diff)
Merge branch 'master' of github.com:grpc/grpc into core_creds_api_change
Diffstat (limited to 'include/grpc++/client_context.h')
-rw-r--r--include/grpc++/client_context.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h
index 17b66ddbca..5c6f432c9a 100644
--- a/include/grpc++/client_context.h
+++ b/include/grpc++/client_context.h
@@ -53,15 +53,16 @@
#include <memory>
#include <string>
-#include <grpc/compression.h>
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
+#include <grpc++/impl/sync.h>
#include <grpc++/security/auth_context.h>
#include <grpc++/support/config.h>
#include <grpc++/support/status.h>
#include <grpc++/support/string_ref.h>
#include <grpc++/support/time.h>
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
struct census_context;
@@ -315,7 +316,9 @@ class ClientContext {
bool initial_metadata_received_;
std::shared_ptr<Channel> channel_;
+ grpc::mutex mu_;
grpc_call* call_;
+ bool call_canceled_;
gpr_timespec deadline_;
grpc::string authority_;
std::shared_ptr<CallCredentials> creds_;