diff options
| author | Jie Luo <jieluo@google.com> | 2017-01-27 11:45:31 -0800 |
|---|---|---|
| committer | Jie Luo <jieluo@google.com> | 2017-01-27 11:52:32 -0800 |
| commit | ccb76fff445862ac11bf7980818d587030f1c7d9 (patch) | |
| tree | 6732e2f456e40f64ab2fa6e93e780d23840dbe26 /csharp/protos | |
| parent | 5af0b547de7aba6d6206943546262cb21fedc721 (diff) | |
| download | protobuf-ccb76fff445862ac11bf7980818d587030f1c7d9.tar.gz protobuf-ccb76fff445862ac11bf7980818d587030f1c7d9.tar.bz2 protobuf-ccb76fff445862ac11bf7980818d587030f1c7d9.zip | |
Add Oneof custom options test
Diffstat (limited to 'csharp/protos')
| -rw-r--r-- | csharp/protos/unittest_custom_options_proto3.proto | 10 |
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; } |