diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-09-23 09:32:49 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-09-23 09:32:49 -0700 |
| commit | 65bcbd386ed4bb9c1f81023f69c63dd666b83ea9 (patch) | |
| tree | 21ac6b511ae60961f72669596d45aa471cdcbde8 /src/cpp/client/secure_credentials.cc | |
| parent | 82f9bd84e5303c78b4b766655653ddb3e1e669f4 (diff) | |
| parent | 6ecd8ad519c360d18b32c8b6a2dbb3f6e9e6b2ef (diff) | |
Merge branch 'shindig' of https://github.com/ctiller/grpc into shindig
Conflicts:
src/core/iomgr/tcp_client_windows.c
Diffstat (limited to 'src/cpp/client/secure_credentials.cc')
| -rw-r--r-- | src/cpp/client/secure_credentials.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index 99b7468e86..1693cf740b 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -173,7 +173,7 @@ void MetadataCredentialsPluginWrapper::GetMetadata( void MetadataCredentialsPluginWrapper::InvokePlugin( const char* service_url, grpc_credentials_plugin_metadata_cb cb, void* user_data) { - std::multimap<grpc::string, grpc::string_ref> metadata; + std::multimap<grpc::string, grpc::string> metadata; Status status = plugin_->GetMetadata(service_url, &metadata); std::vector<grpc_metadata> md; for (auto it = metadata.begin(); it != metadata.end(); ++it) { |