diff options
author | worktycho <work.tycho@gmail.com> | 2015-09-25 17:45:11 +0200 |
---|---|---|
committer | worktycho <work.tycho@gmail.com> | 2015-09-25 17:45:11 +0200 |
commit | 335374376bff16459eb3e3585a93f931e1b3c306 (patch) | |
tree | 3b6665c38ce5881b0d8345ee7bc495a5b97a0457 /src/Bindings | |
parent | Merge pull request #2491 from cuberite/FixLilypadPopout (diff) | |
parent | Maked it compileable for clang-3.7 (diff) | |
download | cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar.gz cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar.bz2 cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar.lz cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar.xz cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar.zst cuberite-335374376bff16459eb3e3585a93f931e1b3c306.zip |
Diffstat (limited to 'src/Bindings')
-rw-r--r-- | src/Bindings/LuaState.cpp | 6 | ||||
-rw-r--r-- | src/Bindings/ManualBindings.cpp | 8 | ||||
-rw-r--r-- | src/Bindings/ManualBindings.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp index 7b519a798..4c0dfa676 100644 --- a/src/Bindings/LuaState.cpp +++ b/src/Bindings/LuaState.cpp @@ -128,7 +128,7 @@ void cLuaState::Close(void) { LOGWARNING( "%s: Detected mis-use, calling Close() on an attached state (0x%p). Detaching instead.", - __FUNCTION__, m_LuaState + __FUNCTION__, static_cast<void *>(m_LuaState) ); Detach(); return; @@ -146,7 +146,7 @@ void cLuaState::Attach(lua_State * a_State) { if (m_LuaState != nullptr) { - LOGINFO("%s: Already contains a LuaState (0x%p), will be closed / detached.", __FUNCTION__, m_LuaState); + LOGINFO("%s: Already contains a LuaState (0x%p), will be closed / detached.", __FUNCTION__, static_cast<void *>(m_LuaState)); if (m_IsOwned) { Close(); @@ -174,7 +174,7 @@ void cLuaState::Detach(void) { LOGWARNING( "%s: Detected a mis-use, calling Detach() when the state is owned. Closing the owned state (0x%p).", - __FUNCTION__, m_LuaState + __FUNCTION__, static_cast<void *>(m_LuaState) ); Close(); return; diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp index 876d4e280..3fc5b477c 100644 --- a/src/Bindings/ManualBindings.cpp +++ b/src/Bindings/ManualBindings.cpp @@ -1151,7 +1151,7 @@ static int tolua_cPlayer_GetPermissions(lua_State * tolua_S) cPlayer * self = reinterpret_cast<cPlayer *>(tolua_tousertype(tolua_S, 1, nullptr)); if (self == nullptr) { - LOGWARNING("%s: invalid self (%p)", __FUNCTION__, self); + LOGWARNING("%s: invalid self (%p)", __FUNCTION__, static_cast<void *>(self)); return 0; } @@ -1182,7 +1182,7 @@ static int tolua_cPlayer_GetRestrictions(lua_State * tolua_S) cPlayer * self = reinterpret_cast<cPlayer *>(tolua_tousertype(tolua_S, 1, nullptr)); if (self == nullptr) { - LOGWARNING("%s: invalid self (%p)", __FUNCTION__, self); + LOGWARNING("%s: invalid self (%p)", __FUNCTION__, static_cast<void *>(self)); return 0; } @@ -1211,7 +1211,7 @@ static int tolua_cPlayer_OpenWindow(lua_State * tolua_S) cWindow * wnd = reinterpret_cast<cWindow *>(tolua_tousertype(tolua_S, 2, nullptr)); if ((self == nullptr) || (wnd == nullptr)) { - LOGWARNING("%s: invalid self (%p) or wnd (%p)", __FUNCTION__, self, wnd); + LOGWARNING("%s: invalid self (%p) or wnd (%p)", __FUNCTION__, static_cast<void *>(self), static_cast<void *>(wnd)); return 0; } @@ -1292,7 +1292,7 @@ static int tolua_SetObjectCallback(lua_State * tolua_S) OBJTYPE * self = reinterpret_cast<OBJTYPE *>(tolua_tousertype(tolua_S, 1, nullptr)); if (self == nullptr) { - LOGWARNING("%s: invalid self (%p)", __FUNCTION__, self); + LOGWARNING("%s: invalid self (%p)", __FUNCTION__, static_cast<void *>(self)); return 0; } int FnRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX); // Store function reference for later retrieval diff --git a/src/Bindings/ManualBindings.h b/src/Bindings/ManualBindings.h index 38f7ac5f1..e2556bafd 100644 --- a/src/Bindings/ManualBindings.h +++ b/src/Bindings/ManualBindings.h @@ -400,7 +400,7 @@ public: L.GetStackValues(1, Self, Box, FnRef); if ((Self == nullptr) || (Box == nullptr)) { - LOGWARNING("Invalid world (%p) or boundingbox (%p)", Self, Box); + LOGWARNING("Invalid world (%p) or boundingbox (%p)", static_cast<void *>(Self), static_cast<void *>(Box)); L.LogStackTrace(); return 0; } |