Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Ridge2014-08-28 04:05:23 +0000
committerSergey Prigogin2014-08-28 16:14:12 +0000
commit9a25ff506e2e1e35439453aee236fc35f5527edb (patch)
tree55c2b1d5ecb75f708f5884afbe883b5c0004c397
parent83169e23d6722ede825da4369a72b1937939048b (diff)
downloadorg.eclipse.cdt-9a25ff506e2e1e35439453aee236fc35f5527edb.tar.gz
org.eclipse.cdt-9a25ff506e2e1e35439453aee236fc35f5527edb.tar.xz
org.eclipse.cdt-9a25ff506e2e1e35439453aee236fc35f5527edb.zip
Bug 405168 - Make EvalID.instantiate() a bit more robust
Change-Id: I88caaefc8050d65f137109be7e4b810c6b7a32d9 Signed-off-by: Nathan Ridge <zeratul976@hotmail.com> Reviewed-on: https://git.eclipse.org/r/32449 Tested-by: Hudson CI Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com> Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java5
1 files changed, 1 insertions, 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;

Back to the top