third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.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/objectivec/objectivec_map_field.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/objectivec/objectivec_helpers.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message.h » ('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_map_field.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc b/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc

index ac5d8aea217917729e6bc316413adfe24ececaa2..0bc9dc10ec9e044b63d0de120476693963e446dd 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc

@@ -115,7 +115,7 @@ MapFieldGenerator::MapFieldGenerator(const FieldDescriptor* descriptor,

if (value_field_flags.find("GPBFieldHasEnumDescriptor") != string::npos) {

field_flags.push_back("GPBFieldHasEnumDescriptor");

}

- variables_["fieldflags"] = BuildFlagsString(field_flags);

+ variables_["fieldflags"] = BuildFlagsString(FLAGTYPE_FIELD, field_flags);

ObjectiveCType value_objc_type = GetObjectiveCType(value_descriptor);

const bool value_is_object_type =