Skip to content

Commit

Permalink
made 'variableHidingTypedef' inconclusive. See ticket #3199
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Marjamäki committed Oct 22, 2011
1 parent 2b54f00 commit 32e20d4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/tokenize.cpp
Expand Up @@ -454,7 +454,7 @@ void Tokenizer::createTokens(std::istream &code)

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;

std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
Expand All @@ -476,7 +476,7 @@ void Tokenizer::duplicateTypedefError(const Token *tok1, const Token *tok2, cons
std::string(type + " '" + tok2_str +
"' hides typedef with same name"),
"variableHidingTypedef",
false);
true);

if (_errorLogger)
_errorLogger->reportErr(errmsg);
Expand Down

0 comments on commit 32e20d4

Please sign in to comment.