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

Fixed #7743 (--config-exclude no longer supported)

This commit is contained in:
Daniel Marjamäki 2016-09-30 08:00:06 +02:00
parent 190cc82d63
commit 9dcad7115a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/preprocessor.cpp
View File

@ -365,8 +365,10 @@ std::set<std::string> Preprocessor::getConfigs(const simplecpp::TokenList &token
::getConfigs(tokens, defined, _settings.userDefines, _settings.userUndefs, ret);
for (std::map<std::string, simplecpp::TokenList*>::const_iterator it = tokenlists.begin(); it != tokenlists.end(); ++it)
::getConfigs(*(it->second), defined, _settings.userDefines, _settings.userUndefs, ret);
for (std::map<std::string, simplecpp::TokenList*>::const_iterator it = tokenlists.begin(); it != tokenlists.end(); ++it) {
if (!_settings.configurationExcluded(it->first))
::getConfigs(*(it->second), defined, _settings.userDefines, _settings.userUndefs, ret);
}
return ret;
}

2
lib/settings.h
View File

@ -247,7 +247,7 @@ public:
ImportProject project;
/**
* @brief return true if a file is to be excluded from configuration checking
* @brief return true if a included file is to be excluded in Preprocessor::getConfigs
* @return true for the file to be excluded.
*/
bool configurationExcluded(const std::string &file) const {