diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-04 17:30:58 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-04 17:30:58 -0800 |
| commit | d77877808fc9f00c3570353717d9659f8994ffc2 (patch) | |
| tree | c26019d265d2409595b6bfcd7026cd5eb9bf7b11 /src/google/protobuf/arena.h | |
| parent | 6a949cda379c0ee38cce1a926e2982d45f53dfce (diff) | |
| download | protobuf-d77877808fc9f00c3570353717d9659f8994ffc2.tar.gz protobuf-d77877808fc9f00c3570353717d9659f8994ffc2.tar.bz2 protobuf-d77877808fc9f00c3570353717d9659f8994ffc2.zip | |
Fix thread local annotatoin and add back type traits is_convertable for MSVC
Diffstat (limited to 'src/google/protobuf/arena.h')
| -rw-r--r-- | src/google/protobuf/arena.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index 519e3569..b5822bdb 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -312,7 +312,7 @@ class LIBPROTOBUF_EXPORT Arena { static const size_t kHeaderSize = sizeof(Block); static google::protobuf::internal::SequenceNumber lifecycle_id_generator_; - static __thread ThreadCache thread_cache_; + static GOOGLE_THREAD_LOCAL ThreadCache thread_cache_; // SFINAE for skipping addition to delete list for a Type. This is mainly to // skip proto2/proto1 message objects with cc_enable_arenas=true from being |