From da468fea0405e1935325d75029b2fdebdfcfbd33 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 25 Oct 2018 11:54:16 +0800 Subject: =?UTF-8?q?*=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lua/modules/thread/je_lua_thread.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/lua/modules/thread/je_lua_thread.cpp') diff --git a/src/lua/modules/thread/je_lua_thread.cpp b/src/lua/modules/thread/je_lua_thread.cpp index 9c2cb35..5babc13 100644 --- a/src/lua/modules/thread/je_lua_thread.cpp +++ b/src/lua/modules/thread/je_lua_thread.cpp @@ -10,8 +10,6 @@ namespace JinEngine namespace Lua { - using thread::Thread; - typedef Ref& ThreadRef; int luaopen_thread(lua_State* L); @@ -109,23 +107,23 @@ namespace JinEngine Thread::Variant v = ref->fetch(slot); switch (v.type) { - case thread::Thread::Variant::INTERGER: + case Thread::Variant::INTERGER: luax_pushinteger(L, v.integer); break; - case thread::Thread::Variant::BOOLEAN: + case Thread::Variant::BOOLEAN: luax_pushboolean(L, v.boolean); break; - case thread::Thread::Variant::CSTRING: + case Thread::Variant::CSTRING: luax_pushstring(L, v.cstring); break; - case thread::Thread::Variant::REAL: + case Thread::Variant::REAL: luax_pushnumber(L, v.real); break; - case thread::Thread::Variant::POINTER: + case Thread::Variant::POINTER: Proxy* p = (Proxy*)v.pointer; Proxy* proxy = (Proxy*)luax_newinstance(L, p->getObjectType(), sizeof(Proxy)); p->reference->retain(); @@ -143,23 +141,23 @@ namespace JinEngine Thread::Variant v = ref->demand(slot); switch (v.type) { - case thread::Thread::Variant::INTERGER: + case Thread::Variant::INTERGER: luax_pushinteger(L, v.integer); break; - case thread::Thread::Variant::BOOLEAN: + case Thread::Variant::BOOLEAN: luax_pushboolean(L, v.boolean); break; - case thread::Thread::Variant::CSTRING: + case Thread::Variant::CSTRING: luax_pushstring(L, v.cstring); break; - case thread::Thread::Variant::REAL: + case Thread::Variant::REAL: luax_pushnumber(L, v.real); break; - case thread::Thread::Variant::POINTER: + case Thread::Variant::POINTER: Proxy* p = (Proxy*)v.pointer; const char* objType = p->getObjectType(); Proxy* proxy = (Proxy*)luax_newinstance(L, objType, sizeof(Proxy)); -- cgit v1.1-26-g67d0