From 532731e6f4c0d843d355ff8f2d9f63e4e7854e6a Mon Sep 17 00:00:00 2001 From: bibo38 Date: Thu, 21 Dec 2017 12:36:58 +0100 Subject: Fixed Clang 5.0 compile errors (#4085) * Fixed Clang 5.0 compile errors * Fixed wrong comment * Only disable warnings in Clang 5 or higher * Added a CMake condition for the Clang 5 no-zero-as-null-pointer-constant warning * Now using the use_nullptr branch of the Cuberite specific SQLiteCpp fork --- src/Entities/Entity.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Entities/Entity.cpp') diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 11405d2fd..4245f607d 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -243,6 +243,7 @@ void cEntity::Destroy(bool a_ShouldBroadcast) this->GetUniqueID(), this->GetClass(), ParentChunkCoords.m_ChunkX, ParentChunkCoords.m_ChunkZ ); + UNUSED(ParentChunkCoords); // Non Debug mode only // Make sure that RemoveEntity returned a valid smart pointer // Also, not storing the returned pointer means automatic destruction @@ -1599,6 +1600,7 @@ bool cEntity::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d a_OldWorld.GetName().c_str(), a_World->GetName().c_str(), OldChunkCoords.m_ChunkX, OldChunkCoords.m_ChunkZ ); + UNUSED(OldChunkCoords); // Non Debug mode only a_World->AddEntity(a_OldWorld.RemoveEntity(*this)); cRoot::Get()->GetPluginManager()->CallHookEntityChangedWorld(*this, a_OldWorld); }); -- cgit v1.2.3