Remove non-copyable idioms

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

diff --git a/src/support/lyxalgo.h b/src/support/lyxalgo.h
index a40d2a5cb60d6cb8d2e145978358cc94bc1920f8..d1aa023e1e918dd9ecfe2ad4799245f9070598fe 100644 (file)
--- a/src/support/lyxalgo.h
+++ b/src/support/lyxalgo.h
@@ -4,9 +4,9 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
  * A variety of useful templates.
  */
@@ -18,6 +18,7 @@
 #include <iterator>
 #include <algorithm>
 
+
 namespace lyx {
 
 
@@ -72,30 +73,22 @@ OutputIter copy_if(InputIter first, InputIter last,
 }
 
 
-/// A slot in replacement for std::count for systems where it is broken.
-template <class Iterator, class T>
-typename std::iterator_traits<Iterator>::difference_type
-count (Iterator first, Iterator last, T const & value)
-{
-#ifdef HAVE_STD_COUNT
-       return std::count(first, last, value);
-#else
-       std::iterator_traits<Iterator>::difference_type n = 0;
-       while (first != last)
-               if (*first++ == value) ++n;
-       return n;
-#endif
-}
-
 /// Remove all duplicate entries in c.
 template<class C>
 void eliminate_duplicates(C & c)
 {
+       // It is a requirement that the container is sorted for
+       // std::unique to work properly.
        std::sort(c.begin(), c.end());
-       typename C::iterator p = std::unique(c.begin(), c.end());
-       c.erase(p, c.end());
+       c.erase(std::unique(c.begin(), c.end()), c.end());
 }
 
+
+using std::next;
+
+
+using std::prev;
+
 } // namespace lyx
 
 #endif // LYX_ALGO_H