| Index: third_party/protobuf/src/google/protobuf/arena.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/arena.h b/third_party/protobuf/src/google/protobuf/arena.h
|
| index cf07b9fc97c0cf4b7f7f4dba9caa5a9edc963833..72d8a9d9896320263084b0e4020e944f74f39764 100644
|
| --- a/third_party/protobuf/src/google/protobuf/arena.h
|
| +++ b/third_party/protobuf/src/google/protobuf/arena.h
|
| @@ -70,6 +70,9 @@ class LazyField; // lazy_field.h
|
| template<typename Type>
|
| class GenericTypeHandler; // repeated_field.h
|
|
|
| +LIBPROTOBUF_EXPORT extern google::protobuf::internal::SequenceNumber
|
| + cr_lifecycle_id_generator_;
|
| +
|
| // Templated cleanup methods.
|
| template<typename T> void arena_destruct_object(void* object) {
|
| reinterpret_cast<T*>(object)->~T();
|
| @@ -552,7 +555,6 @@ class LIBPROTOBUF_EXPORT Arena {
|
| };
|
|
|
| static const size_t kHeaderSize = sizeof(Block);
|
| - static google::protobuf::internal::SequenceNumber lifecycle_id_generator_;
|
| #if defined(GOOGLE_PROTOBUF_NO_THREADLOCAL)
|
| // Android ndk does not support GOOGLE_THREAD_LOCAL keyword so we use a custom thread
|
| // local storage class we implemented.
|
|
|