third_party/protobuf/src/google/protobuf/unittest_custom_options.proto - Issue 2590803003: Revert "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/unittest_custom_options.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/unittest.proto ('k') | third_party/protobuf/src/google/protobuf/unittest_lite.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/unittest_custom_options.proto

diff --git a/third_party/protobuf/src/google/protobuf/unittest_custom_options.proto b/third_party/protobuf/src/google/protobuf/unittest_custom_options.proto

index 218447e9aa5d70c2b4fbb56dce860133eb7c3672..4cc0e362c56c74374b4183965ddd69834583f0cc 100644

--- a/third_party/protobuf/src/google/protobuf/unittest_custom_options.proto

+++ b/third_party/protobuf/src/google/protobuf/unittest_custom_options.proto

@@ -69,10 +69,6 @@ extend google.protobuf.FieldOptions {

optional int32 field_opt2 = 7753913 [default=42];

}

-extend google.protobuf.OneofOptions {

- optional int32 oneof_opt1 = 7740111;

extend google.protobuf.EnumOptions {

optional sfixed32 enum_opt1 = 7753576;

}

@@ -104,11 +100,6 @@ message TestMessageWithCustomOptions {

optional string field1 = 1 [ctype=CORD,

(field_opt1)=8765432109];

- oneof AnOneof {

- option (oneof_opt1) = -99;

- int32 oneof_field = 2;

- }

enum AnEnum {

option (enum_opt1) = -789;