(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 9286f45..9202734 100644 (file)
--- a/dali/internal/event/common/thread-local-storage.cpp
+++ b/dali/internal/event/common/thread-local-storage.cpp
@@ -30,18 +30,18 @@ namespace Internal
 
 namespace
 {
+#if defined(EMSCRIPTEN)
+ThreadLocalStorage* threadLocal = NULL;
+#else
 __thread ThreadLocalStorage* threadLocal = NULL;
+#endif
 }
 
 ThreadLocalStorage::ThreadLocalStorage(Core* core)
 : mCore( core )
-#ifdef DALI_DYNAMICS_SUPPORT
-, mDynamicsWorldInstance( NULL )
-#endif
 {
   DALI_ASSERT_ALWAYS( threadLocal == NULL && "Cannot create more than one ThreadLocalStorage object" );
 
-  // reset is used to store a new value associated with this thread
   threadLocal = this;
 }
 
@@ -51,12 +51,6 @@ ThreadLocalStorage::~ThreadLocalStorage()
 
 void ThreadLocalStorage::Remove()
 {
-#ifdef DALI_DYNAMICS_SUPPORT
-  if( mDynamicsWorldInstance )
-  {
-    mDynamicsWorldInstance.Reset();
-  }
-#endif
   threadLocal = NULL;
 }
 
@@ -78,18 +72,6 @@ ThreadLocalStorage* ThreadLocalStorage::GetInternal()
   return threadLocal;
 }
 
-#ifdef DALI_DYNAMICS_SUPPORT
-Dali::Internal::DynamicsWorldPtr ThreadLocalStorage::GetDynamicsWorldInstance()
-{
-  if( !mDynamicsWorldInstance )
-  {
-    // Create the instance if it doesn't exist.
-    mDynamicsWorldInstance = DynamicsWorld::New();
-  }
-  return mDynamicsWorldInstance;
-}
-#endif
-
 Dali::Integration::PlatformAbstraction& ThreadLocalStorage::GetPlatformAbstraction()
 {
   return mCore->GetPlatform();