diff options
author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2017-07-04 14:56:04 +0200 |
---|---|---|
committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2017-07-11 13:38:56 +0000 |
commit | 550ed2927d69b637f4d1a0fa1351b408963cdeac (patch) | |
tree | 127aa9bf627e24f208e86b47143bc823b376f9ba /src/libs/3rdparty/cplusplus | |
parent | 53c85a26765152ba6b24bead30810d800621f683 (diff) |
C++: fix lookups for functions with const args
Make declarations equal in case they differ only
by argument const and/or volatile (13.1.3.4).
Task-number: QTCREATORBUG-18475
Change-Id: Id0561fda3b9081b92716a8739ba9963e90b5d709
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/libs/3rdparty/cplusplus')
-rw-r--r-- | src/libs/3rdparty/cplusplus/Symbols.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/libs/3rdparty/cplusplus/Symbols.cpp b/src/libs/3rdparty/cplusplus/Symbols.cpp index f7423e7742..9a84ccacd6 100644 --- a/src/libs/3rdparty/cplusplus/Symbols.cpp +++ b/src/libs/3rdparty/cplusplus/Symbols.cpp @@ -337,8 +337,22 @@ bool Function::isSignatureEqualTo(const Function *other, Matcher *matcher) const for (unsigned i = 0; i < argc; ++i) { Symbol *l = argumentAt(i); Symbol *r = other->argumentAt(i); - if (! l->type().match(r->type(), matcher)) + if (! l->type().match(r->type(), matcher)) { + if (!l->type()->isReferenceType() && !l->type()->isPointerType() + && !l->type()->isPointerToMemberType() + && !r->type()->isReferenceType() && !r->type()->isPointerType() + && !r->type()->isPointerToMemberType()) { + FullySpecifiedType lType = l->type(); + FullySpecifiedType rType = r->type(); + lType.setConst(false); + lType.setVolatile(false); + rType.setConst(false); + rType.setVolatile(false); + if (lType.match(rType)) + continue; + } return false; + } } return true; } |