Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

… inclnclusive
  • Loading branch information...
commit 2db67863a72cb994cf3f65aaafdcd42bc45fe37c 1 parent 03cd572
IOBYTE authored May 08, 2011
3  lib/checkother.cpp
@@ -3190,6 +3190,9 @@ void CheckOther::checkDuplicateBranch()
3190 3190
     if (!_settings->_checkCodingStyle)
3191 3191
         return;
3192 3192
 
  3193
+    if (!_settings->inconclusive)
  3194
+        return;
  3195
+
3193 3196
     const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
3194 3197
 
3195 3198
     std::list<Scope>::const_iterator scope;
1  test/testother.cpp
@@ -129,6 +129,7 @@ class TestOther : public TestFixture
129 129
 
130 130
         Settings settings;
131 131
         settings._checkCodingStyle = true;
  132
+        settings.inconclusive = true;
132 133
 
133 134
         // Tokenize..
134 135
         Tokenizer tokenizer(&settings, this);

0 notes on commit 2db6786

Please sign in to comment.
Something went wrong with that request. Please try again.