Index: third_party/protobuf/src/google/protobuf/compiler/java/java_lazy_message_field_lite.h |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_lazy_message_field_lite.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_lazy_message_field_lite.h |
index e85ec0f35a8b43feb783c77aacf035e96e295ee6..47ebeb49a03edb1578fdf878cb660f8d444f13ff 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_lazy_message_field_lite.h |
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_lazy_message_field_lite.h |
@@ -63,7 +63,7 @@ class ImmutableLazyMessageFieldLiteGenerator |
void GenerateMembers(io::Printer* printer) const; |
void GenerateBuilderMembers(io::Printer* printer) const; |
void GenerateInitializationCode(io::Printer* printer) const; |
- void GenerateMergingCode(io::Printer* printer) const; |
+ void GenerateVisitCode(io::Printer* printer) const; |
void GenerateParsingCode(io::Printer* printer) const; |
void GenerateSerializationCode(io::Printer* printer) const; |
void GenerateSerializedSizeCode(io::Printer* printer) const; |
@@ -82,7 +82,7 @@ class ImmutableLazyMessageOneofFieldLiteGenerator |
void GenerateMembers(io::Printer* printer) const; |
void GenerateBuilderMembers(io::Printer* printer) const; |
- void GenerateMergingCode(io::Printer* printer) const; |
+ void GenerateVisitCode(io::Printer* printer) const; |
void GenerateParsingCode(io::Printer* printer) const; |
void GenerateSerializationCode(io::Printer* printer) const; |
void GenerateSerializedSizeCode(io::Printer* printer) const; |