From 045116f797d70d1988e9d01b90f990a2cf0b725b Mon Sep 17 00:00:00 2001
From: PKEuS <philipp.kloke@web.de>
Date: Mon, 25 Jul 2016 18:22:15 +0200
Subject: [PATCH] Optimized SymbolDatabase::findVariableType().

---
 lib/symboldatabase.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 9c8569d80..1d7ea926e 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -2191,7 +2191,7 @@ const Token *Type::initBaseInfo(const Token *tok, const Token *tok1)
 const std::string& Type::name() const
 {
     const Token* next = classDef->next();
-    if (isEnumType() && classScope && classScope->enumClass)
+    if (classScope && classScope->enumClass && isEnumType())
         return next->strAt(1);
     else if (next->isName())
         return next->str();
@@ -3495,11 +3495,11 @@ const Type* SymbolDatabase::findVariableType(const Scope *start, const Token *ty
         }
 
         // type has a namespace
-        else {
+        else if (type->enclosingScope) {
             bool match = true;
             const Scope *scope = type->enclosingScope;
             const Token *typeTok2 = typeTok->tokAt(-2);
-            while (match && scope && Token::Match(typeTok2, "%any% ::")) {
+            do {
                 // A::B..
                 if (typeTok2->isName() && typeTok2->str().find(":") == std::string::npos) {
                     match &= bool(scope->className == typeTok2->str());
@@ -3510,7 +3510,7 @@ const Type* SymbolDatabase::findVariableType(const Scope *start, const Token *ty
                     match &= bool(scope->type == Scope::eGlobal);
                     break;
                 }
-            }
+            } while (match && scope && Token::Match(typeTok2, "%any% ::"));
 
             if (match)
                 return &(*type);