From 92076f7007be81ec77ffa8514fff96dd5c81ed63 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 14 Apr 2020 12:35:22 +0200 Subject: [PATCH] codegen: InternalMergeFrom --- src/google/protobuf/compiler/csharp/csharp_message.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/compiler/csharp/csharp_message.cc b/src/google/protobuf/compiler/csharp/csharp_message.cc index 35a3e66856..cf00e8c7e2 100644 --- a/src/google/protobuf/compiler/csharp/csharp_message.cc +++ b/src/google/protobuf/compiler/csharp/csharp_message.cc @@ -640,7 +640,7 @@ void MessageGenerator::GenerateMergingMethods(io::Printer* printer) { printer->Print("}\n\n"); WriteGeneratedCodeAttributes(printer); - printer->Print("public void MergeFrom_Internal(ref pb::ParseContext input) {\n"); + printer->Print("void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {\n"); printer->Indent(); printer->Print( "uint tag;\n"