fix bugs on Clang and GCC

Ubpa · Jan 23, 2021 · b3c3217 · b3c3217
1 parent f544478
commit b3c3217
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 7 deletions.
diff --git a/include/UECS/CmptPtr.h b/include/UECS/CmptPtr.h
@@ -58,7 +58,7 @@ namespace Ubpa::UECS {
 			else if constexpr (mode == AccessMode::LATEST)
 				return Latest<Cmpt>{p};
 			else
-				static_assert(false);
+				static_assert(always_false<Cmpt>);
 		}
 	private:
 		friend class EntityMngr;

diff --git a/include/UECS/EntityMngr.h b/include/UECS/EntityMngr.h
@@ -88,7 +88,7 @@ namespace Ubpa::UECS {
 		// nullptr if not singleton
 		CmptPtr GetSingleton(TypeID) const;
 		template<typename Cmpt>
-		Cmpt* GetSingleton() const { return GetSingleton(TypeID_of<Cmpt>).As<Cmpt>(); }
+		Cmpt* GetSingleton() const { return GetSingleton(TypeID_of<Cmpt>).template As<Cmpt>(); }
 
 		// filter's all contains cmpt
 		template<typename Cmpt>

diff --git a/include/UECS/RTDCmptTraits.h b/include/UECS/RTDCmptTraits.h
@@ -4,6 +4,7 @@
 
 #include <unordered_map>
 #include <functional>
+#include <string>
 
 namespace Ubpa::UECS {
 	// run-time dynamic component traits

diff --git a/include/UECS/SystemTraits.h b/include/UECS/SystemTraits.h
@@ -3,6 +3,7 @@
 #include <functional>
 #include <unordered_map>
 #include <array>
+#include <string>
 
 namespace Ubpa::UECS {
 	class World;

diff --git a/include/UECS/details/Archetype.h b/include/UECS/details/Archetype.h
@@ -8,7 +8,8 @@
 #include "TypeIDSet.h"
 #include "Chunk.h"
 
-#include <UTemplate/Typelist.h>
+#include <UTemplate/TypeList.h>
+#include <memory_resource>
 
 namespace Ubpa::UECS {
 	class EntityMngr;

diff --git a/include/UECS/details/EntityMngr.inl b/include/UECS/details/EntityMngr.inl
@@ -2,7 +2,7 @@
 
 #include "../CmptTag.h"
 
-#include <UTemplate/Typelist.h>
+#include <UTemplate/TypeList.h>
 #include <UTemplate/Func.h>
 
 namespace Ubpa::UECS {
@@ -151,7 +151,7 @@ namespace Ubpa::UECS {
 
 		std::vector<Cmpt*> rst;
 
-		const auto& archetypes = QueryArchetypes(filter);
+		const auto& archetypes = QueryArchetypes(EntityQuery{filter});
 		std::size_t num = 0;
 		for (const auto& archetype : archetypes)
 			num += archetype->EntityNum();

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1,3 +1,20 @@
+set(c_options "")
+if(MSVC)
+  #..
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  list(APPEND c_options "-pthread")
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  list(APPEND c_options "-pthread")
+endif()
+set(l_options "")
+if(MSVC)
+  #..
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  list(APPEND l_options "-lpthread")
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  list(APPEND l_options "-lpthread")
+endif()
+
 Ubpa_AddTarget(
   MODE STATIC
   RET_TARGET_NAME tname
@@ -8,6 +25,10 @@ Ubpa_AddTarget(
     Ubpa::UGraphviz_core
   INC
     "${PROJECT_SOURCE_DIR}/include"
+  C_OPTION
+    ${c_options}
+  L_OPTION
+    ${l_options}
 )
 
 target_precompile_headers(${tname} PRIVATE "${PROJECT_SOURCE_DIR}/include/UECS/World.h")
diff --git a/src/core/SysFuncGraph.cpp b/src/core/SysFuncGraph.cpp
@@ -25,8 +25,11 @@ bool SysFuncGraph::HaveEdge(SystemFunc* x, SystemFunc* y) const {
 	assert(HaveVertex(x) && HaveVertex(y));
 	assert(x != y);
 	const auto& adjVs = adjList.at(x);
-	auto target = find(adjVs.begin(), adjVs.end(), y);
-	return target != adjVs.end();
+	for(auto* adjV : adjVs){
+		if(adjV == y)
+			return true;
+	}
+	return false;
 }
 
 bool SysFuncGraph::HavePath(SystemFunc* x, SystemFunc* y) const {