C++: Do type and name equality checking in a safe manner.

Change the TypeMatcher to also match names, and use two "block" lists
in SafeMatcher to prevent infinite recursion.

Task-number: QTCREATORBUG-11240
Change-Id: I0367ae795ee6be579b83aeb8d46723c877e4aa75
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

src/libs/3rdparty/cplusplus/Control.cpp

@@ -25,7 +25,6 @@
 #include "CoreTypes.h"
 #include "Symbols.h"
 #include "Names.h"
-#include "TypeMatcher.h"
 #include <map>
 #include <set>
 #include <algorithm>
@@ -479,8 +478,6 @@ public:
     TranslationUnit *translationUnit;
     DiagnosticClient *diagnosticClient;
 
-    TypeMatcher matcher;
-
     LiteralTable<Identifier> identifiers;
     LiteralTable<StringLiteral> stringLiterals;
     LiteralTable<NumericLiteral> numericLiterals;