fix -Wwarn-zero-as-nullptr

Unvanquished · Jun 18, 2024 · ee3d3a4 · ee3d3a4
1 parent 3985f5b
commit ee3d3a4
Show file tree

Hide file tree

Showing 55 changed files with 551 additions and 529 deletions.
diff --git a/DebugUtils/Source/DebugDraw.cpp b/DebugUtils/Source/DebugDraw.cpp
@@ -20,7 +20,7 @@
 #include "DebugDraw.h"
 #include "DetourMath.h"
 #include "DetourNavMesh.h"
-
+#include "DetourModernCpp.h"
 
 duDebugDraw::~duDebugDraw()
 {
@@ -525,8 +525,8 @@ void duAppendCross(struct duDebugDraw* dd, const float x, const float y, const f
 }
 
 duDisplayList::duDisplayList(int cap) :
-	m_pos(0),
-	m_color(0),
+	m_pos(DT_NULL),
+	m_color(DT_NULL),
 	m_size(0),
 	m_cap(0),
 	m_prim(DU_DRAW_LINES),

diff --git a/DebugUtils/Source/DetourDebugDraw.cpp b/DebugUtils/Source/DetourDebugDraw.cpp
@@ -242,15 +242,15 @@ void duDebugDrawNavMesh(duDebugDraw* dd, const dtNavMesh& mesh, unsigned char fl
 	{
 		const dtMeshTile* tile = mesh.getTile(i);
 		if (!tile->header) continue;
-		drawMeshTile(dd, mesh, 0, tile, flags);
+		drawMeshTile(dd, mesh, DT_NULL, tile, flags);
 	}
 }
 
 void duDebugDrawNavMeshWithClosedList(struct duDebugDraw* dd, const dtNavMesh& mesh, const dtNavMeshQuery& query, unsigned char flags)
 {
 	if (!dd) return;
 
-	const dtNavMeshQuery* q = (flags & DU_DRAWNAVMESH_CLOSEDLIST) ? &query : 0;
+	const dtNavMeshQuery* q = (flags & DU_DRAWNAVMESH_CLOSEDLIST) ? &query : DT_NULL;
 
 	for (int i = 0; i < mesh.getMaxTiles(); ++i)
 	{
@@ -440,8 +440,8 @@ void duDebugDrawNavMeshPoly(duDebugDraw* dd, const dtNavMesh& mesh, dtPolyRef re
 {
 	if (!dd) return;
 
-	const dtMeshTile* tile = 0;
-	const dtPoly* poly = 0;
+	const dtMeshTile* tile = DT_NULL;
+	const dtPoly* poly = DT_NULL;
 	if (dtStatusFailed(mesh.getTileAndPolyByRef(ref, &tile, &poly)))
 		return;
 

diff --git a/DebugUtils/Source/RecastDebugDraw.cpp b/DebugUtils/Source/RecastDebugDraw.cpp
@@ -20,6 +20,7 @@
 #include "DebugDraw.h"
 #include "RecastDebugDraw.h"
 #include "Recast.h"
+#include "DetourModernCpp.h"
 
 void duDebugDrawTriMesh(duDebugDraw* dd, const float* verts, int /*nverts*/,
 						const int* tris, const float* normals, int ntris,
@@ -675,7 +676,7 @@ static const rcContour* findContourFromSet(const rcContourSet& cset, unsigned sh
 		if (cset.conts[i].reg == reg)
 			return &cset.conts[i];
 	}
-	return 0;
+	return DT_NULL;
 }
 
 void duDebugDrawRegionConnections(duDebugDraw* dd, const rcContourSet& cset, const float alpha)

diff --git a/Detour/Include/DetourAssert.h b/Detour/Include/DetourAssert.h
@@ -47,7 +47,7 @@ dtAssertFailFunc* dtAssertFailGetCustom();
 #	define dtAssert(expression) \
 		{ \
 			dtAssertFailFunc* failFunc = dtAssertFailGetCustom(); \
-			if(failFunc == NULL) { assert(expression); } \
+			if(failFunc == DT_NULL) { assert(expression); } \
 			else if(!(expression)) { (*failFunc)(#expression, __FILE__, __LINE__); } \
 		}
 

diff --git a/Detour/Include/DetourModernCpp.h b/Detour/Include/DetourModernCpp.h
@@ -6,13 +6,11 @@
 #include "DetourAssert.h"
 
 #if __cplusplus and __cplusplus >= 201103L
-#ifdef NULL
-#undef NULL
-#endif
-#define NULL nullptr
+#define DT_NULL nullptr
 #define DT_OVERRIDE override
 #else
 #include <stddef.h>
+#define DT_NULL NULL
 #define DT_OVERRIDE
 #endif
 

diff --git a/Detour/Include/DetourNavMesh.h b/Detour/Include/DetourNavMesh.h
@@ -19,6 +19,13 @@
 #ifndef DETOURNAVMESH_H
 #define DETOURNAVMESH_H
 
+#ifdef DT_POLYREF64
+// TODO: figure out a multiplatform version of uint64_t
+// - maybe: https://code.google.com/p/msinttypes/
+// - or: http://www.azillionmonkeys.com/qed/pstdint.h
+#include <stdint.h>
+#endif
+
 #include "DetourAlloc.h"
 #include "DetourStatus.h"
 
@@ -27,13 +34,6 @@
 // Note: tiles build using 32bit refs are not compatible with 64bit refs!
 //#define DT_POLYREF64 1
 
-#ifdef DT_POLYREF64
-// TODO: figure out a multiplatform version of uint64_t
-// - maybe: https://code.google.com/p/msinttypes/
-// - or: http://www.azillionmonkeys.com/qed/pstdint.h
-#include <stdint.h>
-#endif
-
 // Note: If you want to use 64-bit refs, change the types of both dtPolyRef & dtTileRef.
 // It is also recommended that you change dtHashRef() to a proper 64-bit hash.
 

diff --git a/Detour/Include/DetourNode.h b/Detour/Include/DetourNode.h
@@ -21,8 +21,8 @@
 
 #include <stdint.h>
 
-#include "DetourModernCpp.h"
 #include "DetourNavMesh.h"
+#include "DetourModernCpp.h"
 
 enum dtNodeFlags
 {
@@ -70,13 +70,13 @@ class dtNodePool
 
 	inline dtNode* getNodeAtIdx(unsigned int idx)
 	{
-		if (!idx) return 0;
+		if (!idx) return DT_NULL;
 		return &m_nodes[idx - 1];
 	}
 
 	inline const dtNode* getNodeAtIdx(unsigned int idx) const
 	{
-		if (!idx) return 0;
+		if (!idx) return DT_NULL;
 		return &m_nodes[idx - 1];
 	}
 

diff --git a/Detour/Source/DetourAssert.cpp b/Detour/Source/DetourAssert.cpp
@@ -16,12 +16,12 @@
 // 3. This notice may not be removed or altered from any source distribution.
 //
 
-#include "DetourModernCpp.h"
 #include "DetourAssert.h"
+#include "DetourModernCpp.h"
 
 #ifndef RC_DISABLE_ASSERTS
 
-static dtAssertFailFunc* sAssertFailFunc = 0;
+static dtAssertFailFunc* sAssertFailFunc = DT_NULL;
 
 void dtAssertFailSetCustom(dtAssertFailFunc *assertFailFunc)
 {