Functor concepts

morzhovets · Aug 20, 2023 · 3ae2cc1 · 3ae2cc1
1 parent b0412c6
commit 3ae2cc1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/include/momo/HashMap.h b/include/momo/HashMap.h
@@ -740,12 +740,12 @@ class HashMap
 		return mHashSet.Remove(key);
 	}
 
-	template<typename PairPredicate>
-	requires std::predicate<const PairPredicate&, const Key&, const Value&>
-	size_t Remove(const PairPredicate& pairPred)
+	template<internal::conceptPredicate<const Key&, const Value&> PairPredicate>
+	size_t Remove(PairPredicate pairPred)
 	{
-		auto itemPred = [&pairPred] (const KeyValuePair& item)
-			{ return pairPred(*item.GetKeyPtr(), std::as_const(*item.GetValuePtr())); };
+		internal::FastCopyableFunctor<PairPredicate> fastPairPred(pairPred);
+		auto itemPred = [fastPairPred] (const KeyValuePair& item)
+			{ return fastPairPred(*item.GetKeyPtr(), std::as_const(*item.GetValuePtr())); };
 		return mHashSet.Remove(itemPred);
 	}
 

diff --git a/include/momo/HashMultiMap.h b/include/momo/HashMultiMap.h
@@ -1085,9 +1085,8 @@ class HashMultiMap
 		return pvMakeIterator(KeyIteratorProxy(hashMapIter), valueIndex, true);
 	}
 
-	template<typename PairPredicate>
-	requires std::predicate<const PairPredicate&, const Key&, const Value&>
-	size_t Remove(const PairPredicate& pairPred)
+	template<internal::conceptPredicate<const Key&, const Value&> PairPredicate>
+	size_t Remove(PairPredicate pairPred)
 	{
 		size_t initValueCount = mValueCount;
 		Iterator iter = GetBegin();

diff --git a/include/momo/TreeMap.h b/include/momo/TreeMap.h
@@ -725,12 +725,12 @@ class TreeMap
 		return mTreeSet.Remove(key);
 	}
 
-	template<typename PairPredicate>
-	requires std::predicate<const PairPredicate&, const Key&, const Value&>
-	size_t Remove(const PairPredicate& pairPred)
+	template<internal::conceptPredicate<const Key&, const Value&> PairPredicate>
+	size_t Remove(PairPredicate pairPred)
 	{
-		auto itemPred = [&pairPred] (const KeyValuePair& item)
-			{ return pairPred(*item.GetKeyPtr(), std::as_const(*item.GetValuePtr())); };
+		internal::FastCopyableFunctor<PairPredicate> fastPairPred(pairPred);
+		auto itemPred = [fastPairPred] (const KeyValuePair& item)
+			{ return fastPairPred(*item.GetKeyPtr(), std::as_const(*item.GetValuePtr())); };
 		return mTreeSet.Remove(itemPred);
 	}