Merge github.com:grpc/grpc into an-update-on-c++

pull/581/head
Craig Tiller 10 years ago
commit f01ea7cee8
  1. 4
      include/grpc++/client_context.h
  2. 2
      include/grpc++/server_context.h

@ -81,12 +81,12 @@ class ClientContext {
void AddMetadata(const grpc::string &meta_key, void AddMetadata(const grpc::string &meta_key,
const grpc::string &meta_value); const grpc::string &meta_value);
std::multimap<grpc::string, grpc::string> GetServerInitialMetadata() { const std::multimap<grpc::string, grpc::string>& GetServerInitialMetadata() {
GPR_ASSERT(initial_metadata_received_); GPR_ASSERT(initial_metadata_received_);
return recv_initial_metadata_; return recv_initial_metadata_;
} }
std::multimap<grpc::string, grpc::string> GetServerTrailingMetadata() { const std::multimap<grpc::string, grpc::string>& GetServerTrailingMetadata() {
// TODO(yangg) check finished // TODO(yangg) check finished
return trailing_metadata_; return trailing_metadata_;
} }

@ -81,7 +81,7 @@ class ServerContext final {
bool IsCancelled(); bool IsCancelled();
std::multimap<grpc::string, grpc::string> client_metadata() { const std::multimap<grpc::string, grpc::string>& client_metadata() {
return client_metadata_; return client_metadata_;
} }

Loading…
Cancel
Save