made 'variableHidingTypedef' inconclusive. See ticket #3199

This commit is contained in:
Daniel Marjamäki 2011-10-22 13:26:33 +02:00
parent 2b54f00c87
commit 32e20d4e31
1 changed files with 2 additions and 2 deletions

View File

@ -454,7 +454,7 @@ void Tokenizer::createTokens(std::istream &code)
void Tokenizer::duplicateTypedefError(const Token *tok1, const Token *tok2, const std::string &type) void Tokenizer::duplicateTypedefError(const Token *tok1, const Token *tok2, const std::string &type)
{ {
if (tok1 && !(_settings->isEnabled("style"))) if (tok1 && !(_settings->isEnabled("style") && _settings->inconclusive))
return; return;
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList; std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
@ -476,7 +476,7 @@ void Tokenizer::duplicateTypedefError(const Token *tok1, const Token *tok2, cons
std::string(type + " '" + tok2_str + std::string(type + " '" + tok2_str +
"' hides typedef with same name"), "' hides typedef with same name"),
"variableHidingTypedef", "variableHidingTypedef",
false); true);
if (_errorLogger) if (_errorLogger)
_errorLogger->reportErr(errmsg); _errorLogger->reportErr(errmsg);