Merge branch 'master' of github.com:grpc/grpc into decompression

1 files changed, 5 insertions, 0 deletions

diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h
index 88954e227b..13fe5993a9 100644
--- a/include/grpc++/client_context.h
+++ b/include/grpc++/client_context.h
@@ -47,6 +47,7 @@
 
 struct grpc_call;
 struct grpc_completion_queue;
+struct census_context;
 
 namespace grpc {
 
@@ -118,6 +119,9 @@ class ClientContext {
   }
   void set_compression_algorithm(grpc_compression_algorithm algorithm);
 
+  // Get and set census context
+  void set_census_context(census_context* ccp) { census_context_ = ccp; }
+  census_context* get_census_context() const { return census_context_; }
 
   void TryCancel();
 
@@ -166,6 +170,7 @@ class ClientContext {
   gpr_timespec deadline_;
   grpc::string authority_;
   std::shared_ptr<Credentials> creds_;
+  census_context* census_context_;
   std::multimap<grpc::string, grpc::string> send_initial_metadata_;
   std::multimap<grpc::string, grpc::string> recv_initial_metadata_;
   std::multimap<grpc::string, grpc::string> trailing_metadata_;