diff options
| -rwxr-xr-x[-rw-r--r--] | src/google/protobuf/arena.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/arena.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/arena.cc b/src/google/protobuf/arena.cc index e9ee6170..bda37413 100644..100755 --- a/src/google/protobuf/arena.cc +++ b/src/google/protobuf/arena.cc @@ -44,7 +44,7 @@ Arena::ThreadCache& Arena::thread_cache() { return thread_cache_; } #else -__thread Arena::ThreadCache Arena::thread_cache_ = { -1, NULL }; +GOOGLE_THREAD_LOCAL Arena::ThreadCache Arena::thread_cache_ = { -1, NULL }; #endif void Arena::Init() { diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index a83a4fbf..bb15e80c 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -374,7 +374,7 @@ class LIBPROTOBUF_EXPORT Arena { // wrap them in static functions. static ThreadCache& thread_cache(); #else - static __thread ThreadCache thread_cache_; + static GOOGLE_THREAD_LOCAL ThreadCache thread_cache_; static ThreadCache& thread_cache() { return thread_cache_; } #endif |