From 2db67863a72cb994cf3f65aaafdcd42bc45fe37c Mon Sep 17 00:00:00 2001
From: Robert Reif <reif@earthlink.net>
Date: Sun, 8 May 2011 13:22:42 -0400
Subject: [PATCH]  #2700 (common logic or cut and paste errors) make duplicate
 branches inclnclusive

---
 lib/checkother.cpp | 3 +++
 test/testother.cpp | 1 +
 2 files changed, 4 insertions(+)

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index ae4d43341..138c8a5bf 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -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;
diff --git a/test/testother.cpp b/test/testother.cpp
index c518fec65..739c2cd94 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -129,6 +129,7 @@ private:
 
         Settings settings;
         settings._checkCodingStyle = true;
+        settings.inconclusive = true;
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this);