diff options
author | Abramo Bagnara <abramo.bagnara@gmail.com> | 2012-02-06 14:41:24 +0000 |
---|---|---|
committer | Abramo Bagnara <abramo.bagnara@gmail.com> | 2012-02-06 14:41:24 +0000 |
commit | 55d23c925b058be29b792008ddb7d68f6c4fa9a0 (patch) | |
tree | b40af2313959f24b57eaa640c0d19e4fd7d30613 /lib/Parse/ParseTemplate.cpp | |
parent | 668ecd9c8d428bdb2cd3566c8caf83b870609b4a (diff) |
Added location for template keyword in TemplateSpecializationTypeLoc. In the process removed some naming ambiguities.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149870 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseTemplate.cpp')
-rw-r--r-- | lib/Parse/ParseTemplate.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp index 04050c0edb..87e1a6c0ff 100644 --- a/lib/Parse/ParseTemplate.cpp +++ b/lib/Parse/ParseTemplate.cpp @@ -798,10 +798,9 @@ bool Parser::AnnotateTemplateIdToken(TemplateTy Template, TemplateNameKind TNK, // Build the annotation token. if (TNK == TNK_Type_template && AllowTypeAnnotation) { TypeResult Type - = Actions.ActOnTemplateIdType(SS, + = Actions.ActOnTemplateIdType(SS, TemplateKWLoc, Template, TemplateNameLoc, - LAngleLoc, TemplateArgsPtr, - RAngleLoc); + LAngleLoc, TemplateArgsPtr, RAngleLoc); if (Type.isInvalid()) { // If we failed to parse the template ID but skipped ahead to a >, we're not // going to be able to form a token annotation. Eat the '>' if present. @@ -879,6 +878,7 @@ void Parser::AnnotateTemplateIdTokenAsType() { TypeResult Type = Actions.ActOnTemplateIdType(TemplateId->SS, + TemplateId->TemplateKWLoc, TemplateId->Template, TemplateId->TemplateNameLoc, TemplateId->LAngleLoc, |