pre-v1.0b-update

fix8mt · Apr 1, 2024 · 29174bd · 29174bd
1 parent eaa01ca
commit 29174bd
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/include/fix8/conjure_enum.hpp b/include/fix8/conjure_enum.hpp
@@ -332,9 +332,7 @@ class conjure_enum final
 	requires std::invocable<Fn&&, C, T, Args...>
 	[[maybe_unused]] static constexpr auto for_each(Fn&& func, C *obj, Args&&... args) noexcept // specialisation for member function with object
 	{
-		for (const auto ev : conjure_enum<T>::enum_values)
-			std::invoke(std::forward<Fn>(func), obj, ev, std::forward<Args>(args)...);
-		return std::bind(std::forward<Fn>(func), obj, std::placeholders::_1, std::forward<Args>(args)...);
+		return for_each(std::bind(std::forward<Fn>(func), obj, std::placeholders::_1, std::forward<Args>(args)...));
 	}
 };
 
@@ -486,10 +484,7 @@ class enum_bitset
 	requires std::invocable<Fn&&, C, T, Args...>
 	[[maybe_unused]] constexpr auto for_each(Fn&& func, C *obj, Args&&... args) noexcept
 	{
-		for (const auto ev : conjure_enum<T>::enum_values)
-			if (test(ev))
-				std::invoke(std::forward<Fn>(func), obj, ev, std::forward<Args>(args)...);
-		return std::bind(std::forward<Fn>(func), obj, std::placeholders::_1, std::forward<Args>(args)...);
+		return for_each(std::bind(std::forward<Fn>(func), obj, std::placeholders::_1, std::forward<Args>(args)...));
 	}
 
 	/// create a bitset from enum separated enum string