Fix

danmar · May 25, 2024 · 4ee82b0 · 4ee82b0
1 parent eb634e8
commit 4ee82b0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/cfg/qt.cfg b/cfg/qt.cfg
@@ -5363,6 +5363,7 @@
   <define name="QT_TRANSLATE_NOOP3_UTF8(scope, x, comment)" value="{x, comment}"/>
   <define name="QT_WARNING_PUSH" value=""/>
   <define name="QT_WARNING_POP" value=""/>
+  <define name="QT_WARNING_DISABLE_GCC(x)" value=""/>
   <define name="QT_STRINGIFY(x)" value="#x"/>
   <define name="QCOMPARE(actual, expected)" value="(void)((actual)==(expected))"/>
   <define name="QVERIFY(condition)" value="(void)(condition)"/>

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8749,7 +8749,7 @@ void Tokenizer::findGarbageCode() const
         }
         if (isCPP() && tok->str() == "namespace" && tok->tokAt(-1)) {
             if (!Token::Match(tok->tokAt(-1), ";|{|}|using|inline")) {
-                if (tok->linkAt(-1) && tok->linkAt(-1) && tok->linkAt(-1)->tokAt(-1) && tok->linkAt(-1)->tokAt(-1)->isUpperCaseName())
+                if (tok->linkAt(-1) && tok->linkAt(-1)->tokAt(-1) && tok->linkAt(-1)->tokAt(-1)->isUpperCaseName())
                     unknownMacroError(tok->linkAt(-1)->tokAt(-1));
                 else
                     syntaxError(tok);

diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -586,8 +586,6 @@ class TestSimplifyTokens : public TestFixture {
         {
             const char code[] = "void f(int namespace) { }";
 
-            const char expected[] = "void f ( int namespace ) { }";
-
             ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -586,8 +586,6 @@ class TestSimplifyTokens : public TestFixture { @@
             {
                 const char code[] = "void f(int namespace) { }";
-                const char expected[] = "void f ( int namespace ) { }";
                 ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
             }
         }
@@ Expand Down @@