diff options
| author | Jon Skeet <skeet@pobox.com> | 2015-08-08 07:24:57 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-08-08 07:24:57 +0100 |
| commit | cac45313235bd11b08e0803453a2ec5a7d4b652a (patch) | |
| tree | b513d3030e013c59fc2a2ef4df0be6a0509b5dc9 /src | |
| parent | b76b76ba4f5152550fd334a6f3533d4db208f633 (diff) | |
| parent | 6e16037c9933e175f62feb445ff8bd22d7727285 (diff) | |
| download | protobuf-cac45313235bd11b08e0803453a2ec5a7d4b652a.tar.gz protobuf-cac45313235bd11b08e0803453a2ec5a7d4b652a.tar.bz2 protobuf-cac45313235bd11b08e0803453a2ec5a7d4b652a.zip | |
Merge pull request #694 from jskeet/groups
Fix groups handling in C#
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_message.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_message.cc b/src/google/protobuf/compiler/csharp/csharp_message.cc index 40c13de5..a71a7909 100644 --- a/src/google/protobuf/compiler/csharp/csharp_message.cc +++ b/src/google/protobuf/compiler/csharp/csharp_message.cc @@ -423,10 +423,7 @@ void MessageGenerator::GenerateMergingMethods(io::Printer* printer) { printer->Indent(); printer->Print( "default:\n" - " if (pb::WireFormat.IsEndGroupTag(tag)) {\n" - " return;\n" - " }\n" - " input.ConsumeLastField();\n" // We're not storing the data, but we still need to consume it. + " input.SkipLastField();\n" // We're not storing the data, but we still need to consume it. " break;\n"); for (int i = 0; i < fields_by_number().size(); i++) { const FieldDescriptor* field = fields_by_number()[i]; |