Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 8 insertions, 7 deletions

diff --git a/Minecraft.World/TilePos.h b/Minecraft.World/TilePos.h
index d4a3e84e..04804066 100644
--- a/Minecraft.World/TilePos.h
+++ b/Minecraft.World/TilePos.h
@@ -14,14 +14,15 @@ public:
 	static bool eq_test(const TilePos &x, const TilePos &y);
 };
 
-typedef struct
+struct TilePosKeyHash
 {
-	int operator() (const TilePos &k) const { return TilePos::hash_fnct (k); }
-
-} TilePosKeyHash;
+	inline int operator()(const TilePos &k) const 
+	{ return TilePos::hash_fnct (k); }
+};
 
-typedef struct
+struct TilePosKeyEq
 {
-	bool operator() (const TilePos &x, const TilePos &y) const { return TilePos::eq_test (x, y); }
-} TilePosKeyEq;
+	inline bool operator()(const TilePos &x, const TilePos &y) const 
+	{ return TilePos::eq_test (x, y); }
+};