From 2bfba6efb0de4366cf4cde9918fced0bf8fbd2da Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Tue, 9 Dec 2008 17:39:44 +0000 Subject: [PATCH] Correct getCompositeScope() for index bindings, bug 257818. --- .../composite/cpp/CompositeCPPDeferredClassInstance.java | 8 ++++++-- .../core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java index 2e07eeca398..3b57f356c54 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java @@ -11,7 +11,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.index.composite.cpp; -import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IType; @@ -57,7 +56,12 @@ public class CompositeCPPDeferredClassInstance extends CompositeCPPClassType imp return ((ICPPDeferredClassInstance) rbinding).getUnknownName(); } - public ICPPScope asScope() throws DOMException { + @Override + public ICPPScope getCompositeScope() { + return asScope(); + } + + public ICPPScope asScope() { if (unknownScope == null) { unknownScope= new CompositeCPPUnknownScope(this, getUnknownName()); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java index 269a2e19d94..0c648c50c53 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java @@ -80,7 +80,7 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization implements ICPP } public IScope getCompositeScope() throws DOMException { - return ((ICPPClassType) getSpecializedBinding()).getCompositeScope(); + return asScope(); } public boolean isSameType(IType type) {