| Index: third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field_lite.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field_lite.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field_lite.h
|
| index ad603c2ac76b8f94743b4452bcca466122aeb3ce..6cfbbb98cf39812bf02f4ce9dab7d238073a4568 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field_lite.h
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field_lite.h
|
| @@ -69,7 +69,7 @@ class ImmutablePrimitiveFieldLiteGenerator
|
| void GenerateBuilderMembers(io::Printer* printer) const;
|
| void GenerateInitializationCode(io::Printer* printer) const;
|
| void GenerateBuilderClearCode(io::Printer* printer) const;
|
| - void GenerateMergingCode(io::Printer* printer) const;
|
| + void GenerateVisitCode(io::Printer* printer) const;
|
| void GenerateBuildingCode(io::Printer* printer) const;
|
| void GenerateDynamicMethodMakeImmutableCode(io::Printer* printer) const;
|
| void GenerateParsingCode(io::Printer* printer) const;
|
| @@ -105,7 +105,7 @@ class ImmutablePrimitiveOneofFieldLiteGenerator
|
| void GenerateMembers(io::Printer* printer) const;
|
| void GenerateBuilderMembers(io::Printer* printer) const;
|
| void GenerateBuildingCode(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;
|
| @@ -130,7 +130,7 @@ class RepeatedImmutablePrimitiveFieldLiteGenerator
|
| void GenerateBuilderMembers(io::Printer* printer) const;
|
| void GenerateInitializationCode(io::Printer* printer) const;
|
| void GenerateBuilderClearCode(io::Printer* printer) const;
|
| - void GenerateMergingCode(io::Printer* printer) const;
|
| + void GenerateVisitCode(io::Printer* printer) const;
|
| void GenerateBuildingCode(io::Printer* printer) const;
|
| void GenerateDynamicMethodMakeImmutableCode(io::Printer* printer) const;
|
| void GenerateParsingCode(io::Printer* printer) const;
|
|
|