diff options
| author | csharptest <roger@csharptest.net> | 2011-10-01 11:56:01 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2011-10-01 11:56:01 -0500 |
| commit | a4e7bf61d48320944f0e49ea932c9c119ca7a42d (patch) | |
| tree | a20c675d5d45760e3f14c79b3a67a8ed8a4dfa91 /protos | |
| parent | 041233adc6737d514159046a3c730e39a4b10215 (diff) | |
| download | protobuf-a4e7bf61d48320944f0e49ea932c9c119ca7a42d.tar.gz protobuf-a4e7bf61d48320944f0e49ea932c9c119ca7a42d.tar.bz2 protobuf-a4e7bf61d48320944f0e49ea932c9c119ca7a42d.zip | |
Case-insensitive name conflict with Enumopt and EnumOpt, renamed one of them
Diffstat (limited to 'protos')
| -rw-r--r-- | protos/google/protobuf/unittest_custom_options.proto | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protos/google/protobuf/unittest_custom_options.proto b/protos/google/protobuf/unittest_custom_options.proto index 1ff6946a..201fb32a 100644 --- a/protos/google/protobuf/unittest_custom_options.proto +++ b/protos/google/protobuf/unittest_custom_options.proto @@ -325,7 +325,7 @@ message Aggregate { extend google.protobuf.FileOptions { optional Aggregate fileopt = 15478479; } extend google.protobuf.MessageOptions { optional Aggregate msgopt = 15480088; } extend google.protobuf.FieldOptions { optional Aggregate fieldopt = 15481374; } -extend google.protobuf.EnumOptions { optional Aggregate enumopt = 15483218; } +extend google.protobuf.EnumOptions { optional Aggregate enumopt_renamed = 15483218; } extend google.protobuf.EnumValueOptions { optional Aggregate enumvalopt = 15486921; } extend google.protobuf.ServiceOptions { optional Aggregate serviceopt = 15497145; } extend google.protobuf.MethodOptions { optional Aggregate methodopt = 15512713; } @@ -367,6 +367,6 @@ service AggregateService { } enum AggregateEnum { - option (enumopt) = { s:'EnumAnnotation' }; + option (enumopt_renamed) = { s:'EnumAnnotation' }; VALUE = 1 [(enumvalopt) = { s:'EnumValueAnnotation' }]; } |