(Ling Li): re-write eliminate_duplicates to avoid initial sort.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6294 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index e611aa2b58004f3b80987acfdefbfaf90ad56bd6..e301685a341c957147f1a9387c3823d5b7fb7dd9 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-27  Ling Li  <ling@caltech.edu>
+
+       * lyxalgo.h (eliminate_duplicates): re-written to avoid the initial
+       sort.
+
 2003-02-25  Alfredo Braunstein <abraunst@libero.it>
 
        * forkedcontr.C (timer): remove bogus continue

diff --git a/src/support/lyxalgo.h b/src/support/lyxalgo.h
index a40d2a5cb60d6cb8d2e145978358cc94bc1920f8..6bccfb12966bd75906e70470d093882dd2d9965d 100644 (file)
--- a/src/support/lyxalgo.h
+++ b/src/support/lyxalgo.h
@@ -17,6 +17,8 @@
 #include <utility>
 #include <iterator>
 #include <algorithm>
+#include <set>
+
 
 namespace lyx {
 
@@ -91,9 +93,16 @@ count (Iterator first, Iterator last, T const & value)
 template<class C>
 void eliminate_duplicates(C & c)
 {
-       std::sort(c.begin(), c.end());
-       typename C::iterator p = std::unique(c.begin(), c.end());
-       c.erase(p, c.end());
+       C unique_c;
+       std::set<typename C::value_type> s;
+
+       for (typename C::iterator p = c.begin(); p != c.end(); ++p) {
+               if (s.find(*p) == s.end()) {
+                       unique_c.push_back(*p);
+                       s.insert(*p);
+               }
+       }
+       swap(c, unique_c);
 }
 
 } // namespace lyx