small changes read changelog

[lyx.git] / src / support / lyxalgo.h

diff --git a/src/support/lyxalgo.h b/src/support/lyxalgo.h
index 27cae60bb5ef76dae0816989969857f5f2d27aaa..2d8d49f06c943b3bf615987e90238e8a987803e2 100644 (file)
--- a/src/support/lyxalgo.h
+++ b/src/support/lyxalgo.h
@@ -3,14 +3,10 @@
 #ifndef LYX_ALGO_H
 #define LYX_ALGO_H
 
-#include <algorithm>
+#include <utility>
 
-using std::less;
+namespace lyx {
 
-// Both these functions should ideally be placed into namespace lyx.
-// Also the using std::less should not be used.
-
-//namespace lyx {
 
 /// Returns true if the sequence first,last is sorted, false if not.
 template <class For>
@@ -19,11 +15,12 @@ bool sorted(For first, For last)
        if (first == last) return true;
        For tmp = first;
        while (++tmp != last) {
-               if (less(*tmp, *first++)) return false;
+               if (*tmp < *first++) return false;
        }
        return true;
 }
 
+
 /// Cmp is the same Cmp as you would pass to std::sort.
 template <class For, class Cmp>
 bool sorted(For first, For last, Cmp cmp)
@@ -36,5 +33,26 @@ bool sorted(For first, For last, Cmp cmp)
        return true;
 }
 
-// }  // end of namespace lyx
+
+struct firster {
+       template <class P1, class P2>
+       P1 operator()(std::pair<P1, P2> const & p) {
+               return p.first;
+       }
+};
+
+
+template <class InputIter, class OutputIter, class Func>
+OutputIter copy_if(InputIter first, InputIter last,
+              OutputIter result, Func func) 
+{
+       for (; first != last; ++first) {
+               if (func(*first)) {
+                       *result++ = *first;
+               }
+       }
+       return result;
+}
+
+}  // end of namespace lyx
 #endif