move invocation of simplifyHeadersAndUnusedTemplates

Author: ludviggunne

lib/tokenize.cpp

@@ -5725,8 +5725,6 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     simplifyFunctionTryCatch();
 
-    simplifyHeadersAndUnusedTemplates();
-
     // Remove __asm..
     simplifyAsm();
 
@@ -5754,6 +5752,8 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     // remove __attribute__((?))
     simplifyAttribute();
 
+    simplifyHeadersAndUnusedTemplates();
+
     validate();
 
     // Bail out if code is garbage
@@ -6568,20 +6568,6 @@ void Tokenizer::simplifyHeadersAndUnusedTemplates()
                     } else {
                         Token *funcTok = closingBracket->next();
                         while (funcTok) {
-                            if (Token::Match(funcTok, "__declspec|__attribute__ (")) {
-                                funcTok = funcTok->linkAt(1);
-                                if (funcTok) {
-                                    funcTok = funcTok->next();
-                                }
-                                continue;
-                            }
-                            if (Token::Match(funcTok, "[ [")) {
-                                funcTok = funcTok->link();
-                                if (funcTok) {
-                                    funcTok = funcTok->next();
-                                }
-                                continue;
-                            }
                             if (Token::Match(funcTok, "static|inline|const|%type%|&|&&|*") && !Token::Match(funcTok, "%name% (")) {
                                 funcTok = funcTok->next();
                                 continue;
@@ -6597,20 +6583,13 @@ void Tokenizer::simplifyHeadersAndUnusedTemplates()
                             funcTok = funcTok->next();
                         }
                         while (funcTok) {
-                            if (Token::Match(funcTok, "__declspec|__attribute__|throw|noexcept (")) {
+                            if (Token::Match(funcTok, "throw|noexcept (")) {
                                 funcTok = funcTok->linkAt(1);
                                 if (funcTok) {
                                     funcTok = funcTok->next();
                                 }
                                 continue;
                             }
-                            if (Token::Match(funcTok, "[ [")) {
-                                funcTok = funcTok->link();
-                                if (funcTok) {
-                                    funcTok = funcTok->next();
-                                }
-                                continue;
-                            }
                             if (Token::Match(funcTok, "const|volatile|&|&&")) {
                                 funcTok = funcTok->next();
                                 continue;