natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Craig Tiller 2015-02-18 13:21:02 -08:00
parent eaaee49f9b 7326901767
commit f01ea7cee8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/grpc++/client_context.h
View File

@ -81,12 +81,12 @@ class ClientContext {
void AddMetadata(const grpc::string &meta_key,
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_);
return recv_initial_metadata_;
}
std::multimap<grpc::string, grpc::string> GetServerTrailingMetadata() {
const std::multimap<grpc::string, grpc::string>& GetServerTrailingMetadata() {
// TODO(yangg) check finished
return trailing_metadata_;
}

2
include/grpc++/server_context.h
View File

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