diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 15:38:30 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 15:38:30 -0700 |
| commit | 09354db1434859a31a3c81abebcc4018d42f2715 (patch) | |
| tree | b87c7cdc2255e6c8062ab92b4082665cd698d753 /src/google/protobuf/generated_message_reflection.h | |
| parent | 9053033a5076f82cf18b823c31f352e95e5bfd8d (diff) | |
| download | protobuf-09354db1434859a31a3c81abebcc4018d42f2715.tar.gz protobuf-09354db1434859a31a3c81abebcc4018d42f2715.tar.bz2 protobuf-09354db1434859a31a3c81abebcc4018d42f2715.zip | |
Merge from Google internal for 3.4 release
Diffstat (limited to 'src/google/protobuf/generated_message_reflection.h')
| -rw-r--r-- | src/google/protobuf/generated_message_reflection.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/google/protobuf/generated_message_reflection.h b/src/google/protobuf/generated_message_reflection.h index 12b73ca3..911c3a54 100644 --- a/src/google/protobuf/generated_message_reflection.h +++ b/src/google/protobuf/generated_message_reflection.h @@ -714,6 +714,11 @@ LIBPROTOBUF_EXPORT void AssignDescriptors( LIBPROTOBUF_EXPORT void RegisterAllTypes(const Metadata* file_level_metadata, int size); +// These cannot be in lite so we put them in the reflection. +LIBPROTOBUF_EXPORT void UnknownFieldSetSerializer(const uint8* base, uint32 offset, uint32 tag, + uint32 has_offset, + ::google::protobuf::io::CodedOutputStream* output); + } // namespace internal } // namespace protobuf |