third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_extension.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_extension.cc

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

Patch Set: Update to new HEAD (b7632464b4) + restore GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER Created 4 years, 1 month 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

« third_party/protobuf/patches/0011-uninline_internal_default_instance.patch ('K') | « third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_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/objectivec/objectivec_extension.cc

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

index 3f7ab9d39236dff2de003ddb0994bf9d98c9c479..d0de1eca34644e73b7470cd0c9402b3263d5cfd8 100644

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

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

@@ -63,7 +63,7 @@ void ExtensionGenerator::GenerateMembersHeader(io::Printer* printer) {

vars["method_name"] = method_name_;

SourceLocation location;

if (descriptor_->GetSourceLocation(&location)) {

- vars["comments"] = BuildCommentsString(location);

+ vars["comments"] = BuildCommentsString(location, true);

} else {

vars["comments"] = "";

}

@@ -85,7 +85,7 @@ void ExtensionGenerator::GenerateStaticVariablesInitialization(

if (descriptor_->containing_type()->options().message_set_wire_format())

options.push_back("GPBExtensionSetWireFormat");

- vars["options"] = BuildFlagsString(options);

+ vars["options"] = BuildFlagsString(FLAGTYPE_EXTENSION, options);

ObjectiveCType objc_type = GetObjectiveCType(descriptor_);

string singular_type;