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

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/objectivec/objectivec_enum_field.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.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_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 4e348393a3dda89d7f7b2bcd438c4ca1b3b8b8ef..3f7ab9d39236dff2de003ddb0994bf9d98c9c479 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

@@ -114,14 +114,14 @@ void ExtensionGenerator::GenerateStaticVariablesInitialization(

printer->Print(vars,

"{\n"

+ " .defaultValue.$default_name$ = $default$,\n"

" .singletonName = GPBStringifySymbol($root_class_and_method_name$),\n"

- " .dataType = $extension_type$,\n"

" .extendedClass = GPBStringifySymbol($extended_type$),\n"

- " .fieldNumber = $number$,\n"

- " .defaultValue.$default_name$ = $default$,\n"

" .messageOrGroupClassName = $type$,\n"

- " .options = $options$,\n"

" .enumDescriptorFunc = $enum_desc_func_name$,\n"

+ " .fieldNumber = $number$,\n"

+ " .dataType = $extension_type$,\n"

+ " .options = $options$,\n"

"},\n");

}