From 1eeb21c4df03194654252d1feaee779514ecefad Mon Sep 17 00:00:00 2001 From: yang-g <yangg@google.com> Date: Tue, 25 Aug 2015 11:05:50 -0700 Subject: [PATCH] api change to string_ref --- include/grpc++/client_context.h | 10 ++++++---- include/grpc++/server_context.h | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h index ee28f360cb..c4724cc1f0 100644 --- a/include/grpc++/client_context.h +++ b/include/grpc++/client_context.h @@ -138,12 +138,14 @@ class ClientContext { void AddMetadata(const grpc::string& meta_key, const grpc::string& meta_value); - const std::multimap<grpc::string, grpc::string>& GetServerInitialMetadata() { + const std::multimap<grpc::string_ref, grpc::string_ref>& + GetServerInitialMetadata() { GPR_ASSERT(initial_metadata_received_); return recv_initial_metadata_; } - const std::multimap<grpc::string, grpc::string>& GetServerTrailingMetadata() { + const std::multimap<grpc::string_ref, grpc::string_ref>& + GetServerTrailingMetadata() { // TODO(yangg) check finished return trailing_metadata_; } @@ -234,8 +236,8 @@ class ClientContext { mutable std::shared_ptr<const AuthContext> auth_context_; struct 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_; + std::multimap<grpc::string_ref, grpc::string_ref> recv_initial_metadata_; + std::multimap<grpc::string_ref, grpc::string_ref> trailing_metadata_; grpc_call* propagate_from_call_; PropagationOptions propagation_options_; diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h index ce3cb47a23..a165d84944 100644 --- a/include/grpc++/server_context.h +++ b/include/grpc++/server_context.h @@ -103,7 +103,7 @@ class ServerContext { bool IsCancelled() const; - const std::multimap<grpc::string, grpc::string>& client_metadata() { + const std::multimap<grpc::string_ref, grpc::string_ref>& client_metadata() { return client_metadata_; } @@ -185,7 +185,7 @@ class ServerContext { CompletionQueue* cq_; bool sent_initial_metadata_; mutable std::shared_ptr<const AuthContext> auth_context_; - std::multimap<grpc::string, grpc::string> client_metadata_; + std::multimap<grpc::string_ref, grpc::string_ref> client_metadata_; std::multimap<grpc::string, grpc::string> initial_metadata_; std::multimap<grpc::string, grpc::string> trailing_metadata_; -- GitLab