walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #228 from simartin/osx_build_restore 

RFC: Restore build on OSX
This commit is contained in:
Daniel Marjamäki 2014-02-05 11:30:34 +01:00
parent 6ac9e180e0 8ff9696374
commit ec80068cd9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkio.cpp
View File

@ -463,7 +463,7 @@ void CheckIO::checkWrongPrintfScanfArguments()
if (Token::Match(tok->next(), "( %any%") && _settings->library.formatstr_function(tok->str())) { if (Token::Match(tok->next(), "( %any%") && _settings->library.formatstr_function(tok->str())) {
const std::map<int, Library::ArgumentChecks>& argumentChecks = _settings->library.argumentChecks.at(tok->str()); const std::map<int, Library::ArgumentChecks>& argumentChecks = _settings->library.argumentChecks.at(tok->str());
for (std::map<int, Library::ArgumentChecks>::const_iterator i = argumentChecks.cbegin(); i != argumentChecks.cend(); ++i) { for (std::map<int, Library::ArgumentChecks>::const_iterator i = argumentChecks.begin(); i != argumentChecks.end(); ++i) {
if (i->second.formatstr) { if (i->second.formatstr) {
formatStringArgNo = i->first - 1; formatStringArgNo = i->first - 1;
break; break;

2
lib/library.h
View File

@ -85,7 +85,7 @@ public:
} }
bool formatstr_function(const std::string& funcname) const { bool formatstr_function(const std::string& funcname) const {
return _formatstr.find(funcname) != _formatstr.cend(); return _formatstr.find(funcname) != _formatstr.end();
} }
bool formatstr_scan(const std::string& funcname) const { bool formatstr_scan(const std::string& funcname) const {

2
test/testsuite.cpp
View File

@ -270,7 +270,7 @@ std::size_t TestFixture::runTests(const options& args)
if (!missingLibs.empty()) { if (!missingLibs.empty()) {
std::cerr << "Missing libraries: "; std::cerr << "Missing libraries: ";
for (std::set<std::string>::const_iterator i = missingLibs.cbegin(); i != missingLibs.cend(); ++i) for (std::set<std::string>::const_iterator i = missingLibs.begin(); i != missingLibs.end(); ++i)
std::cerr << *i << " "; std::cerr << *i << " ";
std::cerr << std::endl << std::endl; std::cerr << std::endl << std::endl;
} }