Fix

Author: web-flow

lib/tokenize.cpp

@@ -9169,11 +9169,14 @@ void Tokenizer::findGarbageCode() const
         if (Token::simpleMatch(tok, "::")) {
             if (!Token::Match(tok->next(), "%name%|*|~") || (tok->next()->isKeyword() && !Token::Match(tok->next(), "new|delete|operator")))
                 syntaxError(tok);
-            if (Token::simpleMatch(tok->tokAt(-1), ")") && !Token::simpleMatch(tok->linkAt(-1)->tokAt(-1), "decltype (")) {
-                if (tok->linkAt(-1)->tokAt(-1) && tok->linkAt(-1)->tokAt(-1)->isUpperCaseName())
-                    unknownMacroError(tok);
-                else
-                    syntaxError(tok);
+            if (Token::simpleMatch(tok->tokAt(-1), ")")) {
+                const Token* const prev = tok->linkAt(-1)->tokAt(-1);
+                if (!Token::Match(prev, "%name% (") || (!prev->isControlFlowKeyword() && prev->str() != "decltype")) {
+                    if (prev && prev->isUpperCaseName())
+                        unknownMacroError(prev);
+                    else
+                        syntaxError(tok);
+                }
             }
         }
         if (Token::Match(tok, "& %comp%|&&|%oror%|&|%or%") && tok->strAt(1) != ">")

test/testsymboldatabase.cpp

@@ -3773,7 +3773,8 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase35() { // ticket #4806 and #4841
-        ASSERT_THROW_INTERNAL(check("class FragmentQueue : public CL_NS(util)::PriorityQueue<CL_NS(util)::Deletor::Object<TextFragment> >\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(check("class FragmentQueue : public CL_NS(util)::PriorityQueue<CL_NS(util)::Deletor::Object<TextFragment> >\n"
+                                    "{};\n"), UNKNOWN_MACRO);
     }
 
     void symboldatabase36() { // ticket #4892