diff options
| author |  Bo Yang <teboring@google.com> | 2016-09-19 13:45:07 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-10-10 11:23:36 -0700 |
| commit | cc8ca5b6a5478b40546d4206392eb1471454460d (patch) | |
| tree | c0b45abfa16d7d373a6ea8f7fe50f1de00ab938e /src/google/protobuf/compiler/cpp/cpp_string_field.h | |
| parent | 337a028bb65ccca4dda768695950b5aba53ae2c9 (diff) | |
Integrate internal changes
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_string_field.h')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_string_field.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_string_field.h b/src/google/protobuf/compiler/cpp/cpp_string_field.h index cb4e8772..1dea7663 100644 --- a/src/google/protobuf/compiler/cpp/cpp_string_field.h +++ b/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; |