Make warnings configurable through build_info and command line

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 5164ab08841c1ceed879f6fc5e4939770cd85cca..36be492ac0724f1757fb56b6b2b5b9a825ff2981 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -8,6 +8,7 @@ Distributed under the LGPL
 #include <algorithm>
 #include "buildinfo.h"
 
+using namespace std;
 using namespace Msp;
 
 /**
@@ -21,6 +22,7 @@ void BuildInfo::add(const BuildInfo &bi)
        ldflags.insert(ldflags.end(), bi.ldflags.begin(), bi.ldflags.end());
        libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
        libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+       warnings.insert(warnings.end(), bi.warnings.begin(), bi.warnings.end());
 }
 
 /**
@@ -34,6 +36,27 @@ void BuildInfo::unique()
        unique(ldflags);
        unique(libpath);
        unique(libs);
+
+       for(StringList::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();)
+               {
+                       if(j!=i && (*j==warn || *j==no_warn))
+                       {
+                               flag=(*j==warn);
+                               j=warnings.erase(j);
+                       }
+                       else
+                               ++j;
+               }
+
+               *i=(flag ? warn : no_warn);
+       }
 }
 
 /**
@@ -42,11 +65,14 @@ order of other elements is preserved.  O(n²) efficiency.
 */
 void BuildInfo::unique(StringList &l)
 {
-       StringList l2;
        for(StringList::iterator i=l.begin(); i!=l.end(); ++i)
-               if(find(l2.begin(), l2.end(), *i)==l2.end())
-                       l2.push_back(*i);
-       swap(l, l2);
+               for(StringList::iterator j=i; j!=l.end();)
+               {
+                       if(j!=i && *j==*i)
+                               j=l.erase(j);
+                       else
+                               ++j;
+               }
 }
 
 BuildInfo::Loader::Loader(BuildInfo &bi):
@@ -58,6 +84,7 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
        add("ldflag",  &Loader::ldflag);
        add("libpath", &Loader::libpath);
        add("library", &Loader::library);
+       add("warning", &Loader::warning);
 }