mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

Fixed an "unsafe method call" exception.

Browse source 
Change-Id: Iacc5a6a5c410766bd14ef2ec4ac626d1077e93b6
Signed-off-by: Nathan Ridge <zeratul976@hotmail.com>
Reviewed-on: https://git.eclipse.org/r/14398
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
IP-Clean: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
This commit is contained in:
Nathan Ridge 2013-07-08 22:52:11 -04:00 • committed by Sergey Prigogin
parent c5b4670184
commit 982b93967b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/Value.java
View file

@ -355,7 +355,7 @@ public class Value implements IValue {
type1 = SemanticUtil.getNestedType(type1, TDEF); type1 = SemanticUtil.getNestedType(type1, TDEF);
type2 = SemanticUtil.getNestedType(type2, TDEF); type2 = SemanticUtil.getNestedType(type2, TDEF);
if (type1 instanceof ICPPClassType && type2 instanceof ICPPClassType) { if (type1 instanceof ICPPClassType && type2 instanceof ICPPClassType) {
return ClassTypeHelper.isSubclass((ICPPClassType) type2, (ICPPClassType) type1) ? 1 : 0; return ClassTypeHelper.isSubclass((ICPPClassType) type2, (ICPPClassType) type1, point) ? 1 : 0;
} else { } else {
return 0; return 0;
} }

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java
View file

@ -309,8 +309,8 @@ public class ClassTypeHelper {
* Checks inheritance relationship between two classes. * Checks inheritance relationship between two classes.
* @return <code>true</code> if {@code subclass} is a subclass of {@code superclass}. * @return <code>true</code> if {@code subclass} is a subclass of {@code superclass}.
*/ */
public static boolean isSubclass(ICPPClassType subclass, ICPPClassType superclass) { public static boolean isSubclass(ICPPClassType subclass, ICPPClassType superclass, IASTNode point) {
ICPPBase[] bases= subclass.getBases(); ICPPBase[] bases= getBases(subclass, point);
for (ICPPBase base : bases) { for (ICPPBase base : bases) {
IBinding b= base.getBaseClass(); IBinding b= base.getBaseClass();
if (b instanceof ICPPClassType) { if (b instanceof ICPPClassType) {
@ -318,7 +318,7 @@ public class ClassTypeHelper {
if (baseClass.isSameType(superclass)) { if (baseClass.isSameType(superclass)) {
return true; return true;
} }
if (isSubclass(baseClass, superclass)) { if (isSubclass(baseClass, superclass, point)) {
return true; return true;
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LinkedNamesFinder.java
View file

@ -314,7 +314,7 @@ public class LinkedNamesFinder {
if (binding instanceof ICPPClassType) { if (binding instanceof ICPPClassType) {
if (seenClasses.add(binding)) { if (seenClasses.add(binding)) {
ICPPClassType candidate = (ICPPClassType) binding; ICPPClassType candidate = (ICPPClassType) binding;
if (ClassTypeHelper.isSubclass(candidate, baseClass)) { if (ClassTypeHelper.isSubclass(candidate, baseClass, name)) {
subclasses.add(candidate); subclasses.add(candidate);
} }
} }