Merge pull request #16 from rlcevg/m4

Fix for C++17 and gcc10
rlcevg · Jul 24, 2020 · 91fd31e · 91fd31e
2 parents e8a2b70 + 3ad88a7
commit 91fd31e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/circuit/terrain/BlockingMap.h b/src/circuit/terrain/BlockingMap.h
@@ -12,6 +12,7 @@
 
 #include <vector>
 #include <map>
+#include <string>
 
 #define GRID_RATIO_LOW		8
 #define STRUCT_BIT(bits)	static_cast<SBlockingMap::SM>(SBlockingMap::StructMask::bits)

diff --git a/src/circuit/util/Defines.h b/src/circuit/util/Defines.h
@@ -50,7 +50,7 @@ template<typename T> static inline constexpr T SQUARE(T x) { return x * x; }
 typedef std::vector<springai::AIFloat3> F3Vec;
 
 struct cmp_str {
-	bool operator()(char const* a, char const* b) {
+	bool operator()(char const* a, char const* b) const {
 		return strcmp(a, b) < 0;
 	}
 };