Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread. Change-Id: Iaa75f8333541bc378bea699e7f147c7f17b652ad
diff --git a/src/google/protobuf/arena.cc b/src/google/protobuf/arena.cc old mode 100644 new mode 100755 index e9ee617..bda3741 --- a/src/google/protobuf/arena.cc +++ b/src/google/protobuf/arena.cc
@@ -44,7 +44,7 @@ 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 a83a4fb..bb15e80 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h
@@ -374,7 +374,7 @@ // 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