From 22bb9b537caff927ef8c83bde82d58253ffbb1e4 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 18 Aug 2018 22:15:27 +0800 Subject: *update --- src/lua/thread/luaopen_thread.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lua/thread/luaopen_thread.cpp') diff --git a/src/lua/thread/luaopen_thread.cpp b/src/lua/thread/luaopen_thread.cpp index 3277704..a427e30 100644 --- a/src/lua/thread/luaopen_thread.cpp +++ b/src/lua/thread/luaopen_thread.cpp @@ -28,7 +28,7 @@ namespace lua luax_getglobal(L, MODULE_NAME); Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_THREAD_THREAD, sizeof(Proxy)); ref.retain(); - proxy->bind(&ref, JIN_THREAD_THREAD); + proxy->bind(&ref); luax_setfield(L, -2, "_curThread"); luax_dostring(L, ref->code.c_str()); luax_close(L); @@ -124,9 +124,9 @@ namespace lua case thread::Thread::Variant::POINTER: Proxy* p = (Proxy*)v.pointer; - Proxy* proxy = (Proxy*)luax_newinstance(L, p->type, sizeof(Proxy)); + Proxy* proxy = (Proxy*)luax_newinstance(L, p->getObjectType(), sizeof(Proxy)); p->reference->retain(); - proxy->bind(p->reference, p->type); + proxy->bind(p->reference); break; } @@ -158,9 +158,9 @@ namespace lua case thread::Thread::Variant::POINTER: Proxy* p = (Proxy*)v.pointer; - Proxy* proxy = (Proxy*)luax_newinstance(L, p->type, sizeof(Proxy)); + Proxy* proxy = (Proxy*)luax_newinstance(L, p->getObjectType(), sizeof(Proxy)); p->reference->retain(); - proxy->bind(p->reference, p->type); + proxy->bind(p->reference); break; } @@ -219,7 +219,7 @@ namespace lua const char* code = luax_checkstring(L, 2); Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_THREAD_THREAD, sizeof(Proxy)); Thread* thread = new Thread(name, code, threadRunner); - proxy->bind(new Ref(thread), JIN_THREAD_THREAD); + proxy->bind(new Ref(thread, JIN_THREAD_THREAD)); return 1; } -- cgit v1.1-26-g67d0