diff options
author | Craig Tiller <craig.tiller@gmail.com> | 2015-02-13 16:30:49 -0800 |
---|---|---|
committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-13 16:30:49 -0800 |
commit | 771fefb41bd325ac01ef6d378413ad609974e61d (patch) | |
tree | 455a2e6be96b0070ec54b59f0f20a2a7d49fb167 /include/grpc++ | |
parent | 857680be2c7bd358528a85a9a61043a907050628 (diff) | |
parent | 406b32f663d14994a24abea3788d0bffce216f8a (diff) |
Merge pull request #18 from yang-g/c++api
Add missing APIs and a first metadata test, and test passes
Diffstat (limited to 'include/grpc++')
-rw-r--r-- | include/grpc++/client_context.h | 2 | ||||
-rw-r--r-- | include/grpc++/server_context.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h index ab5965f55a..3912e52ece 100644 --- a/include/grpc++/client_context.h +++ b/include/grpc++/client_context.h @@ -88,7 +88,7 @@ class ClientContext { void set_absolute_deadline(const system_clock::time_point &deadline); system_clock::time_point absolute_deadline(); - void StartCancel(); + void TryCancel(); private: // Disallow copy and assign. diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h index 31b09ee7a8..853f91f467 100644 --- a/include/grpc++/server_context.h +++ b/include/grpc++/server_context.h @@ -76,6 +76,10 @@ class ServerContext final { void AddInitialMetadata(const grpc::string& key, const grpc::string& value); void AddTrailingMetadata(const grpc::string& key, const grpc::string& value); + std::multimap<grpc::string, grpc::string> client_metadata() { + return client_metadata_; + } + private: friend class ::grpc::Server; template <class W, class R> |