diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2018-03-28 16:53:39 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2018-04-02 09:54:29 -0400 |
| commit | bca797dac9c5c6f549be12e2bc9addbf51b1d18f (patch) | |
| tree | 7c7847cd60c0ca9a1f65829737538794960fb323 /src/google/protobuf/compiler/objectivec/objectivec_file.h | |
| parent | 7bf47a6b5d10382a4b427677cf7ca9288f4e2833 (diff) | |
Trim imports for bundled generated protos.
To avoid a cycle between headers, have the WKTs use minimal imports instead
of using the helper to get everything from the library.
Fixes https://github.com/google/protobuf/issues/4301
Fixes https://github.com/google/protobuf/issues/4403
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_file.h')
| -rw-r--r-- | src/google/protobuf/compiler/objectivec/objectivec_file.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_file.h b/src/google/protobuf/compiler/objectivec/objectivec_file.h index 9c3f0071..862f5bb9 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_file.h +++ b/src/google/protobuf/compiler/objectivec/objectivec_file.h @@ -74,7 +74,7 @@ class FileGenerator { const Options options_; void PrintFileRuntimePreamble( - io::Printer* printer, const string& header_to_import) const; + io::Printer* printer, const std::set<string>& headers_to_import) const; GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator); }; |