Skip to content

Commit

Permalink
#2700 (common logic or cut and paste errors) make duplicate branches…
Browse files Browse the repository at this point in the history
… inclnclusive
  • Loading branch information
IOBYTE committed May 8, 2011
1 parent 03cd572 commit 2db6786
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions lib/checkother.cpp
Expand Up @@ -3190,6 +3190,9 @@ void CheckOther::checkDuplicateBranch()
if (!_settings->_checkCodingStyle)
return;

if (!_settings->inconclusive)
return;

const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();

std::list<Scope>::const_iterator scope;
Expand Down
1 change: 1 addition & 0 deletions test/testother.cpp
Expand Up @@ -129,6 +129,7 @@ class TestOther : public TestFixture

Settings settings;
settings._checkCodingStyle = true;
settings.inconclusive = true;

// Tokenize..
Tokenizer tokenizer(&settings, this);
Expand Down

0 comments on commit 2db6786

Please sign in to comment.