Refactorizations:

- Improve performance of simplifyTypedef by using Token::simpleMatch by ~15%
- Simplified code in simplifyTypedef
- Ran AStyle

lib/checkother.cpp

@@ -2433,7 +2433,7 @@ void CheckOther::checkInterlockedDecrement()
                 } else if (Token::Match(ifEndTok, "} else { return %name%")) {
                     const Token* secondAccessTok = ifEndTok->tokAt(4);
                     if (secondAccessTok->str() == firstAccessTok->str()) {
-                        raceAfterInterlockedDecrementError( secondAccessTok );
+                        raceAfterInterlockedDecrementError(secondAccessTok);
                     }
                 }
             }

lib/tokenize.cpp

@@ -1039,7 +1039,7 @@ void Tokenizer::simplifyTypedef()
 
         while (!done) {
             std::string pattern = typeName->str();
-            int scope = 0;
+            unsigned int scope = 0;
             bool simplifyType = false;
             bool inMemberFunc = false;
             int memberScope = 0;
@@ -1069,25 +1069,25 @@ void Tokenizer::simplifyTypedef()
 
                             pattern += typeName->str();
                         } else {
-                            --scope;
-                            if (scope < 0)
+                            if (scope == 0)
                                 break;
+                            --scope;
                         }
                     }
 
                     // check for member functions
                     else if (isCPP() && Token::Match(tok2, ") const| {")) {
                         const Token *func = tok2->link()->previous();
-                        if (!func)
+                        if (!func || !func->previous()) // Ticket #4239
                             continue;
 
-                        if (func->previous()) { // Ticket #4239
                         /** @todo add support for multi-token operators */
                         if (func->previous()->str() == "operator")
                             func = func->previous();
 
                         if (!func->previous()) // #7020
                             syntaxError(func);
+
                         // check for qualifier
                         if (func->previous()->str() == "::") {
                             // check for available and matching class name
@@ -1098,7 +1098,6 @@ void Tokenizer::simplifyTypedef()
                             }
                         }
                     }
-                    }
 
                     // check for entering a new scope
                     else if (tok2->str() == "{") {