Skip to content

Commit 81c06de

Browse files
committedSep 11, 2018
markAliasDeprecated: Fix MSVC build
1 parent 766fb7b commit 81c06de

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed
 

‎src/script/lua_api/l_base.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,12 @@ void ModApiBase::markAliasDeprecated(luaL_Reg *reg)
151151
while (reg->func) {
152152
if (last_func == reg->func) {
153153
// Duplicate found
154-
std::pair<std::string, luaL_Reg> entry(
155-
reg->name,
156-
{ .name = last_name, .func = reg->func }
157-
);
158-
m_deprecated_wrappers.emplace(entry);
154+
luaL_Reg original_reg;
155+
// Do not inline struct. Breaks MSVC or is error-prone
156+
original_reg.name = last_name;
157+
original_reg.func = reg->func;
158+
m_deprecated_wrappers.emplace(
159+
std::pair<std::string, luaL_Reg>(reg->name, original_reg));
159160
reg->func = l_deprecated_function;
160161
}
161162

0 commit comments

Comments
 (0)
Please sign in to comment.