third_party/protobuf/objectivec/Tests/GPBUnittestProtos.m - 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/objectivec/Tests/GPBUnittestProtos.m

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/objectivec/Tests/GPBMessageTests+Runtime.m ('k') | third_party/protobuf/objectivec/Tests/GPBWireFormatTests.m » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/objectivec/Tests/GPBUnittestProtos.m

diff --git a/third_party/protobuf/objectivec/Tests/GPBUnittestProtos.m b/third_party/protobuf/objectivec/Tests/GPBUnittestProtos.m

index 50c4dfa9886edb7996406e24196bad971f3f9fd5..d19beee9247af83014832c1814cb60be80b27397 100644

--- a/third_party/protobuf/objectivec/Tests/GPBUnittestProtos.m

+++ b/third_party/protobuf/objectivec/Tests/GPBUnittestProtos.m

@@ -31,6 +31,11 @@

// Collects all the compiled protos into one file and compiles them to make sure

// the compiler is generating valid code.

+// The unittest_custom_options.proto extends the messages in descriptor.proto

+// so we build it in to test extending in general. The library doesn't provide

+// a descriptor as it doesn't use the classes/enums.

+#import "google/protobuf/Descriptor.pbobjc.m"

#import "google/protobuf/MapProto2Unittest.pbobjc.m"

#import "google/protobuf/MapUnittest.pbobjc.m"

#import "google/protobuf/Unittest.pbobjc.m"