Fixed: Build issues with certain preprocessor macro combinations

richardbiely · Apr 18, 2024 · 830c3d6 · 830c3d6
1 parent 5c6e037
commit 830c3d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/include/gaia/ecs/query.h b/include/gaia/ecs/query.h
@@ -375,13 +375,7 @@ namespace gaia {
 
 				//--------------------------------------------------------------------------------
 
-				//! Unpacks the parameter list \param types into query \param query and performs All for each of them
-				template <typename... T>
-				void unpack_args_into_query_all(QueryImpl& query, [[maybe_unused]] core::func_type_list<T...> types) const {
-					static_assert(sizeof...(T) > 0, "Inputs-less functors can not be unpacked to query");
-					query.template all<T...>();
-				}
-
+#if GAIA_ASSERT_ENABLED
 				//! Unpacks the parameter list \param types into query \param query and performs has_all for each of them
 				template <typename... T>
 				GAIA_NODISCARD bool unpack_args_into_query_has_all(
@@ -391,6 +385,7 @@ namespace gaia {
 					else
 						return true;
 				}
+#endif
 
 				//--------------------------------------------------------------------------------
 
@@ -935,7 +930,7 @@ namespace gaia {
 				void each(QueryInfo& queryInfo, Func func) {
 					using InputArgs = decltype(core::func_args(&Func::operator()));
 
-#if GAIA_DEBUG
+#if GAIA_ASSERT_ENABLED
 					// Make sure we only use components specified in the query.
 					// Constness is respected. Therefore, if a type is const when registered to query,
 					// it has to be const (or immutable) also in each().

diff --git a/include/gaia/ecs/world.h b/include/gaia/ecs/world.h
@@ -394,7 +394,7 @@ namespace gaia {
 				}
 
 				void handle_add(Entity entity) {
-#if GAIA_DEBUG
+#if GAIA_ASSERT_ENABLED
 					World::verify_add(m_world, *m_pArchetype, m_entity, entity);
 #endif
 
@@ -424,7 +424,7 @@ namespace gaia {
 				}
 
 				void handle_del(Entity entity) {
-#if GAIA_DEBUG
+#if GAIA_ASSERT_ENABLED
 					World::verify_del(m_world, *m_pArchetype, m_entity, entity);
 #endif
 

diff --git a/single_include/gaia.h b/single_include/gaia.h
@@ -21425,13 +21425,7 @@ namespace gaia {
 
 				//--------------------------------------------------------------------------------
 
-				//! Unpacks the parameter list \param types into query \param query and performs All for each of them
-				template <typename... T>
-				void unpack_args_into_query_all(QueryImpl& query, [[maybe_unused]] core::func_type_list<T...> types) const {
-					static_assert(sizeof...(T) > 0, "Inputs-less functors can not be unpacked to query");
-					query.template all<T...>();
-				}
-
+#if GAIA_ASSERT_ENABLED
 				//! Unpacks the parameter list \param types into query \param query and performs has_all for each of them
 				template <typename... T>
 				GAIA_NODISCARD bool unpack_args_into_query_has_all(
@@ -21441,6 +21435,7 @@ namespace gaia {
 					else
 						return true;
 				}
+#endif
 
 				//--------------------------------------------------------------------------------
 
@@ -21985,7 +21980,7 @@ namespace gaia {
 				void each(QueryInfo& queryInfo, Func func) {
 					using InputArgs = decltype(core::func_args(&Func::operator()));
 
-#if GAIA_DEBUG
+#if GAIA_ASSERT_ENABLED
 					// Make sure we only use components specified in the query.
 					// Constness is respected. Therefore, if a type is const when registered to query,
 					// it has to be const (or immutable) also in each().
@@ -22529,7 +22524,7 @@ namespace gaia {
 				}
 
 				void handle_add(Entity entity) {
-#if GAIA_DEBUG
+#if GAIA_ASSERT_ENABLED
 					World::verify_add(m_world, *m_pArchetype, m_entity, entity);
 #endif
 
@@ -22559,7 +22554,7 @@ namespace gaia {
 				}
 
 				void handle_del(Entity entity) {
-#if GAIA_DEBUG
+#if GAIA_ASSERT_ENABLED
 					World::verify_del(m_world, *m_pArchetype, m_entity, entity);
 #endif