Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

#2700 (common logic or cut and paste errors) make duplicate branches…

… inclnclusive
  • Loading branch information...
commit 2db67863a72cb994cf3f65aaafdcd42bc45fe37c 1 parent 03cd572
IOBYTE IOBYTE authored
Showing with 4 additions and 0 deletions.
  1. +3 −0  lib/checkother.cpp
  2. +1 −0  test/testother.cpp
3  lib/checkother.cpp
View
@@ -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;
1  test/testother.cpp
View
@@ -129,6 +129,7 @@ class TestOther : public TestFixture
Settings settings;
settings._checkCodingStyle = true;
+ settings.inconclusive = true;
// Tokenize..
Tokenizer tokenizer(&settings, this);
Please sign in to comment.
Something went wrong with that request. Please try again.