Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread.

Change-Id: Iaa75f8333541bc378bea699e7f147c7f17b652ad

Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread.
Change-Id: Iaa75f8333541bc378bea699e7f147c7f17b652ad
0a25cfe6 · Jisi Liu · b25caa5c · 0a25cfe6 · 0a25cfe6
Commit 0a25cfe6 authored Mar 02, 2015 by Jisi Liu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arena.cc src/google/protobuf/arena.cc +1 -1

arena.h src/google/protobuf/arena.h +1 -1

No files found.
--- 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() {

--- 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