aboutsummaryrefslogtreecommitdiff
path: root/csharp/protos/unittest_custom_options_proto3.proto
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/protos/unittest_custom_options_proto3.proto')
-rw-r--r--csharp/protos/unittest_custom_options_proto3.proto10
1 files changed, 4 insertions, 6 deletions
diff --git a/csharp/protos/unittest_custom_options_proto3.proto b/csharp/protos/unittest_custom_options_proto3.proto
index 9b18b280..87bd0f7a 100644
--- a/csharp/protos/unittest_custom_options_proto3.proto
+++ b/csharp/protos/unittest_custom_options_proto3.proto
@@ -68,10 +68,9 @@ extend google.protobuf.FieldOptions {
fixed64 field_opt1 = 7740936;
}
-// See https://github.com/google/protobuf/issues/2316
-// extend google.protobuf.OneofOptions {
-// int32 oneof_opt1 = 7740111;
-// }
+extend google.protobuf.OneofOptions {
+ int32 oneof_opt1 = 7740111;
+}
extend google.protobuf.EnumOptions {
sfixed32 enum_opt1 = 7753576;
@@ -106,8 +105,7 @@ message TestMessageWithCustomOptions {
(field_opt1)=8765432109];
oneof AnOneof {
-// See https://github.com/google/protobuf/issues/2316
-// option (oneof_opt1) = -99;
+ option (oneof_opt1) = -99;
int32 oneof_field = 2;
}