diff options
| author | Erik Verbruggen <erik.verbruggen@me.com> | 2014-03-24 16:06:39 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-03-27 13:46:55 +0100 |
| commit | b0618281ecaa71a99dea7235c3c955b2135cc127 (patch) | |
| tree | 100f2aee0d2bf17637508b468df150a017f2206e /src/libs/3rdparty/cplusplus/CoreTypes.h | |
| parent | 186570a25999964e338e55eed08e5a0843a74650 (diff) | |
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>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/CoreTypes.h')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/CoreTypes.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libs/3rdparty/cplusplus/CoreTypes.h b/src/libs/3rdparty/cplusplus/CoreTypes.h index e3c797f1c3..d957767178 100644 --- a/src/libs/3rdparty/cplusplus/CoreTypes.h +++ b/src/libs/3rdparty/cplusplus/CoreTypes.h @@ -46,7 +46,7 @@ public: protected: virtual void accept0(TypeVisitor *visitor); - virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const; + virtual bool match0(const Type *otherType, Matcher *matcher) const; }; class CPLUSPLUS_EXPORT VoidType: public Type @@ -62,7 +62,7 @@ public: protected: virtual void accept0(TypeVisitor *visitor); - virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const; + virtual bool match0(const Type *otherType, Matcher *matcher) const; }; class CPLUSPLUS_EXPORT IntegerType: public Type @@ -96,7 +96,7 @@ public: protected: virtual void accept0(TypeVisitor *visitor); - virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const; + virtual bool match0(const Type *otherType, Matcher *matcher) const; private: int _kind; @@ -127,7 +127,7 @@ public: protected: virtual void accept0(TypeVisitor *visitor); - virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const; + virtual bool match0(const Type *otherType, Matcher *matcher) const; private: int _kind; @@ -151,7 +151,7 @@ public: protected: virtual void accept0(TypeVisitor *visitor); - virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const; + virtual bool match0(const Type *otherType, Matcher *matcher) const; private: FullySpecifiedType _elementType; @@ -176,7 +176,7 @@ public: protected: virtual void accept0(TypeVisitor *visitor); - virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const; + virtual bool match0(const Type *otherType, Matcher *matcher) const; private: const Name *_memberName; @@ -202,7 +202,7 @@ public: protected: virtual void accept0(TypeVisitor *visitor); - virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const; + virtual bool match0(const Type *otherType, Matcher *matcher) const; private: FullySpecifiedType _elementType; @@ -228,7 +228,7 @@ public: protected: virtual void accept0(TypeVisitor *visitor); - virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const; + virtual bool match0(const Type *otherType, Matcher *matcher) const; private: FullySpecifiedType _elementType; @@ -253,7 +253,7 @@ public: protected: virtual void accept0(TypeVisitor *visitor); - virtual bool matchType0(const Type *otherType, TypeMatcher *matcher) const; + virtual bool match0(const Type *otherType, Matcher *matcher) const; private: const Name *_name; |