From 81c06dea9b6b863e0c8f6a9c052a5cea3a130eab Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Tue, 11 Sep 2018 19:32:10 +0200
Subject: markAliasDeprecated: Fix MSVC build

---
 src/script/lua_api/l_base.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/script/lua_api/l_base.cpp b/src/script/lua_api/l_base.cpp
index 784b197e1..8486fc7bc 100644
--- a/src/script/lua_api/l_base.cpp
+++ b/src/script/lua_api/l_base.cpp
@@ -151,11 +151,12 @@ void ModApiBase::markAliasDeprecated(luaL_Reg *reg)
 	while (reg->func) {
 		if (last_func == reg->func) {
 			// Duplicate found
-			std::pair<std::string, luaL_Reg> entry(
-				reg->name,
-				{ .name = last_name, .func = reg->func }
-			);
-			m_deprecated_wrappers.emplace(entry);
+			luaL_Reg original_reg;
+			// Do not inline struct. Breaks MSVC or is error-prone
+			original_reg.name = last_name;
+			original_reg.func = reg->func;
+			m_deprecated_wrappers.emplace(
+				std::pair<std::string, luaL_Reg>(reg->name, original_reg));
 			reg->func = l_deprecated_function;
 		}
 
-- 
cgit v1.2.3