X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Flyxalgo.h;h=d1aa023e1e918dd9ecfe2ad4799245f9070598fe;hb=8d640dc77608bedddb5b00982c23665584f52d21;hp=60aaff7b2b6ddfda9a790e63393cf9265b4b8f02;hpb=eef71b84392a58d1515bf6a115539ca00666b44d;p=lyx.git

diff --git a/src/support/lyxalgo.h b/src/support/lyxalgo.h
index 60aaff7b2b..d1aa023e1e 100644
--- a/src/support/lyxalgo.h
+++ b/src/support/lyxalgo.h
@@ -1,12 +1,14 @@
 // -*- C++ -*-
 /**
  * \file lyxalgo.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * A variety of useful templates.
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
  *
- * \author unknown
+ * A variety of useful templates.
  */
 
 #ifndef LYX_ALGO_H
@@ -16,6 +18,7 @@
 #include <iterator>
 #include <algorithm>
 
+
 namespace lyx {
 
 
@@ -54,7 +57,7 @@ struct firster {
 
 
 /**
- * copy elements in the given range to the output iterator 
+ * copy elements in the given range to the output iterator
  * if the predicate evaluates as true
  */
 template <class InputIter, class OutputIter, class Func>
@@ -70,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