third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h

diff --git a/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h b/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h

index 1bb4f0ea41298ab6d5a2caf4e62155842c7e7421..4c0fcd3f4151174456ef487a04c43bc53043559f 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h

+++ b/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h

@@ -55,7 +55,7 @@ class MessageGenerator;

class FileGenerator {

public:

- explicit FileGenerator(const FileDescriptor* file);

+ FileGenerator(const FileDescriptor* file, const Options& options);

~FileGenerator();

void GenerateSource(io::Printer* printer);

@@ -84,6 +84,8 @@ class FileGenerator {

vector<ExtensionGenerator*> extension_generators_;

bool is_public_dep_;

+ const Options options_;

const vector<FileGenerator*>& DependencyGenerators();

GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator);