diff options
| author | Jon Skeet <jonskeet@google.com> | 2017-10-24 14:14:15 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2017-10-31 17:11:40 -0700 |
| commit | cbe250591fca9d2e776776be065a72c5550a5556 (patch) | |
| tree | b9b6b3de8fe8af9aaa9238b40611bf09f8f87b65 /src/google/protobuf/compiler/csharp/csharp_enum_field.h | |
| parent | 6dd82243932e929331f3808742b191c85a353461 (diff) | |
| download | protobuf-cbe250591fca9d2e776776be065a72c5550a5556.tar.gz protobuf-cbe250591fca9d2e776776be065a72c5550a5556.tar.bz2 protobuf-cbe250591fca9d2e776776be065a72c5550a5556.zip | |
Fix merging with message-valued oneof
If messages A and B have the same oneof case, which is a message
type, and we merge B into A, those sub-messages should be merged.
Fixes #3200.
Note that I haven't regenerated all the code, as some of the protos
have been changed, breaking generation.
Diffstat (limited to 'src/google/protobuf/compiler/csharp/csharp_enum_field.h')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_enum_field.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_enum_field.h b/src/google/protobuf/compiler/csharp/csharp_enum_field.h index 9b7669ba..631632bc 100644 --- a/src/google/protobuf/compiler/csharp/csharp_enum_field.h +++ b/src/google/protobuf/compiler/csharp/csharp_enum_field.h @@ -64,6 +64,7 @@ class EnumOneofFieldGenerator : public PrimitiveOneofFieldGenerator { const Options *options); ~EnumOneofFieldGenerator(); + virtual void GenerateMergingCode(io::Printer* printer); virtual void GenerateParsingCode(io::Printer* printer); virtual void GenerateSerializationCode(io::Printer* printer); virtual void GenerateSerializedSizeCode(io::Printer* printer); |