From 6130809a8bc792c952cb15f4931634cc47b35219 Mon Sep 17 00:00:00 2001
From: vjpai <vpai@google.com>
Date: Thu, 26 Mar 2015 17:12:17 -0400
Subject: [PATCH] Work around a compiler limitation caused by inability to
properly handle vectors created from initializer list
---
test/cpp/interop/server.cc | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/cpp/interop/server.cc b/test/cpp/interop/server.cc
index eceb600d4c..780a7370ac 100644
--- a/test/cpp/interop/server.cc
+++ b/test/cpp/interop/server.cc
@@ -213,8 +213,11 @@ void RunServer() {
builder.RegisterService(&service);
std::shared_ptr<ServerCredentials> creds = grpc::InsecureServerCredentials();
if (FLAGS_enable_ssl) {
- SslServerCredentialsOptions ssl_opts = {
- "", {{test_server1_key, test_server1_cert}}};
+ SslServerCredentialsOptions::PemKeyCertPair pkcp = {test_server1_key,
+ test_server1_cert};
+ SslServerCredentialsOptions ssl_opts;
+ ssl_opts.pem_root_certs = "";
+ ssl_opts.pem_key_cert_pairs.push_back(pkcp);
creds = grpc::SslServerCredentials(ssl_opts);
}
builder.AddListeningPort(server_address.str(), creds);
--
GitLab