third_party/protobuf/src/google/protobuf/compiler/java/java_field.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/java/java_field.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/java/java_extension.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_field.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_field.h

diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_field.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_field.h

index f5bef7abc53babeecfb815b1abd619753588d55f..6097f357c5d1784ff2fe0808459989b9502ed21b 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_field.h

+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_field.h

@@ -55,15 +55,24 @@ class FieldGenerator {

FieldGenerator() {}

virtual ~FieldGenerator();

+ virtual int GetNumBitsForMessage() const = 0;

+ virtual int GetNumBitsForBuilder() const = 0;

+ virtual void GenerateInterfaceMembers(io::Printer* printer) const = 0;

virtual void GenerateMembers(io::Printer* printer) const = 0;

virtual void GenerateBuilderMembers(io::Printer* printer) const = 0;

virtual void GenerateInitializationCode(io::Printer* printer) const = 0;

+ virtual void GenerateBuilderClearCode(io::Printer* printer) const = 0;

virtual void GenerateMergingCode(io::Printer* printer) const = 0;

virtual void GenerateBuildingCode(io::Printer* printer) const = 0;

virtual void GenerateParsingCode(io::Printer* printer) const = 0;

virtual void GenerateParsingCodeFromPacked(io::Printer* printer) const;

virtual void GenerateSerializationCode(io::Printer* printer) const = 0;

virtual void GenerateSerializedSizeCode(io::Printer* printer) const = 0;

+ virtual void GenerateFieldBuilderInitializationCode(io::Printer* printer)

+ const = 0;

+ virtual void GenerateEqualsCode(io::Printer* printer) const = 0;

+ virtual void GenerateHashCode(io::Printer* printer) const = 0;

virtual string GetBoxedType() const = 0;

@@ -85,7 +94,8 @@ class FieldGeneratorMap {

scoped_array<scoped_ptr<FieldGenerator> > field_generators_;

scoped_array<scoped_ptr<FieldGenerator> > extension_generators_;

- static FieldGenerator* MakeGenerator(const FieldDescriptor* field);

+ static FieldGenerator* MakeGenerator(const FieldDescriptor* field,

+ int messageBitIndex, int builderBitIndex);

GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap);

};