* src/support/lyxalgo.h

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

diff --git a/src/support/lyxalgo.h b/src/support/lyxalgo.h
index a40d2a5cb60d6cb8d2e145978358cc94bc1920f8..19c2485a34241b9cf5ee51c69d92360b2a0e24d7 100644 (file)
--- a/src/support/lyxalgo.h
+++ b/src/support/lyxalgo.h
@@ -6,7 +6,7 @@
  *
  * \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 {
 
 
@@ -80,7 +81,7 @@ 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;
+       typename std::iterator_traits<Iterator>::difference_type n = 0;
        while (first != last)
                if (*first++ == value) ++n;
        return n;
@@ -91,9 +92,10 @@ count (Iterator first, Iterator last, T const & value)
 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());
 }
 
 } // namespace lyx