Fix bugs #6078 and #9364

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

diff --git a/src/support/lyxalgo.h b/src/support/lyxalgo.h
index a40d2a5cb60d6cb8d2e145978358cc94bc1920f8..9e44838a795233bf70df36686f3d9eacea068d1a 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,29 +73,41 @@ 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());
+}
+
+
+#ifdef LYX_USE_CXX11
+using std::next;
+#else
+/// Replacement of std::next for older compilers
+template <typename It, typename Diff>
+inline It next(It i, Diff n = 1)
+{
+       std::advance(i, n);
+       return i;
 }
+#endif
+
+
+#ifdef LYX_USE_CXX11
+using std::prev;
+#else
+/// Replacement of std::prev for older compilers
+template <typename It, typename Diff>
+inline It prev(It i, Diff n = 1)
+{
+       std::advance(i, -n);
+       return i;
+}
+#endif
 
 } // namespace lyx