Index: third_party/protobuf/src/google/protobuf/compiler/java/java_field.h |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_field.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_field.h |
index 0e24da24c643b59121fd8b66da43a19e23b57003..4dd4f57f6d0145910fa76ab1616731f5219be58f 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_field.h |
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_field.h |
@@ -105,7 +105,7 @@ class ImmutableFieldLiteGenerator { |
virtual void GenerateMembers(io::Printer* printer) const = 0; |
virtual void GenerateBuilderMembers(io::Printer* printer) const = 0; |
virtual void GenerateInitializationCode(io::Printer* printer) const = 0; |
- virtual void GenerateMergingCode(io::Printer* printer) const = 0; |
+ virtual void GenerateVisitCode(io::Printer* printer) const = 0; |
virtual void GenerateDynamicMethodMakeImmutableCode(io::Printer* printer) |
const = 0; |
virtual void GenerateParsingCode(io::Printer* printer) const = 0; |