BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

markAliasDeprecated: Fix MSVC build

Browse Source
This commit is contained in:
SmallJoker 2018-09-11 19:32:10 +02:00
parent 766fb7b46e
commit 81c06dea9b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/script/lua_api/l_base.cpp
View File

@ -151,11 +151,12 @@ void ModApiBase::markAliasDeprecated(luaL_Reg *reg)
while (reg->func) { while (reg->func) {
if (last_func == reg->func) { if (last_func == reg->func) {
// Duplicate found // Duplicate found
std::pair<std::string, luaL_Reg> entry( luaL_Reg original_reg;
reg->name, // Do not inline struct. Breaks MSVC or is error-prone
{ .name = last_name, .func = reg->func } original_reg.name = last_name;
); original_reg.func = reg->func;
m_deprecated_wrappers.emplace(entry); m_deprecated_wrappers.emplace(
std::pair<std::string, luaL_Reg>(reg->name, original_reg));
reg->func = l_deprecated_function; reg->func = l_deprecated_function;
} }