diff options
author | chai <chaifix@163.com> | 2018-11-23 13:33:50 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-11-23 13:33:50 +0800 |
commit | 4ecdb39fc39649eb97809598a76120c89b7006f7 (patch) | |
tree | fe5c73d8b6c624a0d46dbe7699b650e2ee16d4fa | |
parent | 436568ee6320ee7507c01cd6978c078aec2335bd (diff) |
*修改proxy访问性
-rw-r--r-- | bin/Jin.exe | bin | 2565120 -> 0 bytes | |||
-rw-r--r-- | bin/jin.exe | bin | 2565120 -> 2565120 bytes | |||
-rw-r--r-- | src/lua/common/je_lua_proxy.h | 6 | ||||
-rw-r--r-- | src/lua/modules/thread/je_lua_thread.cpp | 4 |
4 files changed, 8 insertions, 2 deletions
diff --git a/bin/Jin.exe b/bin/Jin.exe Binary files differdeleted file mode 100644 index e48b1f6..0000000 --- a/bin/Jin.exe +++ /dev/null diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex e48b1f6..2bd2f9b 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/src/lua/common/je_lua_proxy.h b/src/lua/common/je_lua_proxy.h index 6b79b9d..57b577b 100644 --- a/src/lua/common/je_lua_proxy.h +++ b/src/lua/common/je_lua_proxy.h @@ -28,6 +28,11 @@ namespace JinEngine return *(Shared<T>*)shared; } + SharedBase* getSharedBase() + { + return shared; + } + /// /// For convenience. /// @@ -38,6 +43,7 @@ namespace JinEngine return shared.getObject(); } + private: /// /// /// diff --git a/src/lua/modules/thread/je_lua_thread.cpp b/src/lua/modules/thread/je_lua_thread.cpp index 4e0442e..a31a037 100644 --- a/src/lua/modules/thread/je_lua_thread.cpp +++ b/src/lua/modules/thread/je_lua_thread.cpp @@ -125,7 +125,7 @@ namespace JinEngine case Thread::Variant::POINTER: Proxy* p = (Proxy*)v.pointer; - Proxy* proxy = luax_newinstance(L, p->getObjectType(), p->shared); + Proxy* proxy = luax_newinstance(L, p->getObjectType(), p->getSharedBase()); break; } @@ -158,7 +158,7 @@ namespace JinEngine case Thread::Variant::POINTER: Proxy* p = (Proxy*)v.pointer; const char* objType = p->getObjectType(); - Proxy* proxy = luax_newinstance(L, objType, p->shared); + Proxy* proxy = luax_newinstance(L, objType, p->getSharedBase()); break; } |