summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Brad Hughes <bradhugh@outlook.com>2016-04-20 10:20:31 -0400
committer Brad Hughes <bradhugh@outlook.com>2016-04-20 10:20:31 -0400
commit0f2cdac73660593fd453c313ad3ffb2b25b7dcd5 (patch)
treeffaee82e2e7de5aad25299c886aa28b5c9be808a
parentf0949c702f494d28bc72dd0a7deba5ed7d2b3b37 (diff)
Fix VS compile. Apparently VS doesn't like reintepret_cast<int>(0) - weird.
-rw-r--r--src/emu/luaengine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index 012a41f723d..f452684f997 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -1772,7 +1772,7 @@ Tout lua_engine::run(const char *env, int ref, Tin in)
luabridge::Stack<Tin>::push(m_lua_state, in);
run_internal(env, ref);
if(lua_isnil(m_lua_state, 1))
- ret = reinterpret_cast<Tout>(0);
+ ret = Tout(0);
else
ret = luabridge::Stack<Tout>::get(m_lua_state, 1);
lua_pop(m_lua_state, 1);
@@ -1787,7 +1787,7 @@ Tout lua_engine::run(const char *env, int ref)
lua_pushnil(m_lua_state);
run_internal(env, ref);
if(lua_isnil(m_lua_state, 1))
- ret = reinterpret_cast<Tout>(0);
+ ret = Tout(0);
else
ret = luabridge::Stack<Tout>::get(m_lua_state, 1);
lua_pop(m_lua_state, 1);