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/ChunkPos.h b/Minecraft.World/ChunkPos.h
index f1d483c7..2a3fda02 100644
--- a/Minecraft.World/ChunkPos.h
+++ b/Minecraft.World/ChunkPos.h
@@ -28,13 +28,14 @@ public:
 	ChunkPos & operator= (const ChunkPos & other) { x = other.x; z = other.z; return *this; }
 };
 
-typedef struct
+struct ChunkPosKeyHash
 {
-	__int64 operator() (const ChunkPos &k) const { return ChunkPos::hash_fnct(k); }
-
-} ChunkPosKeyHash;
+	inline __int64 operator()(const ChunkPos &k) const 
+	{ return ChunkPos::hash_fnct(k); }
+};
 
-typedef struct
+struct ChunkPosKeyEq
 {
-	bool operator() (const ChunkPos &x, const ChunkPos &y) const { return ChunkPos::eq_test(x, y); }
-} ChunkPosKeyEq;
\ No newline at end of file
+	inline bool operator()(const ChunkPos &x, const ChunkPos &y) const 
+	{ return ChunkPos::eq_test(x, y); }
+};
\ No newline at end of file