Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Ridge2015-08-14 23:04:57 +0000
committerGerrit Code Review @ Eclipse.org2015-08-22 01:49:47 +0000
commitbea6a49e5bc0c807298272b92df7c1eb0a570f97 (patch)
tree85d8c01eea4dc6c36f913fec9d4920e25fca3a4c
parent71ed78fcbef9ef8e620ab9a2d043763981bcaeaf (diff)
downloadorg.eclipse.cdt-bea6a49e5bc0c807298272b92df7c1eb0a570f97.tar.gz
org.eclipse.cdt-bea6a49e5bc0c807298272b92df7c1eb0a570f97.tar.xz
org.eclipse.cdt-bea6a49e5bc0c807298272b92df7c1eb0a570f97.zip
Bug 475006 - Fix a ClassCastException in OverrideIndicatorManager
Change-Id: I4ecdc242d2a94ade3cecb6f689c326a0e58078dd Signed-off-by: Nathan Ridge <zeratul976@hotmail.com>
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java
index 1b2e30b8d60..cc905010c15 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java
@@ -218,9 +218,12 @@ public class OverrideIndicatorManager implements ICReconcilingListener {
if (!foundInDirectlyDerivedBaseClass) {
ICPPClassType indirectingClass = null;
for (ICPPBase base : bases) {
- indirectingClass = (ICPPClassType)base.getBaseClass();
- if (getOverriddenMethodInBaseClass(indirectingClass, method, point) != null)
- break;
+ IBinding baseClass = base.getBaseClass();
+ if (baseClass instanceof ICPPClassType) {
+ indirectingClass = (ICPPClassType) baseClass;
+ if (getOverriddenMethodInBaseClass(indirectingClass, method, point) != null)
+ break;
+ }
}
if (indirectingClass != null) {
sb.append(' ');

Back to the top