X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=a93c29df632202b878ede76dd1f2d9ba4c1b36f5;hb=d701ca81b781cd061fd60244312b0316cf5bf4d9;hp=77243ef365ffcb2cc6b82868c852ae04bfe0e757;hpb=ee2c6758fd120fe8bca76521acba06d793121d60;p=builder.git diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp index 77243ef..a93c29d 100644 --- a/source/buildinfo.cpp +++ b/source/buildinfo.cpp @@ -60,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)) { @@ -97,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); }