diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-26 10:58:17 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-26 10:58:17 -0700 |
| commit | c84d4aa6d08770335e1a5debbd2f3daff3897d19 (patch) | |
| tree | 85522ef3c538391da9fc8e40c0b929f00f150c80 /src/cpp/server/server_context.cc | |
| parent | 1dc323b45e1a109c860806cb25e7eca21c29a3c0 (diff) | |
| parent | 60e0e743bed05b248c485949c6cd9e05fa02b607 (diff) | |
Merge github.com:grpc/grpc into endpoints
Conflicts:
src/core/iomgr/tcp_windows.c
Diffstat (limited to 'src/cpp/server/server_context.cc')
| -rw-r--r-- | src/cpp/server/server_context.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 03461ddda5..8193e70660 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -38,7 +38,7 @@ #include <grpc/support/log.h> #include <grpc++/impl/call.h> #include <grpc++/impl/sync.h> -#include <grpc++/time.h> +#include <grpc++/support/time.h> #include "src/core/channel/compress_filter.h" #include "src/cpp/common/create_auth_context.h" @@ -136,10 +136,9 @@ ServerContext::ServerContext(gpr_timespec deadline, grpc_metadata* metadata, cq_(nullptr), sent_initial_metadata_(false) { for (size_t i = 0; i < metadata_count; i++) { - client_metadata_.insert(std::make_pair( - grpc::string(metadata[i].key), - grpc::string(metadata[i].value, - metadata[i].value + metadata[i].value_length))); + client_metadata_.insert(std::pair<grpc::string_ref, grpc::string_ref>( + metadata[i].key, + grpc::string_ref(metadata[i].value, metadata[i].value_length))); } } |