Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Ridge2019-05-23 21:00:15 -0400
committerNathan Ridge2019-05-26 19:29:57 -0400
commit9e4c36a7ab1abdad4651d2687d5881103b3a9419 (patch)
tree971894ebec04a4eec4b82df4ac06b3d04a1fe607 /core/org.eclipse.cdt.core
parent1204bf21b161bbc93d7342f3e51d8d4b8b0d4d31 (diff)
downloadorg.eclipse.cdt-9e4c36a7ab1abdad4651d2687d5881103b3a9419.tar.gz
org.eclipse.cdt-9e4c36a7ab1abdad4651d2687d5881103b3a9419.tar.xz
org.eclipse.cdt-9e4c36a7ab1abdad4651d2687d5881103b3a9419.zip
Bug 547533 - Avoid ClassCastException in EvalTypeId.getValue()
Diffstat (limited to 'core/org.eclipse.cdt.core')
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java
index 1abb5425a0..85bd7612c1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java
@@ -158,7 +158,7 @@ public class EvalTypeId extends CPPDependentEvaluation {
return CompositeValue.create(classType);
} else if (ctor == AGGREGATE_INITIALIZATION) {
return CompositeValue.create(new EvalInitList(fArguments, getTemplateDefinition()), classType);
- } else if (ctor != null) {
+ } else if (ctor instanceof ICPPConstructor) {
EvalConstructor evalCtor = new EvalConstructor(classType, (ICPPConstructor) ctor, fArguments,
getTemplateDefinition());
ICPPEvaluation computedEvalCtor = evalCtor.computeForFunctionCall(new ActivationRecord(),

Back to the top