From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 26 Oct 2022 08:52:12 +0000 (+0300)
Subject: Use std::less as predicate in algorithms
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=01844ee2ba101c25655dd5eacf62ca9365f26f21;p=libs%2Fcore.git

Use std::less as predicate in algorithms

It guarantees a consistent ordering of pointers, unlike the < operator.
---

diff --git a/source/core/algorithm.h b/source/core/algorithm.h
index 51c2369..d295d00 100644
--- a/source/core/algorithm.h
+++ b/source/core/algorithm.h
@@ -2,6 +2,7 @@
 #define MSP_CORE_ALGORITHM_H_
 
 #include <algorithm>
+#include <functional>
 
 namespace Msp {
 
@@ -124,16 +125,17 @@ inline typename Container::const_iterator find_member(const Container &cont, con
 	return find_if(cont, MemberMatch<typename Container::value_type, T>(value, mp));
 }
 
-template<typename C, typename T>
+template<typename C, typename T, typename P=std::less<T>>
 struct MemberCompare
 {
 	T C::*mem_ptr;
+	P pred;
 
 	MemberCompare(T C::*p): mem_ptr(p) { }
 
-	bool operator()(const C &obj, const T &v) { return obj.*mem_ptr<v; }
-	bool operator()(const T &v, const C &obj) { return v<obj.*mem_ptr; }
-	bool operator()(const C &obj1, const C &obj2) { return obj1.*mem_ptr<obj2.*mem_ptr; }
+	bool operator()(const C &obj, const T &v) { return pred(obj.*mem_ptr, v); }
+	bool operator()(const T &v, const C &obj) { return pred(v, obj.*mem_ptr); }
+	bool operator()(const C &obj1, const C &obj2) { return pred(obj1.*mem_ptr, obj2.*mem_ptr); }
 };
 
 template<typename Container, typename T>