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 251a81ef1113b7f63cc849d1e78302bf5c941449..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)
 {
@@ -129,6 +143,8 @@ struct MemberCompare
        T C::*mem_ptr;
        P pred;
 
+       MemberCompare(T C::*p): mem_ptr(p) { }
+
        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); }
@@ -137,37 +153,37 @@ struct MemberCompare
 template<typename Container, typename T>
 inline typename Container::iterator lower_bound_member(Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return lower_bound(cont, value, MemberCompare<typename Container::value_type, T>{ mp });
+       return lower_bound(cont, value, MemberCompare<typename Container::value_type, T>(mp));
 }
 
 template<typename Container, typename T>
 inline typename Container::const_iterator lower_bound_member(const Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return lower_bound(cont, value, MemberCompare<typename Container::value_type, T>{ mp });
+       return lower_bound(cont, value, MemberCompare<typename Container::value_type, T>(mp));
 }
 
 template<typename Container, typename T>
 inline typename Container::iterator upper_bound_member(Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return upper_bound(cont, value, MemberCompare<typename Container::value_type, T>{ mp });
+       return upper_bound(cont, value, MemberCompare<typename Container::value_type, T>(mp));
 }
 
 template<typename Container, typename T>
 inline typename Container::const_iterator upper_bound_member(const Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return upper_bound(cont, value, MemberCompare<typename Container::value_type, T>{ mp });
+       return upper_bound(cont, value, MemberCompare<typename Container::value_type, T>(mp));
 }
 
 template<typename Container, typename T>
 inline void sort_member(Container &cont, T Container::value_type::*mp)
 {
-       sort(cont, MemberCompare<typename Container::value_type, T>{ mp });
+       sort(cont, MemberCompare<typename Container::value_type, T>(mp));
 }
 
 template<typename Container, typename T>
 inline void stable_sort_member(Container &cont, T Container::value_type::*mp)
 {
-       stable_sort(cont, MemberCompare<typename Container::value_type, T>{ mp });
+       stable_sort(cont, MemberCompare<typename Container::value_type, T>(mp));
 }
 
 template<typename Container, typename Predicate>