stock/BasicStock: use std::predicate

CM4all · Oct 16, 2023 · 9ae5021 · 9ae5021
1 parent 2b737aa
commit 9ae5021
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/stock/BasicStock.hxx b/src/stock/BasicStock.hxx
@@ -13,6 +13,7 @@
 #include "util/DeleteDisposer.hxx"
 #include "util/IntrusiveList.hxx"
 
+#include <concepts> // for std::predicate
 #include <cstddef>
 #include <cstdint>
 #include <string>
@@ -128,13 +129,12 @@ public:
 	 * Destroy all matching idle items and don't reuse any of the
 	 * matching busy items.
 	 */
-	template<typename P>
-	void FadeIf(P &&predicate) noexcept {
+	void FadeIf(std::predicate<const StockItem &> auto predicate) noexcept {
 		for (auto &i : busy)
 			if (predicate(i))
 				i.Fade();
 
-		ClearIdleIf(std::forward<P>(predicate));
+		ClearIdleIf(predicate);
 
 		ScheduleCheckEmpty();
 		// TODO: restart the "num_create" list?
@@ -174,9 +174,8 @@ private:
 
 	void ClearIdle() noexcept;
 
-	template<typename P>
-	void ClearIdleIf(P &&predicate) noexcept {
-		idle.remove_and_dispose_if(std::forward<P>(predicate),
+	void ClearIdleIf(std::predicate<const StockItem &> auto predicate) noexcept {
+		idle.remove_and_dispose_if(predicate,
 					   DeleteDisposer());
 
 		if (idle.size() <= max_idle)

diff --git a/src/stock/MapStock.hxx b/src/stock/MapStock.hxx
@@ -11,6 +11,7 @@
 #include "util/StringAPI.hxx"
 
 #include <cassert>
+#include <concepts> // for std::predicate
 #include <cstddef>
 
 /**
@@ -106,8 +107,7 @@ public:
 	/**
 	 * @see Stock::FadeIf()
 	 */
-	template<typename P>
-	void FadeIf(P &&predicate) noexcept {
+	void FadeIf(std::predicate<const StockItem &> auto predicate) noexcept {
 		map.for_each([&predicate](auto &i){
 			i.stock.FadeIf(predicate);
 		});

diff --git a/src/stock/MultiStock.hxx b/src/stock/MultiStock.hxx
@@ -14,6 +14,7 @@
 #include "util/IntrusiveHashSet.hxx"
 #include "util/IntrusiveList.hxx"
 
+#include <concepts> // for std::predicate
 #include <string>
 
 class CancellablePointer;
@@ -106,8 +107,7 @@ class MultiStock {
 
 		void Fade() noexcept;
 
-		template<typename P>
-		void FadeIf(P &&predicate) noexcept {
+		void FadeIf(std::predicate<const StockItem &> auto predicate) noexcept {
 			if (predicate(shared_item))
 				Fade();
 		}
@@ -246,8 +246,7 @@ class MultiStock {
 				i.Fade();
 		}
 
-		template<typename P>
-		void FadeIf(P &&predicate) noexcept {
+		void FadeIf(std::predicate<const StockItem &> auto predicate) noexcept {
 			for (auto &i : items)
 				i.FadeIf(predicate);
 		}
@@ -388,8 +387,7 @@ public:
 	/**
 	 * @see Stock::FadeIf()
 	 */
-	template<typename P>
-	void FadeIf(P &&predicate) noexcept {
+	void FadeIf(std::predicate<const StockItem &> auto predicate) noexcept {
 		map.for_each([&predicate](auto &i){
 			i.FadeIf(predicate);
 		});