(Scripting) Helper method for bit-mask enum properties & moved enum-string macros...

[platform/core/uifw/dali-core.git] / dali / internal / event / common / thread-local-storage.cpp

diff --git a/dali/internal/event/common/thread-local-storage.cpp b/dali/internal/event/common/thread-local-storage.cpp
index c553417..9202734 100644 (file)
--- a/dali/internal/event/common/thread-local-storage.cpp
+++ b/dali/internal/event/common/thread-local-storage.cpp
@@ -18,17 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/common/thread-local-storage.h>
 
-// EXTERNAL INCLUDES
-#include <boost/thread/tss.hpp>
-#include <memory>
-
 // INTERNAL INCLUDES
 #include <dali/internal/common/core-impl.h>
-#include <dali/internal/update/manager/update-manager.h>
-#include <dali/internal/render/common/render-manager.h>
-#include <dali/integration-api/platform-abstraction.h>
 #include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/math/vector2.h>
 
 namespace Dali
 {
@@ -38,21 +30,19 @@ namespace Internal
 
 namespace
 {
-#ifdef EMSCRIPTEN
-  std::auto_ptr<ThreadLocalStorage> threadLocal;
+#if defined(EMSCRIPTEN)
+ThreadLocalStorage* threadLocal = NULL;
 #else
-  boost::thread_specific_ptr<ThreadLocalStorage> threadLocal;
+__thread ThreadLocalStorage* threadLocal = NULL;
 #endif
 }
 
 ThreadLocalStorage::ThreadLocalStorage(Core* core)
-: mCore(core)
+: mCore( core )
 {
-  DALI_ASSERT_ALWAYS( threadLocal.get() == NULL && "Cannot create more than one ThreadLocalStorage object" );
-
-  // reset is used to store a new value associated with this thread
-  threadLocal.reset(this);
+  DALI_ASSERT_ALWAYS( threadLocal == NULL && "Cannot create more than one ThreadLocalStorage object" );
 
+  threadLocal = this;
 }
 
 ThreadLocalStorage::~ThreadLocalStorage()
@@ -61,22 +51,25 @@ ThreadLocalStorage::~ThreadLocalStorage()
 
 void ThreadLocalStorage::Remove()
 {
-  threadLocal.reset();
+  threadLocal = NULL;
 }
 
 ThreadLocalStorage& ThreadLocalStorage::Get()
 {
-  ThreadLocalStorage* tls = threadLocal.get();
+  DALI_ASSERT_ALWAYS(threadLocal);
 
-  DALI_ASSERT_ALWAYS(tls);
-
-  return *tls;
+  return *threadLocal;
 }
 
 bool ThreadLocalStorage::Created()
 {
   // see if the TLS has been set yet
-  return (threadLocal.get() != NULL);
+  return (threadLocal != NULL);
+}
+
+ThreadLocalStorage* ThreadLocalStorage::GetInternal()
+{
+  return threadLocal;
 }
 
 Dali::Integration::PlatformAbstraction& ThreadLocalStorage::GetPlatformAbstraction()
@@ -109,11 +102,6 @@ ImageFactory& ThreadLocalStorage::GetImageFactory()
   return mCore->GetImageFactory();
 }
 
-ModelFactory& ThreadLocalStorage::GetModelFactory()
-{
-  return mCore->GetModelFactory();
-}
-
 ShaderFactory& ThreadLocalStorage::GetShaderFactory()
 {
   return mCore->GetShaderFactory();
@@ -124,14 +112,14 @@ StagePtr ThreadLocalStorage::GetCurrentStage()
   return mCore->GetCurrentStage();
 }
 
-EventToUpdate& ThreadLocalStorage::GetEventToUpdate()
+GestureEventProcessor& ThreadLocalStorage::GetGestureEventProcessor()
 {
-  return GetUpdateManager().GetEventToUpdate();
+  return mCore->GetGestureEventProcessor();
 }
 
-GestureEventProcessor& ThreadLocalStorage::GetGestureEventProcessor()
+RelayoutController& ThreadLocalStorage::GetRelayoutController()
 {
-  return mCore->GetGestureEventProcessor();
+  return mCore->GetRelayoutController();
 }
 
 } // namespace Internal