From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 31 Oct 2015 15:27:31 +0000 (+0200)
Subject: Minor cleanup to the BuildInfo class
X-Git-Url: http://git.tdb.fi/?p=builder.git;a=commitdiff_plain;h=5c8e939372ae18bef52a2961826f8467d29f12f3

Minor cleanup to the BuildInfo class
---

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 0c32ec5..114a368 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -49,14 +49,16 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 	for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
 		defines[i->first] = i->second;
 	incpath.insert(incpath.begin(), bi.incpath.begin(), bi.incpath.end());
+	threads = bi.threads;
 	for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
 		standards[i->first] = i->second;
+
 	if(level!=CHAINED)
 	{
 		libpath.insert(libpath.begin(), bi.libpath.begin(), bi.libpath.end());
 		libs.insert(libs.begin(), bi.libs.begin(), bi.libs.end());
 	}
-	threads = bi.threads;
+
 	if(level==LOCAL)
 	{
 		sysroot = bi.sysroot;
@@ -73,8 +75,10 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 	}
 
 	unique(incpath);
+	unique(local_incpath);
 	unique(libpath);
 	unique(libs);
+	unique(keep_symbols);
 }