diff options
| author | Sergey Prigogin | 2012-11-24 22:57:22 +0000 |
|---|---|---|
| committer | Sergey Prigogin | 2012-11-25 22:35:04 +0000 |
| commit | 974f507c0b7c50024b703f28162804dcc03c6275 (patch) | |
| tree | 6a2b59047dd7c7182a4ad959f50d44d0bca59351 | |
| parent | 8c668bd8772797152058615197e4f5d9c1338275 (diff) | |
| download | org.eclipse.cdt-974f507c0b7c50024b703f28162804dcc03c6275.tar.gz org.eclipse.cdt-974f507c0b7c50024b703f28162804dcc03c6275.tar.xz org.eclipse.cdt-974f507c0b7c50024b703f28162804dcc03c6275.zip | |
Fixed NPE.
| -rw-r--r-- | core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java | 4 |
1 files 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(); } } |