From 9a25ff506e2e1e35439453aee236fc35f5527edb Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Thu, 28 Aug 2014 00:05:23 -0400 Subject: [PATCH] Bug 405168 - Make EvalID.instantiate() a bit more robust Change-Id: I88caaefc8050d65f137109be7e4b810c6b7a32d9 Signed-off-by: Nathan Ridge Reviewed-on: https://git.eclipse.org/r/32449 Tested-by: Hudson CI Reviewed-by: Sergey Prigogin Tested-by: Sergey Prigogin --- .../cdt/internal/core/dom/parser/cpp/semantics/EvalID.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java index 4be1662cf17..7f8581367f7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java @@ -323,10 +323,7 @@ public class EvalID extends CPPDependentEvaluation { tpMap, packOffset, within, point); } else if (nameOwner instanceof IType) { IType type = CPPTemplates.instantiateType((IType) nameOwner, tpMap, packOffset, within, point); - if (type instanceof IBinding) { - type = getNestedType(type, TDEF); - } - + type = getNestedType(type, TDEF | REF | CVTYPE); if (!(type instanceof IBinding)) return EvalFixed.INCOMPLETE; nameOwner = (IBinding) type;