X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbuildinfo.cpp;h=77243ef365ffcb2cc6b82868c852ae04bfe0e757;hb=ee2c6758fd120fe8bca76521acba06d793121d60;hp=463357dd32d37d19dd31266bc538f7e288051c46;hpb=45c778b1976de1a3093e0c6fb5e2a94c42073dcb;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 463357d..77243ef 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <set>
 #include "buildinfo.h"
 
 using namespace std;
@@ -7,17 +8,18 @@ using namespace Msp;
 namespace {
 
 /** Removes any duplicate entries from a list, leaving only the first one.  The
-order of other elements is preserved.  O(n²) efficiency. */
-void unique(StringList &l)
+order of other elements is preserved.  O(nlogn) efficiency. */
+template<typename T>
+void unique(list<T> &l)
 {
-	for(StringList::iterator i=l.begin(); i!=l.end(); ++i)
-		for(StringList::iterator j=i; j!=l.end();)
-		{
-			if(j!=i && *j==*i)
-				j = l.erase(j);
-			else
-				++j;
-		}
+	set<T> seen;
+	for(typename list<T>::iterator i=l.begin(); i!=l.end(); )
+	{
+		if(seen.count(*i))
+			l.erase(i++);
+		else
+			seen.insert(*i++);
+	}
 }
 
 }
@@ -48,6 +50,8 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 		optimize = bi.optimize;
 		strip = bi.strip;
 	}
+
+	unique();
 }
 
 void BuildInfo::unique()