*merge from minimal

1 files changed, 87 insertions, 87 deletions

diff --git a/src/lua/modules/thread/Thread.h b/src/lua/modules/thread/Thread.h
index 645d4a1..60d588a 100644
--- a/src/lua/modules/thread/Thread.h
+++ b/src/lua/modules/thread/Thread.h
@@ -1,94 +1,94 @@
 #include "libjin/jin.h"
 #include "lua/common/common.h"
 
-namespace jin
+namespace JinEngine
 {
-namespace lua
-{
-namespace thread
-{
-
-    class Thread
+    namespace Lua
     {
-    public:
-        typedef jin::thread::Thread::Variant Variant;
-        typedef jin::thread::Thread::ThreadRunner ThreadRunner;
-
-        Thread(std::string _name, std::string _code, ThreadRunner runner)
-            : name(_name)
-            , code(_code)
-        {
-            thread = new jin::thread::Thread(_name, runner);
-        }
-
-		~Thread()
-		{
-			delete thread;
-		}
-
-        bool start(void* p)
-        {
-            return thread->start(p);
-        }
-
-        void wait()
-        {
-            thread->wait();
-        }
-
-        void send(int slot, const Variant& value)
-        {
-            thread->send(slot, value);
-        }
-
-        bool receive(int slot)
-        {
-            return thread->receive(slot);
-        }
-
-        Variant fetch(int slot)
+        namespace thread
         {
-            return thread->fetch(slot);
-        }
-
-        Variant demand(int slot)
-        {
-            return thread->demand(slot);
-        }
-
-        void remove(int slot)
-        {
-            thread->remove(slot);
-        }
-
-        const char* getName()
-        {
-            return name.c_str();
-        }
-
-        bool isRunning()
-        {
-            return thread->isRunning();
-        }
-
-        void lock()
-        {
-            thread->lock();
-        }
-
-        void unlock()
-        {
-            thread->unlock();
-        }
-
-        const std::string name;
-        const std::string code;
-
-	private:
-        jin::thread::Thread* thread;
-
-    };
 
-} // thread
-} // lua
-} // jin
\ No newline at end of file
+            class Thread
+            {
+            public:
+                typedef JinEngine::MultiThread::Thread::Variant Variant;
+                typedef JinEngine::MultiThread::Thread::ThreadRunner ThreadRunner;
+
+                Thread(std::string _name, std::string _code, ThreadRunner runner)
+                    : name(_name)
+                    , code(_code)
+                {
+                    thread = new JinEngine::MultiThread::Thread(_name, runner);
+                }
+
+		        ~Thread()
+		        {
+			        delete thread;
+		        }
+
+                bool start(void* p)
+                {
+                    return thread->start(p);
+                }
+
+                void wait()
+                {
+                    thread->wait();
+                }
+
+                void send(int slot, const Variant& value)
+                {
+                    thread->send(slot, value);
+                }
+
+                bool receive(int slot)
+                {
+                    return thread->receive(slot);
+                }
+
+                Variant fetch(int slot)
+                {
+                    return thread->fetch(slot);
+                }
+
+                Variant demand(int slot)
+                {
+                    return thread->demand(slot);
+                }
+
+                void remove(int slot)
+                {
+                    thread->remove(slot);
+                }
+
+                const char* getName()
+                {
+                    return name.c_str();
+                }
+
+                bool isRunning()
+                {
+                    return thread->isRunning();
+                }
+
+                void lock()
+                {
+                    thread->lock();
+                }
+
+                void unlock()
+                {
+                    thread->unlock();
+                }
+
+                const std::string name;
+                const std::string code;
+
+	        private:
+                JinEngine::MultiThread::Thread* thread;
+
+            };
+
+        } // thread
+    } // namespace Lua
+} // namespace JinEngine
\ No newline at end of file