1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00

Reuse CPPTemplates.isValidArgument() is TemplateArgumentDeduction

Change-Id: I85abc02f4fe36719c16fcb52b4c675b9ab46d449
Reviewed-on: https://git.eclipse.org/r/9697
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
IP-Clean: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
This commit is contained in:
Nathan Ridge 2013-01-16 05:00:37 -05:00 committed by Sergey Prigogin
parent 1c88eba523
commit 0cca070d73

View file

@ -636,16 +636,8 @@ public class TemplateArgumentDeduction {
deducedArg= tpar.getDefaultValue();
if (deducedArg != null) {
deducedArg= CPPTemplates.instantiateArgument(deducedArg, tpMap, -1, null, point);
if (deducedArg != null) {
if (deducedArg instanceof CPPTemplateTypeArgument) {
CPPTemplateTypeArgument deducedTypeArg = (CPPTemplateTypeArgument) deducedArg;
if (!(deducedTypeArg.getTypeValue() instanceof ISemanticProblem)) {
tpMap.put(tpar, deducedArg);
}
} else {
// TODO: Check for problems in non-type or template template parameters?
tpMap.put(tpar, deducedArg);
}
if (CPPTemplates.isValidArgument(deducedArg)) {
tpMap.put(tpar, deducedArg);
}
}
}