third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto - Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)

Patch Set: 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 unified diff | Download patch

« no previous file with comments | « third_party/protobuf/objectivec/Tests/unittest_extension_chain_c.proto ('k') | third_party/protobuf/objectivec/Tests/unittest_extension_chain_e.proto » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	(Empty)
1 // Protocol Buffers - Google's data interchange format

2 // Copyright 2016 Google Inc. All rights reserved.

3 //

4 // Redistribution and use in source and binary forms, with or without

5 // modification, are permitted provided that the following conditions are

6 // met:

7 //

8 // * Redistributions of source code must retain the above copyright

9 // notice, this list of conditions and the following disclaimer.

10 // * Redistributions in binary form must reproduce the above

11 // copyright notice, this list of conditions and the following disclaimer

12 // in the documentation and/or other materials provided with the

13 // distribution.

14 // * Neither the name of Google Inc. nor the names of its

15 // contributors may be used to endorse or promote products derived from

16 // this software without specific prior written permission.

17 //

18 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

19 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

20 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

21 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

29

30 syntax = "proto2";

31

32 package protobuf_unittest;

33

34 import "google/protobuf/unittest.proto";

35

36 import "unittest_extension_chain_b.proto";

37 import "unittest_extension_chain_c.proto";

38

39 // The root should end up needing to merge B (C will be merged into B, so it

40 // doesn't need to be directly merged).

41

42 message ChainDMessage {

43 optional ChainBMessage b = 1;

44 optional ChainCMessage c = 2;

45 }

46

47 extend TestAllExtensions {

48 optional int32 chain_d_extension = 10004;

49 }

OLD	NEW