Fix Debug/ReleaseWithDebugInfo build errors and fix segfault at game …

…exit in linux (#645)
OpenXRay · Jul 13, 2020 · 32cb37a · 32cb37a
1 parent 3d62bd5
commit 32cb37a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/xrAICore/Navigation/graph_engine.h b/src/xrAICore/Navigation/graph_engine.h
@@ -51,7 +51,7 @@ class CGraphEngine
 
 #ifndef AI_COMPILER
     // solver algorithm
-    static const size_t SolverMaxVertexCount = 16 * 1024;
+    static constexpr size_t SolverMaxVertexCount = 16 * 1024;
     using CSolverPriorityQueue = CDataStorageBinaryHeap;
     // XXX: originally CSolverAlgorithm is constructed with 16*1024 limit
     // while the following definitions use 8*1024 limit -- check if that's a mistake
@@ -61,7 +61,7 @@ class CGraphEngine
     using CSolverAlgorithm = CAStar<_solver_dist_type, CSolverPriorityQueue, CSolverVertexManager,
         CSolverVertexAllocator, true, SolverAlgorithmStorage>;
     // string algorithm
-    static const size_t StringMaxVertexCount = 1024;
+    static constexpr size_t StringMaxVertexCount = 1024;
     using CStringPriorityQueue = CDataStorageBinaryHeap;
     using CStringVertexManager = CVertexManagerHashFixed<u32, shared_str, 128, StringMaxVertexCount>;
     using CStringVertexAllocator = CVertexAllocatorFixed<StringMaxVertexCount>;

diff --git a/src/xrGame/GamePersistent.cpp b/src/xrGame/GamePersistent.cpp
@@ -274,7 +274,9 @@ void CGamePersistent::OnAppEnd()
 
     GMLib.Unload();
 
+#ifdef XR_PLATFORM_WINDOWS
     xr_delete(ansel);
+#endif
 }
 
 void CGamePersistent::Start(LPCSTR op) { inherited::Start(op); }