[Protobuf] Absorb protobuf::MultiFileErrorCollector change 2 (#35898)

Additional touch on top of https://github.com/grpc/grpc/pull/35870

Closes #35898

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35898 from veblush:protobuf-sv 3b8410b6f6
PiperOrigin-RevId: 606699149
pull/35800/head
Esun Kim 1 year ago committed by Copybara-Service
parent 385431ca4b
commit 98a96c5068
  1. 8
      test/cpp/util/proto_file_parser.cc
  2. 4
      tools/distrib/python/grpcio_tools/grpc_tools/main.cc

@ -48,16 +48,16 @@ class ErrorPrinter : public protobuf::compiler::MultiFileErrorCollector {
public:
explicit ErrorPrinter(ProtoFileParser* parser) : parser_(parser) {}
void AddError(const std::string& filename, int line, int column,
const std::string& message) override {
void RecordError(absl::string_view filename, int line, int column,
absl::string_view message) override {
std::ostringstream oss;
oss << "error " << filename << " " << line << " " << column << " "
<< message << "\n";
parser_->LogError(oss.str());
}
void AddWarning(const std::string& filename, int line, int column,
const std::string& message) override {
void RecordWarning(absl::string_view filename, int line, int column,
absl::string_view message) override {
std::cerr << "warning " << filename << " " << line << " " << column << " "
<< message << std::endl;
}

@ -108,13 +108,13 @@ class ErrorCollectorImpl : public MultiFileErrorCollector {
: errors_(errors), warnings_(warnings) {}
void RecordError(absl::string_view filename, int line, int column,
absl::string_view message) {
absl::string_view message) override {
errors_->emplace_back(std::string(filename), line, column,
std::string(message));
}
void RecordWarning(absl::string_view filename, int line, int column,
absl::string_view message) {
absl::string_view message) override {
warnings_->emplace_back(std::string(filename), line, column,
std::string(message));
}

Loading…
Cancel
Save