third_party/protobuf/src/google/protobuf/compiler/java/java_string_field_lite.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/java/java_string_field_lite.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/java/java_string_field.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_string_field_lite.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_string_field_lite.h

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

index 4d9b4bd7ca0ba1ba975b7ea5cc030aee91283926..4148aa4dfbf3522693ffa6c8c7a23687d02d9300 100644

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

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

@@ -68,7 +68,7 @@ class ImmutableStringFieldLiteGenerator : public ImmutableFieldLiteGenerator {

void GenerateMembers(io::Printer* printer) const;

void GenerateBuilderMembers(io::Printer* printer) const;

void GenerateInitializationCode(io::Printer* printer) const;

- void GenerateMergingCode(io::Printer* printer) const;

+ void GenerateVisitCode(io::Printer* printer) const;

void GenerateDynamicMethodMakeImmutableCode(io::Printer* printer) const;

void GenerateParsingCode(io::Printer* printer) const;

void GenerateParsingDoneCode(io::Printer* printer) const;

@@ -103,7 +103,7 @@ class ImmutableStringOneofFieldLiteGenerator

private:

void GenerateMembers(io::Printer* printer) const;

void GenerateBuilderMembers(io::Printer* printer) const;

- void GenerateMergingCode(io::Printer* printer) const;

+ void GenerateVisitCode(io::Printer* printer) const;

void GenerateParsingCode(io::Printer* printer) const;

void GenerateSerializationCode(io::Printer* printer) const;

void GenerateSerializedSizeCode(io::Printer* printer) const;

@@ -126,7 +126,7 @@ class RepeatedImmutableStringFieldLiteGenerator

void GenerateMembers(io::Printer* printer) const;

void GenerateBuilderMembers(io::Printer* printer) const;

void GenerateInitializationCode(io::Printer* printer) const;

- void GenerateMergingCode(io::Printer* printer) const;

+ void GenerateVisitCode(io::Printer* printer) const;

void GenerateDynamicMethodMakeImmutableCode(io::Printer* printer) const;

void GenerateParsingCode(io::Printer* printer) const;

void GenerateParsingDoneCode(io::Printer* printer) const;