diff options
author | Adam Cozzette <acozzette@gmail.com> | 2016-12-22 12:56:08 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-22 12:56:08 -0800 |
commit | f52e188fe465c10377f5a2b5765f481cb6fcb2f4 (patch) | |
tree | d9f464b435ab65563fe0ada9cefa35e09e1c5fb9 /src | |
parent | 137dc026cfa73913eb802fb03315be25a40dfab7 (diff) | |
parent | 15a15e336b0295abaf3e06adc9c32807455a8368 (diff) | |
download | protobuf-f52e188fe465c10377f5a2b5765f481cb6fcb2f4.tar.gz protobuf-f52e188fe465c10377f5a2b5765f481cb6fcb2f4.tar.bz2 protobuf-f52e188fe465c10377f5a2b5765f481cb6fcb2f4.zip |
Merge pull request #2523 from jbrianceau/init-index-in-metadata
Init index_in_metadata_ without condition
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_file.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/google/protobuf/compiler/cpp/cpp_file.cc index d8fda59c..9cfd6ec6 100644 --- a/src/google/protobuf/compiler/cpp/cpp_file.cc +++ b/src/google/protobuf/compiler/cpp/cpp_file.cc @@ -289,6 +289,18 @@ void FileGenerator::GenerateSource(io::Printer* printer) { "classname", message_generators_[i]->classname_); } + for (int i = 0; i < message_generators_.size(); i++) { + message_generators_[i]->index_in_metadata_ = i; + } + for (int i = 0; i < enum_generators_.size(); i++) { + enum_generators_[i]->index_in_metadata_ = i; + } + if (HasGenericServices(file_, options_)) { + for (int i = 0; i < service_generators_.size(); i++) { + service_generators_[i]->index_in_metadata_ = i; + } + } + if (HasDescriptorMethods(file_, options_)) { printer->Print( "\n" @@ -313,17 +325,8 @@ void FileGenerator::GenerateSource(io::Printer* printer) { } for (int i = 0; i < message_generators_.size(); i++) { - message_generators_[i]->index_in_metadata_ = i; message_generators_[i]->GenerateDescriptorDeclarations(printer); } - for (int i = 0; i < enum_generators_.size(); i++) { - enum_generators_[i]->index_in_metadata_ = i; - } - if (HasGenericServices(file_, options_)) { - for (int i = 0; i < service_generators_.size(); i++) { - service_generators_[i]->index_in_metadata_ = i; - } - } printer->Print( "\n" |