third_party/protobuf/src/google/protobuf/compiler/python/python_generator.h - Issue 6737030: third_party/protobuf: update to upstream r371

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/python/python_generator.h

Issue 6737030: third_party/protobuf: update to upstream r371 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 9 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/plugin.pb.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/python/python_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/python/python_generator.h

diff --git a/third_party/protobuf/src/google/protobuf/compiler/python/python_generator.h b/third_party/protobuf/src/google/protobuf/compiler/python/python_generator.h

index 43c20876884e42297f40e9a18024ccbcdf36dd7b..84eaf8abd062ac42557c88f232740b6deee5e301 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/python/python_generator.h

+++ b/third_party/protobuf/src/google/protobuf/compiler/python/python_generator.h

@@ -66,7 +66,7 @@ class LIBPROTOC_EXPORT Generator : public CodeGenerator {

// CodeGenerator methods.

virtual bool Generate(const FileDescriptor* file,

const string& parameter,

- OutputDirectory* output_directory,

+ GeneratorContext* generator_context,

string* error) const;

private:

@@ -104,6 +104,7 @@ class LIBPROTOC_EXPORT Generator : public CodeGenerator {

void FixForeignFieldsInField(const Descriptor* containing_type,

const FieldDescriptor& field,

const string& python_dict_name) const;

+ void AddMessageToFileDescriptor(const Descriptor& descriptor) const;

string FieldReferencingExpression(const Descriptor* containing_type,

const FieldDescriptor& field,

const string& python_dict_name) const;