diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2017-06-23 15:08:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 15:08:04 -0700 |
| commit | 1a7e49d46208b0844cb6dc2f971620b3af7a2781 (patch) | |
| tree | 63cde2f4c1e646da5f8aa764594781aaaf8c39cc /src/google/protobuf/compiler/cpp | |
| parent | f752d816b780fff2a6af80f330a808874e63621f (diff) | |
| parent | 9ba7d1c03810b47e535018d0362a8affef6f7f56 (diff) | |
| download | protobuf-1a7e49d46208b0844cb6dc2f971620b3af7a2781.tar.gz protobuf-1a7e49d46208b0844cb6dc2f971620b3af7a2781.tar.bz2 protobuf-1a7e49d46208b0844cb6dc2f971620b3af7a2781.zip | |
Merge pull request #2968 from ngg/cpp-proper-fwd
C++: Do not forward-declare dependencies in generated .h files
Diffstat (limited to 'src/google/protobuf/compiler/cpp')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_file.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/google/protobuf/compiler/cpp/cpp_file.cc index e0542ae8..1f7a66c5 100644 --- a/src/google/protobuf/compiler/cpp/cpp_file.cc +++ b/src/google/protobuf/compiler/cpp/cpp_file.cc @@ -925,19 +925,11 @@ void FileGenerator::GenerateNamespaceClosers(io::Printer* printer) { void FileGenerator::GenerateForwardDeclarations(io::Printer* printer) { ForwardDeclarations decls; - for (int i = 0; i < file_->dependency_count(); i++) { - FileGenerator dependency(file_->dependency(i), options_); - dependency.FillForwardDeclarations(&decls); - } FillForwardDeclarations(&decls); decls.Print(printer, options_); } void FileGenerator::FillForwardDeclarations(ForwardDeclarations* decls) { - for (int i = 0; i < file_->public_dependency_count(); i++) { - FileGenerator dependency(file_->public_dependency(i), options_); - dependency.FillForwardDeclarations(decls); - } for (int i = 0; i < package_parts_.size(); i++) { decls = decls->AddOrGetNamespace(package_parts_[i]); } |