X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=a93c29df632202b878ede76dd1f2d9ba4c1b36f5;hb=e89616b514c77e189b93d5a46aa5a5a72e34c3cb;hp=ec8156798d70628d0597e6936ecd39622d9fff58;hpb=50be4619cca4bb44e5abf8759720c255ef6d3b45;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index ec81567..a93c29d 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++);
+	}
 }
 
 }
@@ -58,14 +60,14 @@ void BuildInfo::unique()
 	::unique(libpath);
 	::unique(libs);
 
-	for(StringList::iterator i=warnings.begin(); i!=warnings.end(); ++i)
+	for(WordList::iterator i=warnings.begin(); i!=warnings.end(); ++i)
 	{
 		bool flag = i->compare(0, 3, "no-");
 
 		string warn = (flag ? *i : i->substr(3));
 		string no_warn = "no-"+warn;
 
-		for(StringList::iterator j=i; j!=warnings.end();)
+		for(WordList::iterator j=i; j!=warnings.end();)
 		{
 			if(j!=i && (*j==warn || *j==no_warn))
 			{
@@ -95,27 +97,27 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 	add("warning",  &Loader::warning);
 }
 
-void BuildInfo::Loader::incpath(const std::string &s)
+void BuildInfo::Loader::incpath(const string &s)
 {
 	obj.incpath.push_back(s);
 }
 
-void BuildInfo::Loader::define(const std::string &d, const std::string &v)
+void BuildInfo::Loader::define(const string &d, const string &v)
 {
 	obj.defines[d] = v;
 }
 
-void BuildInfo::Loader::libpath(const std::string &s)
+void BuildInfo::Loader::libpath(const string &s)
 {
 	obj.libpath.push_back(s);
 }
 
-void BuildInfo::Loader::library(const std::string &s)
+void BuildInfo::Loader::library(const string &s)
 {
 	obj.libs.push_back(s);
 }
 
-void BuildInfo::Loader::warning(const std::string &s)
+void BuildInfo::Loader::warning(const string &s)
 {
 	obj.warnings.push_back(s);
 }