From 974f507c0b7c50024b703f28162804dcc03c6275 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sat, 24 Nov 2012 14:57:22 -0800 Subject: [PATCH] Fixed NPE. --- .../cdt/internal/core/dom/parser/cpp/semantics/EvalID.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 2c3cc53bf77..4cbea3195e5 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 @@ -336,7 +336,7 @@ public class EvalID extends CPPEvaluation { @Override public int determinePackSize(ICPPTemplateParameterMap tpMap) { - int r = fFieldOwner.determinePackSize(tpMap); + int r = fFieldOwner != null ? fFieldOwner.determinePackSize(tpMap) : CPPTemplates.PACK_SIZE_NOT_FOUND; for (ICPPTemplateArgument arg : fTemplateArgs) { r = CPPTemplates.combinePackSize(r, CPPTemplates.determinePackSize(arg, tpMap)); } @@ -345,6 +345,6 @@ public class EvalID extends CPPEvaluation { @Override public boolean referencesTemplateParameter() { - return fFieldOwner.referencesTemplateParameter(); + return fFieldOwner != null && fFieldOwner.referencesTemplateParameter(); } }