From 2dd1e290ebe9d311a49a80632772f803e715eb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Fri, 19 Aug 2011 18:06:28 +0200
Subject: [PATCH] fixed false positives for the 'bitwise operator / comparison
 operator' check

---
 lib/checkother.cpp | 35 ++++++++++++++++++++++++++---------
 lib/checkother.h   |  2 ++
 test/testother.cpp |  9 +++++++++
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index 411b9f161..c5b10d7e0 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -153,6 +153,10 @@ void CheckOther::clarifyCondition()
                     tok2 = tok2->link();
                 else if (Token::Match(tok2, "<|<=|==|!=|>|>="))
                 {
+                    // This might be a template
+                    if (!code_is_c() && Token::Match(tok2->previous(), "%var% <"))
+                        break;
+
                     clarifyConditionError(tok, tok->strAt(2) == "=", false);
                     break;
                 }
@@ -174,8 +178,13 @@ void CheckOther::clarifyCondition()
                     tok2 = tok2->link();
                 tok2 = tok2->next();
             }
+
             if (Token::Match(tok2, "[&|^]"))
             {
+                // don't write false positives when templates are used
+                if (Token::Match(tok, "<|>") && !code_is_c() && tok2->str() == "&")
+                    continue;
+
                 clarifyConditionError(tok,false,true);
             }
         }
@@ -3413,19 +3422,27 @@ static bool isFunction(const std::string &name, const Token *startToken)
     return false;
 }
 
+bool CheckOther::code_is_c() const
+{
+    const std::string fname = _tokenizer->getFiles()->at(0);
+    const size_t position   = fname.rfind(".");
+
+    if (position != std::string::npos)
+    {
+        const std::string ext = fname.substr(position);
+        if (ext == ".c" || ext == ".C")
+            return true;
+    }
+
+    return false;
+}
+
 void CheckOther::checkMisusedScopedObject()
 {
     // Skip this check for .c files
+    if (code_is_c())
     {
-        const std::string fname = _tokenizer->getFiles()->at(0);
-        size_t position         = fname.rfind(".");
-
-        if (position != std::string::npos)
-        {
-            const std::string ext = fname.substr(position);
-            if (ext == ".c" || ext == ".C")
-                return;
-        }
+        return;
     }
 
     const SymbolDatabase * const symbolDatabase = _tokenizer->getSymbolDatabase();
diff --git a/lib/checkother.h b/lib/checkother.h
index b863639de..2ee47eb39 100644
--- a/lib/checkother.h
+++ b/lib/checkother.h
@@ -403,6 +403,8 @@ private:
 
         return varname;
     }
+
+    bool code_is_c() const;
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/test/testother.cpp b/test/testother.cpp
index a78a066c4..1487949d8 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -2642,6 +2642,12 @@ private:
               "    for (i = 0; i < 10; i++) {}\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        check("void f() {\n"
+              "    if (x = a<int>()) {}\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
     }
 
     // clarify conditions with bitwise operator and comparison
@@ -2673,6 +2679,9 @@ private:
 
         check("void f(std::list<int> &ints) { }");
         ASSERT_EQUALS("", errout.str());
+
+        check("void f() { A<x &> a; }");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void incorrectStringCompare()