From: Mikko Rasa Date: Mon, 9 Jul 2012 13:20:33 +0000 (+0300) Subject: Use correct typedefs X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=4acfb2913d021b37e89465183d8226f4c95f72f9;p=builder.git Use correct typedefs --- diff --git a/source/binary.cpp b/source/binary.cpp index 7e32c86..2d0a409 100644 --- a/source/binary.cpp +++ b/source/binary.cpp @@ -44,7 +44,7 @@ void Binary::find_depends() const BuildInfo::PathList &libpath = c->get_build_info().libpath; const BuildInfo::WordList &libs = c->get_build_info().libs; - for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i) + for(BuildInfo::WordList::const_iterator i=libs.begin(); i!=libs.end(); ++i) { Target *lib = builder.get_vfs().find_library(*i, libpath, libmode); if(lib) diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp index 2372e89..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)) {