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

Index: third_party/protobuf/objectivec/Tests/GPBMessageTests+Merge.m

diff --git a/third_party/protobuf/objectivec/Tests/GPBMessageTests+Merge.m b/third_party/protobuf/objectivec/Tests/GPBMessageTests+Merge.m

index a3908aabe9aeba99b32bb2f534c95f7ea0f58342..c0bd5897a4a698ed66f4782c95365ce4a90407c9 100644

--- a/third_party/protobuf/objectivec/Tests/GPBMessageTests+Merge.m

+++ b/third_party/protobuf/objectivec/Tests/GPBMessageTests+Merge.m

@@ -675,14 +675,12 @@

TestAllTypes *subMsg = [TestAllTypes message];

subMsg.repeatedInt32Array = [GPBInt32Array arrayWithValue:100];

- msg1.mapInt32Message = [GPBInt32ObjectDictionary dictionary];

[msg1.mapInt32Message setObject:subMsg forKey:0];

subMsg = nil;

subMsg = [TestAllTypes message];

subMsg.repeatedInt32Array = [GPBInt32Array arrayWithValue:101];

- msg2.mapInt32Message = [GPBInt32ObjectDictionary dictionary];

[msg2.mapInt32Message setObject:subMsg forKey:0];

subMsg = nil;