Skip to content

Commit 5e84255

Browse files
authored
Merge pull request #27 from nmarks99/master
Fixes #26
2 parents 17475b5 + 2e7387a commit 5e84255

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

luaApp/src/luaaa/luaaa.hpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,13 +1139,17 @@ namespace LUAAA_NS
11391139
: m_state(state)
11401140
{
11411141
assert(state != nullptr);
1142-
assert(klassName == nullptr);
1143-
1142+
if (klassName != nullptr) {
1143+
assert(strcmp(klassName, name) == 0);
1144+
}
1145+
else
1146+
{
11441147
#if LUAAA_WITHOUT_CPP_STDLIB
1145-
luaL_argcheck(state, (klassName == nullptr), 1, "LuaCalss<CLASS> name conflict, use LuaClass<CLASS, TAG> to identify them");
1148+
luaL_argcheck(state, (klassName == nullptr), 1, "LuaCalss<CLASS> name conflict, use LuaClass<CLASS, TAG> to identify them");
11461149
#else
1147-
luaL_argcheck(state, (klassName == nullptr), 1, (std::string("C++ class `") + RTTI_CLASS_NAME(TCLASS) + "` bind to conflict lua name `" + name + "`, origin name: `" + klassName + "`. use use LuaClass<CLASS, TAG> to identify them.").c_str());
1150+
luaL_argcheck(state, (klassName == nullptr), 1, (std::string("C++ class `") + RTTI_CLASS_NAME(TCLASS) + "` bind to conflict lua name `" + name + "`, origin name: `" + klassName + "`. use use LuaClass<CLASS, TAG> to identify them.").c_str());
11481151
#endif
1152+
}
11491153

11501154
struct HelperClass {
11511155
static int f__clsgc(lua_State*) {

0 commit comments

Comments
 (0)