| Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.h b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.h
|
| index 655ebde468f7586e0d899a8400a5a27210eb72a1..23cc697eff04e0d660402409b43dec2700d800de 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.h
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.h
|
| @@ -103,6 +103,7 @@ class RepeatedPrimitiveFieldGenerator : public FieldGenerator {
|
| bool is_inline) const;
|
| void GenerateClearingCode(io::Printer* printer) const;
|
| void GenerateMergingCode(io::Printer* printer) const;
|
| + virtual void GenerateUnsafeMergingCode(io::Printer* printer) const;
|
| void GenerateSwappingCode(io::Printer* printer) const;
|
| void GenerateConstructorCode(io::Printer* printer) const;
|
| void GenerateMergeFromCodedStream(io::Printer* printer) const;
|
|
|