third_party/protobuf/src/google/protobuf/compiler/java/java_message_field_lite.cc - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

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_message_field_lite.cc

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component Created 4 years 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_message_field_lite.h ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_message_lite.h » ('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_message_field_lite.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_message_field_lite.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_message_field_lite.cc

index 142818169dbcf17f07d7fc3df9d0a66e187ff9cb..fd78f75a9a6cad390a0333eb470852422d498992 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_message_field_lite.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_message_field_lite.cc

@@ -56,7 +56,7 @@ void SetMessageVariables(const FieldDescriptor* descriptor,

int builderBitIndex,

const FieldGeneratorInfo* info,

ClassNameResolver* name_resolver,

- map<string, string>* variables) {

+ std::map<string, string>* variables) {

SetCommonFieldVariables(descriptor, info, variables);

(*variables)["type"] =

@@ -145,6 +145,7 @@ GenerateInterfaceMembers(io::Printer* printer) const {

void ImmutableMessageFieldLiteGenerator::

GenerateMembers(io::Printer* printer) const {

printer->Print(variables_,

"private $type$ $name$_;\n");

PrintExtraFieldInfo(variables_, printer);