| Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h
|
| index cb4e8772d00725e8ed67470d6d397306b3398a67..1dea76636d61c9b3ee9efa0e2e02cd8ab1b585a5 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h
|
| @@ -110,6 +110,7 @@ class RepeatedStringFieldGenerator : public FieldGenerator {
|
| bool is_inline) const;
|
| void GenerateClearingCode(io::Printer* printer) const;
|
| void GenerateMergingCode(io::Printer* printer) const;
|
| + void GenerateUnsafeMergingCode(io::Printer* printer) const;
|
| void GenerateSwappingCode(io::Printer* printer) const;
|
| void GenerateConstructorCode(io::Printer* printer) const;
|
| void GenerateMergeFromCodedStream(io::Printer* printer) const;
|
|
|