Updated module and single-include header

kgorking · Oct 4, 2023 · 63412c0 · 63412c0
1 parent cf19054
commit 63412c0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/include/ecs/ecs.h b/include/ecs/ecs.h
@@ -1,10 +1,10 @@
 #if defined(ECS_USE_MODULES)
 import ecs;
 #else
-#if 1
+#if 0 // Use this for dev
 #include "runtime.h"
 #else
-// test single-include header
+// Use the single-include header, it's faster to compile
 #include "ecs_sh.h"
 #endif
 #endif
diff --git a/include/ecs/ecs.ixx b/include/ecs/ecs.ixx
@@ -1910,7 +1910,6 @@ private:
 	using chunk_const_iter = typename std::vector<chunk>::const_iterator;
 
 	std::vector<chunk> chunks;
-
 	std::vector<component_pool_base*> variants;
 
 	// Status flags
@@ -4175,7 +4174,7 @@ class context final {
 	scheduler sched;
 
 	mutable std::shared_mutex system_mutex;
-	mutable std::shared_mutex component_pool_mutex;
+	mutable std::recursive_mutex component_pool_mutex;
 
 	bool commit_in_progress = false;
 	bool run_in_progress = false;

diff --git a/include/ecs/ecs_sh.h b/include/ecs/ecs_sh.h
@@ -1906,7 +1906,6 @@ class component_pool final : public component_pool_base {
 	using chunk_const_iter = typename std::vector<chunk>::const_iterator;
 
 	std::vector<chunk> chunks;
-
 	std::vector<component_pool_base*> variants;
 
 	// Status flags
@@ -4171,7 +4170,7 @@ class context final {
 	scheduler sched;
 
 	mutable std::shared_mutex system_mutex;
-	mutable std::shared_mutex component_pool_mutex;
+	mutable std::recursive_mutex component_pool_mutex;
 
 	bool commit_in_progress = false;
 	bool run_in_progress = false;