mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fixed NPE.

Browse source
This commit is contained in:
Sergey Prigogin 2012-11-24 14:57:22 -08:00
parent a00758b82c
commit 45206789d6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalID.java
View file

@ -336,7 +336,7 @@ public class EvalID extends CPPEvaluation {
@Override @Override
public int determinePackSize(ICPPTemplateParameterMap tpMap) { 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) { for (ICPPTemplateArgument arg : fTemplateArgs) {
r = CPPTemplates.combinePackSize(r, CPPTemplates.determinePackSize(arg, tpMap)); r = CPPTemplates.combinePackSize(r, CPPTemplates.determinePackSize(arg, tpMap));
} }
@ -345,6 +345,6 @@ public class EvalID extends CPPEvaluation {
@Override @Override
public boolean referencesTemplateParameter() { public boolean referencesTemplateParameter() {
return fFieldOwner.referencesTemplateParameter(); return fFieldOwner != null && fFieldOwner.referencesTemplateParameter();
} }
} }