Fixed danmar#6096: bool is an integral type, but there is no portabil…

…ity issue if a pointer is assigned to a bool.
nomick · Jan 2, 2015 · 417f42f · 417f42f
1 parent 274e1a8
commit 417f42f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
@@ -39,7 +39,7 @@ static bool isaddr(const Variable *var)
 /** Is given variable an integer variable */
 static bool isint(const Variable *var)
 {
-    return (var && var->isIntegralType() && !var->isArrayOrPointer());
+    return (var && var->isIntegralType() && !var->isArrayOrPointer() && var->typeStartToken()->str() != "bool");
 }
 
 void Check64BitPortability::pointerassignment()

diff --git a/test/test64bit.cpp b/test/test64bit.cpp
@@ -100,6 +100,12 @@ class Test64BitPortability : public TestFixture {
               "    return 6 + p[2] * 256;\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        check("int foo(int *p) {\n" // #6096
+              "    bool a = p;\n"
+              "    return a;\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void structmember() {