Index: third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.h |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.h |
index 2c41c3e4cd1abd9e58a2ca9967924102eda0b2db..9201b8d66acc19ea1e62828bc6515e79d421b886 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.h |
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.h |
@@ -67,7 +67,7 @@ class ImmutableEnumFieldLiteGenerator : public ImmutableFieldLiteGenerator { |
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 GenerateDynamicMethodMakeImmutableCode(io::Printer* printer) const; |
void GenerateParsingCode(io::Printer* printer) const; |
void GenerateParsingDoneCode(io::Printer* printer) const; |
@@ -101,7 +101,7 @@ class ImmutableEnumOneofFieldLiteGenerator |
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; |
@@ -127,7 +127,7 @@ class RepeatedImmutableEnumFieldLiteGenerator |
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 GenerateDynamicMethodMakeImmutableCode(io::Printer* printer) const; |
void GenerateParsingCode(io::Printer* printer) const; |
void GenerateParsingCodeFromPacked(io::Printer* printer) const; |