fix #14117

Author: ludviggunne

lib/tokenize.cpp

@@ -6546,7 +6546,7 @@ void Tokenizer::simplifyHeadersAndUnusedTemplates()
 
             if (removeUnusedTemplates || (isIncluded && removeUnusedIncludedTemplates)) {
                 if (Token::Match(tok, "template < %name%")) {
-                    const Token *closingBracket = tok->next()->findClosingBracket();
+                    Token *closingBracket = tok->next()->findClosingBracket();
                     if (Token::Match(closingBracket, "> class|struct %name% [;:{]") && keep.find(closingBracket->strAt(2)) == keep.end()) {
                         const Token *endToken = closingBracket->tokAt(3);
                         if (endToken->str() == ":") {
@@ -6560,11 +6560,68 @@ void Tokenizer::simplifyHeadersAndUnusedTemplates()
                             Token::eraseTokens(tok, endToken);
                             tok->deleteThis();
                         }
-                    } else if (Token::Match(closingBracket, "> %type% %name% (") && Token::simpleMatch(closingBracket->linkAt(3), ") {") && keep.find(closingBracket->strAt(2)) == keep.end()) {
-                        const Token *endToken = closingBracket->linkAt(3)->linkAt(1)->next();
-                        Token::eraseTokens(tok, endToken);
-                        tok->deleteThis();
-                        goBack = true;
+                    } 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;
+                            }
+                            break;
+                        }
+                        if (!Token::Match(funcTok, "%name% (")) {
+                            tok = funcTok;
+                            continue;
+                        }
+                        funcTok = funcTok->linkAt(1);
+                        if (funcTok) {
+                            funcTok = funcTok->next();
+                        }
+                        while (funcTok) {
+                            if (Token::Match(funcTok, "__declspec|__attribute__|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;
+                            }
+                            break;
+                        }
+                        if (!Token::simpleMatch(funcTok, "{")) {
+                            tok = funcTok;
+                            continue;
+                        }
+                        funcTok = funcTok->link();
+                        if (funcTok) {
+                            Token::eraseTokens(tok, funcTok->next());
+                            tok->deleteThis();
+                            goBack = true;
+                        }
                     }
                 }
             }