diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-12-05 02:54:43 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-05 02:54:43 -0800 |
| commit | be20ae0b6975071563ecc61f8372fd7936f174ed (patch) | |
| tree | ed4c27622fceb78410c74af287532379f475843e /src/google/protobuf/arena.cc | |
| parent | 7c939bcb25bff016ca63669c203e2ebfc0834825 (diff) | |
Fix compile issues and test failures in VS2008.
Diffstat (limited to 'src/google/protobuf/arena.cc')
| -rw-r--r-- | src/google/protobuf/arena.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/arena.cc b/src/google/protobuf/arena.cc index 1cb6441e..2ce987cb 100644 --- a/src/google/protobuf/arena.cc +++ b/src/google/protobuf/arena.cc @@ -38,7 +38,7 @@ namespace google { namespace protobuf { google::protobuf::internal::SequenceNumber Arena::lifecycle_id_generator_; -__thread Arena::ThreadCache Arena::thread_cache_ = { -1, NULL }; +GOOGLE_THREAD_LOCAL Arena::ThreadCache Arena::thread_cache_ = { -1, NULL }; void Arena::Init(const ArenaOptions& options) { lifecycle_id_ = lifecycle_id_generator_.GetNext(); |