fix bugs on MacOS GCC 10.2

Ubpa · Feb 22, 2021 · b7c6fba · b7c6fba
1 parent fc56ee8
commit b7c6fba
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 35 deletions.
diff --git a/include/UECS/AccessTypeID.h b/include/UECS/AccessTypeID.h
@@ -31,4 +31,9 @@ namespace Ubpa::UECS {
 	using AccessTypeIDSet = std::set<AccessTypeID, std::less<>>;
 }
 
-#include "details/AccessTypeID.inl"
+template<>
+struct std::hash<Ubpa::UECS::AccessTypeID> {
+	constexpr std::size_t operator()(const Ubpa::UECS::AccessTypeID& id) const noexcept {
+		return id.GetValue();
+	}
+};
diff --git a/include/UECS/EntityQuery.h b/include/UECS/EntityQuery.h
@@ -18,4 +18,9 @@ namespace Ubpa::UECS {
 	};
 }
 
-#include "details/EntityQuery.inl"
+template<>
+struct std::hash<Ubpa::UECS::EntityQuery> {
+	std::size_t operator()(const Ubpa::UECS::EntityQuery& query) const noexcept {
+		return query.GetValue();
+	}
+};
diff --git a/include/UECS/SystemTraits.h b/include/UECS/SystemTraits.h
@@ -4,6 +4,7 @@
 #include <unordered_map>
 #include <array>
 #include <string>
+#include <vector>
 
 namespace Ubpa::UECS {
 	class World;

diff --git a/include/UECS/details/AccessTypeID.inl b/include/UECS/details/AccessTypeID.inl
diff --git a/include/UECS/details/EntityQuery.inl b/include/UECS/details/EntityQuery.inl
diff --git a/include/UECS/details/TypeIDSet.inl b/include/UECS/details/TypeIDSet.inl
@@ -88,11 +88,9 @@ namespace Ubpa::UECS {
 	}
 }
 
-namespace std {
-	template<>
-	struct hash<Ubpa::UECS::TypeIDSet> {
-		std::size_t operator()(const Ubpa::UECS::TypeIDSet& types) const noexcept {
-			return types.GetValue();
-		}
-	};
-}
+template<>
+struct std::hash<Ubpa::UECS::TypeIDSet> {
+	std::size_t operator()(const Ubpa::UECS::TypeIDSet& types) const noexcept {
+		return types.GetValue();
+	}
+};