diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java index 6ecc3b1fed8..4156c6de9ff 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java @@ -46,10 +46,9 @@ public abstract class CompositeScope implements IIndexScope { // Note: for c++ namespaces we are returning an arbitrary name final public IName getScopeName() throws DOMException { - IScope scope = rbinding.getScope(); - if(scope==null) - return null; - return scope.getScopeName(); + if(rbinding instanceof IScope) + return ((IScope) rbinding).getScopeName(); + return null; } protected final void fail() {