From ded7f8250c282b9fcf120ef2ff47832926660ff4 Mon Sep 17 00:00:00 2001
From: yang-g <yangg@google.com>
Date: Wed, 1 Feb 2017 10:49:51 -0800
Subject: [PATCH] Minor fixes
---
test/cpp/util/cli_call.cc | 4 ++--
test/cpp/util/proto_file_parser.cc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/cpp/util/cli_call.cc b/test/cpp/util/cli_call.cc
index 4d045da098..041cc0e4c3 100644
--- a/test/cpp/util/cli_call.cc
+++ b/test/cpp/util/cli_call.cc
@@ -111,7 +111,7 @@ bool CliCall::Read(grpc::string* response,
return false;
}
std::vector<grpc::Slice> slices;
- recv_buffer.Dump(&slices);
+ GPR_ASSERT(recv_buffer.Dump(&slices).ok());
response->clear();
for (size_t i = 0; i < slices.size(); i++) {
@@ -196,7 +196,7 @@ bool CliCall::ReadAndMaybeNotifyWrite(
}
std::vector<grpc::Slice> slices;
- recv_buffer.Dump(&slices);
+ GPR_ASSERT(recv_buffer.Dump(&slices).ok());
response->clear();
for (size_t i = 0; i < slices.size(); i++) {
response->append(reinterpret_cast<const char*>(slices[i].begin()),
diff --git a/test/cpp/util/proto_file_parser.cc b/test/cpp/util/proto_file_parser.cc
index d501c3697b..5dd1b00e8a 100644
--- a/test/cpp/util/proto_file_parser.cc
+++ b/test/cpp/util/proto_file_parser.cc
@@ -83,7 +83,7 @@ ProtoFileParser::ProtoFileParser(std::shared_ptr<grpc::Channel> channel,
const grpc::string& protofiles)
: has_error_(false),
dynamic_factory_(new protobuf::DynamicMessageFactory()) {
- std::vector<std::string> service_list;
+ std::vector<grpc::string> service_list;
if (channel) {
reflection_db_.reset(new grpc::ProtoReflectionDescriptorDatabase(channel));
reflection_db_->GetServices(&service_list);
--
GitLab