1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00

Fixed NPE.

This commit is contained in:
Sergey Prigogin 2012-11-24 14:57:22 -08:00
parent 8c668bd877
commit 974f507c0b

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();
} }
} }