| Index: third_party/protobuf/src/google/protobuf/compiler/plugin.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/plugin.cc b/third_party/protobuf/src/google/protobuf/compiler/plugin.cc
|
| index 2ff50f61f47a8dde1796dbd6f1d7372ba1775b85..e1087601b0da4fa981d844fd2b34cba430617fb7 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/plugin.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/plugin.cc
|
| @@ -118,35 +118,16 @@ bool GenerateCode(const CodeGeneratorRequest& request,
|
|
|
| GeneratorResponseContext context(response, parsed_files);
|
|
|
| - if (generator.HasGenerateAll()) {
|
| - string error;
|
| - bool succeeded = generator.GenerateAll(
|
| - parsed_files, request.parameter(), &context, &error);
|
| -
|
| - if (!succeeded && error.empty()) {
|
| - error = "Code generator returned false but provided no error "
|
| - "description.";
|
| - }
|
| - if (!error.empty()) {
|
| - response->set_error(error);
|
| - }
|
| - } else {
|
| - for (int i = 0; i < parsed_files.size(); i++) {
|
| - const FileDescriptor* file = parsed_files[i];
|
| -
|
| - string error;
|
| - bool succeeded = generator.Generate(
|
| - file, request.parameter(), &context, &error);
|
| -
|
| - if (!succeeded && error.empty()) {
|
| - error = "Code generator returned false but provided no error "
|
| - "description.";
|
| - }
|
| - if (!error.empty()) {
|
| - response->set_error(file->name() + ": " + error);
|
| - break;
|
| - }
|
| - }
|
| + string error;
|
| + bool succeeded = generator.GenerateAll(
|
| + parsed_files, request.parameter(), &context, &error);
|
| +
|
| + if (!succeeded && error.empty()) {
|
| + error = "Code generator returned false but provided no error "
|
| + "description.";
|
| + }
|
| + if (!error.empty()) {
|
| + response->set_error(error);
|
| }
|
|
|
| return true;
|
|
|