Make the C# generator use the new MapField.MergeFrom method in generated code

3 years ago · 1d990dcb9c
parent 86fa35913d
commit 1d990dcb9c
1 changed files with 1 additions and 1 deletions
--- a/src/google/protobuf/compiler/csharp/csharp_map_field.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_map_field.cc
@ -90,7 +90,7 @@ void MapFieldGenerator::GenerateMembers(io::Printer* printer) {
 void MapFieldGenerator::GenerateMergingCode(io::Printer* printer) {
  printer->Print(
      variables_,
-      "$name$_.Add(other.$name$_);\n");
+      "$name$_.MergeFrom(other.$name$_);\n");
 }
 void MapFieldGenerator::GenerateParsingCode(io::Printer* printer) {