Replace GCC specific __thread with C++ 11 keyword thread_local

Change-Id: I0a3725b53f2cdb48ad0ba0b26e60ef75ef7c46c3

diff --git a/adaptors/common/adaptor-impl.cpp b/adaptors/common/adaptor-impl.cpp
index 7261e4e..08fe0e0 100644 (file)
--- a/adaptors/common/adaptor-impl.cpp
+++ b/adaptors/common/adaptor-impl.cpp
@@ -68,7 +68,7 @@ namespace Adaptor
 
 namespace
 {
-__thread Adaptor* gThreadLocalAdaptor = NULL; // raw thread specific pointer to allow Adaptor::Get
+thread_local Adaptor* gThreadLocalAdaptor = NULL; // raw thread specific pointer to allow Adaptor::Get
 } // unnamed namespace
 
 Dali::Adaptor* Adaptor::New( Any nativeWindow, RenderSurface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions )

diff --git a/adaptors/common/singleton-service-impl.cpp b/adaptors/common/singleton-service-impl.cpp
index d975d94..5ee6180 100644 (file)
--- a/adaptors/common/singleton-service-impl.cpp
+++ b/adaptors/common/singleton-service-impl.cpp
@@ -48,10 +48,9 @@ namespace Internal
 namespace Adaptor
 {
 
-// @todo Start using pthread_key_create if we want to avoid leaking the SingletonService on shutdown
 namespace
 {
-__thread SingletonService * gSingletonService = 0;
+thread_local SingletonService * gSingletonService = 0;
 } // unnamed namespace
 
 Dali::SingletonService SingletonService::New()