feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Ignore return type on function overrides comparison

Browse Source 
Change-Id: I9933e1cc1fb996181e818e2ea0aff76f9255f849
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Orgad Shaneh
2013-12-05 19:51:53 +02:00
committed by Orgad Shaneh
parent a625d9656c
commit 0ce3f3e68c
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libs/3rdparty/cplusplus/Symbols.cpp vendored
View File

@@ -222,27 +222,24 @@ int Function::methodKey() const
void Function::setMethodKey(int key)
{ f._methodKey = key; }
bool Function::isEqualTo(const Type *other) const
bool Function::isSignatureEqualTo(const Function *other) const
{
const Function *o = other->asFunctionType();
if (! o)
if (! other)
return false;
else if (isConst() != o->isConst())
else if (isConst() != other->isConst())
return false;
else if (isVolatile() != o->isVolatile())
else if (isVolatile() != other->isVolatile())
return false;
const Name *l = unqualifiedName();
const Name *r = o->unqualifiedName();
const Name *r = other->unqualifiedName();
if (l == r || (l && l->isEqualTo(r))) {
const unsigned argc = argumentCount();
if (argc != o->argumentCount())
return false;
else if (! _returnType.isEqualTo(o->_returnType))
if (argc != other->argumentCount())
return false;
for (unsigned i = 0; i < argc; ++i) {
Symbol *l = argumentAt(i);
Symbol *r = o->argumentAt(i);
Symbol *r = other->argumentAt(i);
if (! l->type().isEqualTo(r->type()))
return false;
}
@@ -251,6 +248,14 @@ bool Function::isEqualTo(const Type *other) const
return false;
}
bool Function::isEqualTo(const Type *other) const
{
const Function *o = other->asFunctionType();
if (!isSignatureEqualTo(o))
return false;
return _returnType.isEqualTo(o->_returnType);
}
void Function::accept0(TypeVisitor *visitor)
{ visitor->visit(this); }