flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2495 from Seadragon91/clang-3.7

Browse Source 
Maked it compileable for clang-3.7
This commit is contained in:
worktycho 2015-09-25 16:45:11 +01:00
commit 335374376b
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bindings/LuaState.cpp
View File

@ -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;

8
src/Bindings/ManualBindings.cpp
View File

@ -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

2
src/Bindings/ManualBindings.h
View File

@ -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;
}

2
src/Chunk.cpp
View File

@ -490,7 +490,7 @@ void cChunk::CollectMobCensus(cMobCensus & toFill)
{
auto & Monster = reinterpret_cast<cMonster &>(*entity);
currentPosition = Monster.GetPosition();
for (const auto PlayerPos : PlayerPositions)
for (const auto & PlayerPos : PlayerPositions)
{
toFill.CollectMob(Monster, *this, (currentPosition - PlayerPos).SqrLength());
}

4
src/ChunkMap.cpp
View File

@ -1723,7 +1723,7 @@ void cChunkMap::AddEntity(cEntity * a_Entity)
)
{
LOGWARNING("Entity at %p (%s, ID %d) spawning in a non-existent chunk, the entity is lost.",
a_Entity, a_Entity->GetClass(), a_Entity->GetUniqueID()
static_cast<void *>(a_Entity), a_Entity->GetClass(), a_Entity->GetUniqueID()
);
return;
}
@ -1744,7 +1744,7 @@ void cChunkMap::AddEntityIfNotPresent(cEntity * a_Entity)
)
{
LOGWARNING("Entity at %p (%s, ID %d) spawning in a non-existent chunk, the entity is lost.",
a_Entity, a_Entity->GetClass(), a_Entity->GetUniqueID()
static_cast<void *>(a_Entity), a_Entity->GetClass(), a_Entity->GetUniqueID()
);
return;
}

10
src/ClientHandle.cpp
View File

@ -95,7 +95,7 @@ cClientHandle::cClientHandle(const AString & a_IPString, int a_ViewDistance) :
m_UniqueID = s_ClientCount;
m_PingStartTime = std::chrono::steady_clock::now();
LOGD("New ClientHandle created at %p", this);
LOGD("New ClientHandle created at %p", static_cast<void *>(this));
}
@ -106,7 +106,7 @@ cClientHandle::~cClientHandle()
{
ASSERT(m_State == csDestroyed); // Has Destroy() been called?
LOGD("Deleting client \"%s\" at %p", GetUsername().c_str(), this);
LOGD("Deleting client \"%s\" at %p", GetUsername().c_str(), static_cast<void *>(this));
{
cCSLock Lock(m_CSChunkLists);
@ -140,7 +140,7 @@ cClientHandle::~cClientHandle()
delete m_Protocol;
m_Protocol = nullptr;
LOGD("ClientHandle at %p deleted", this);
LOGD("ClientHandle at %p deleted", static_cast<void *>(this));
}
@ -164,7 +164,7 @@ void cClientHandle::Destroy(void)
}
// DEBUG:
LOGD("%s: client %p, \"%s\"", __FUNCTION__, this, m_Username.c_str());
LOGD("%s: client %p, \"%s\"", __FUNCTION__, static_cast<void *>(this), m_Username.c_str());
if ((m_Player != nullptr) && (m_Player->GetWorld() != nullptr))
{
@ -2935,7 +2935,7 @@ void cClientHandle::AddWantedChunk(int a_ChunkX, int a_ChunkZ)
return;
}
LOGD("Adding chunk [%d, %d] to wanted chunks for client %p", a_ChunkX, a_ChunkZ, this);
LOGD("Adding chunk [%d, %d] to wanted chunks for client %p", a_ChunkX, a_ChunkZ, static_cast<void *>(this));
cCSLock Lock(m_CSChunkLists);
if (m_ChunksToSend.find(cChunkCoords(a_ChunkX, a_ChunkZ)) == m_ChunksToSend.end())
{

4
src/Entities/Player.cpp
View File

@ -150,7 +150,7 @@ cPlayer::~cPlayer(void)
LOGINFO("Player %s has left the game", GetName().c_str());
}
LOGD("Deleting cPlayer \"%s\" at %p, ID %d", GetName().c_str(), this, GetUniqueID());
LOGD("Deleting cPlayer \"%s\" at %p, ID %d", GetName().c_str(), static_cast<void *>(this), GetUniqueID());
// Notify the server that the player is being destroyed
cRoot::Get()->GetServer()->PlayerDestroying(this);
@ -162,7 +162,7 @@ cPlayer::~cPlayer(void)
delete m_InventoryWindow;
m_InventoryWindow = nullptr;
LOGD("Player %p deleted", this);
LOGD("Player %p deleted", static_cast<void *>(this));
}

4
src/main.cpp
View File

@ -522,7 +522,7 @@ int main(int argc, char **argv)
while (!cRoot::m_TerminateEventRaised)
{
UniversalMain(std::move(ParseArguments(argc, argv)));
UniversalMain(ParseArguments(argc, argv));
}
#endif
}
@ -531,7 +531,7 @@ int main(int argc, char **argv)
while (!cRoot::m_TerminateEventRaised)
{
// Not running as a service, do normal startup
UniversalMain(std::move(ParseArguments(argc, argv)));
UniversalMain(ParseArguments(argc, argv));
}
}