Fix compilation

Warzone2100 · Oct 5, 2023 · 4427361 · 4427361
1 parent 19b0a8c
commit 4427361
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/lib/framework/crc.cpp b/lib/framework/crc.cpp
@@ -182,7 +182,7 @@ void Sha256::fromString(std::string const &s)
 	}
 }
 
-void to_json(nlohmann::json& j, const Sha256& k)
+inline void to_json(nlohmann::json& j, const Sha256& k)
 {
 	if (k.isZero())
 	{

diff --git a/lib/framework/geometry.h b/lib/framework/geometry.h
@@ -22,6 +22,7 @@
 
 #include "frame.h"
 #include "vector.h"
+#include <algorithm>
 #include <limits>
 
 /**

diff --git a/lib/framework/wzglobal.h b/lib/framework/wzglobal.h
@@ -553,6 +553,7 @@
 #  undef NOMINMAX
 #  define NOMINMAX 1		// disable the min / max macros
 #  include <windows.h>
+#  include <algorithm>
 
 #  if defined(WZ_CC_MSVC)
-Original file line number
+Diff line change
@@ Expand Up / @@ -182,7 +182,7 @@ void Sha256::fromString(std::string const &s) @@
     	}
     }
-    void to_json(nlohmann::json& j, const Sha256& k)
+    inline void to_json(nlohmann::json& j, const Sha256& k)
     {
     	if (k.isZero())
     	{
@@ Expand Down @@