Add move semantics to Variant

[libs/core.git] / source / core / algorithm.h

diff --git a/source/core/algorithm.h b/source/core/algorithm.h
index d295d00ab844c02e943f8795904ee8f35367dfd4..43bbaeeb2c00ace3199beae6b1af8052cd0bfb51 100644 (file)
--- a/source/core/algorithm.h
+++ b/source/core/algorithm.h
@@ -30,6 +30,20 @@ inline typename Container::const_iterator find_if(const Container &cont, Predica
        return std::find_if(cont.begin(), cont.end(), pred);
 }
 
+template<typename T>
+struct ValueMatch
+{
+       const T &value;
+
+       bool operator()(const T &v) { return v==value; }
+};
+
+template<typename Container, typename T>
+inline bool any_equals(Container &cont, const T &value)
+{
+       return std::any_of(cont.begin(), cont.end(), ValueMatch<T>{value});
+}
+
 template<typename Container, typename T>
 inline typename Container::iterator lower_bound(Container &cont, const T &value)
 {
@@ -108,21 +122,19 @@ struct MemberMatch
        const T &value;
        T C::*mem_ptr;
 
-       MemberMatch(const T &v, T C::*p): value(v), mem_ptr(p) { }
-
        bool operator()(const C &obj) { return obj.*mem_ptr==value; }
 };
 
 template<typename Container, typename T>
 inline typename Container::iterator find_member(Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return find_if(cont, MemberMatch<typename Container::value_type, T>(value, mp));
+       return find_if(cont, MemberMatch<typename Container::value_type, T>{ value, mp });
 }
 
 template<typename Container, typename T>
 inline typename Container::const_iterator find_member(const Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return find_if(cont, MemberMatch<typename Container::value_type, T>(value, mp));
+       return find_if(cont, MemberMatch<typename Container::value_type, T>{ value, mp });
 }
 
 template<typename C, typename T, typename P=std::less<T>>