diff options
Diffstat (limited to 'Runtime/Lua/LuaBind')
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindClass.hpp | 2 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindState.h | 2 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindUtility.h | 4 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindVM.cpp | 2 | ||||
| -rw-r--r-- | Runtime/Lua/LuaBind/LuaBindVM.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Runtime/Lua/LuaBind/LuaBindClass.hpp b/Runtime/Lua/LuaBind/LuaBindClass.hpp index dff4d30..3a407d2 100644 --- a/Runtime/Lua/LuaBind/LuaBindClass.hpp +++ b/Runtime/Lua/LuaBind/LuaBindClass.hpp @@ -183,7 +183,7 @@ namespace LuaBind if (sClassID == CLASS_NONE_ID) sClassID = gClassIDGenerator.GetID(); LuaBind::VM* vm = state.GetVM(); - vm->RegisterClassI(state, sClassID, idx); + vm->RegisterNativeClass(state, sClassID, idx); } template<class TYPE, class BASE> diff --git a/Runtime/Lua/LuaBind/LuaBindState.h b/Runtime/Lua/LuaBind/LuaBindState.h index 21cde0d..e639d4d 100644 --- a/Runtime/Lua/LuaBind/LuaBindState.h +++ b/Runtime/Lua/LuaBind/LuaBindState.h @@ -273,7 +273,7 @@ namespace LuaBind lua_newtable(L); int clsIdx = lua_gettop(L); TYPE::RegisterClassShared(state); - TYPE::RegisterClass_(state); + TYPE::RegisterNativeClass(state); // 自定义注册内容 if (onRegisterNativeClass) diff --git a/Runtime/Lua/LuaBind/LuaBindUtility.h b/Runtime/Lua/LuaBind/LuaBindUtility.h index bf138e4..6d04272 100644 --- a/Runtime/Lua/LuaBind/LuaBindUtility.h +++ b/Runtime/Lua/LuaBind/LuaBindUtility.h @@ -9,7 +9,7 @@ #define LUA_BIND_DECL_CLASS(type, ...) \ friend class LuaBind::State; \ friend class LuaBind::NativeClass<type,##__VA_ARGS__>; \ - static void RegisterClass_(LuaBind::State&); \ + static void RegisterNativeClass(LuaBind::State&); \ static void RegisterPostprocess(LuaBind::State&); \ static const char* GetNativeClassName() { return #type; }; //static const char* GetClassName() { return #type; }; @@ -22,7 +22,7 @@ #define LUA_BIND_IMPL_METHOD(type, f) int type::f(lua_State* L) // 由应用程序实现的两个接口。上下文里有一个state。 -#define LUA_BIND_REGISTRY(type) void type::RegisterClass_(LuaBind::State& state) +#define LUA_BIND_REGISTRY(type) void type::RegisterNativeClass(LuaBind::State& state) #define LUA_BIND_POSTPROCESS(type) void type::RegisterPostprocess(LuaBind::State& state) // 用来注册的宏。之前这里忘了用可变宏，导致没有luaclastable ref没有注册对。 diff --git a/Runtime/Lua/LuaBind/LuaBindVM.cpp b/Runtime/Lua/LuaBind/LuaBindVM.cpp index 7a56013..8bf6ac1 100644 --- a/Runtime/Lua/LuaBind/LuaBindVM.cpp +++ b/Runtime/Lua/LuaBind/LuaBindVM.cpp @@ -94,7 +94,7 @@ namespace LuaBind luaL_openlibs(mMainThread); } - int VM::RegisterClassI(State& state, int classID, int index) + int VM::RegisterNativeClass(State& state, int classID, int index) { assert(state.GetVM() == this); assert(mClasses.count(classID) == 0); diff --git a/Runtime/Lua/LuaBind/LuaBindVM.h b/Runtime/Lua/LuaBind/LuaBindVM.h index f3a9a30..5fe2eaf 100644 --- a/Runtime/Lua/LuaBind/LuaBindVM.h +++ b/Runtime/Lua/LuaBind/LuaBindVM.h @@ -38,7 +38,7 @@ namespace LuaBind RefTable& GetStrongRefTable(); RefTable& GetWeakRefTable(); - int RegisterClassI(State& state, int classID, int index); + int RegisterNativeClass(State& state, int classID, int index); void PushClassTable(State& state, int classID); private: |