commit 48c05be124b3643f52902546fb51806aeb0b9273
author Abramo Bagnara <abramo.bagnara@gmail.com> Mon Feb 06 14:41:24 2012 +0000
committer Abramo Bagnara <abramo.bagnara@gmail.com> Mon Feb 06 14:41:24 2012 +0000
tree 8f18889b0d0ed4575c4181d503560d252326bb5c
parent 7c3f09d416fc93e50b32c9a9d37f4fece189c0ea

Added location for template keyword in TemplateSpecializationTypeLoc. In the process removed some naming ambiguities.

llvm-svn: 149870

clang/lib/Parse/ParseTemplate.cpp

diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp
index 04050c0..87e1a6c 100644
--- a/clang/lib/Parse/ParseTemplate.cpp
+++ b/clang/lib/Parse/ParseTemplate.cpp
@@ -798,10 +798,9 @@
   // 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 @@
 
   TypeResult Type
     = Actions.ActOnTemplateIdType(TemplateId->SS,
+                                  TemplateId->TemplateKWLoc,
                                   TemplateId->Template,
                                   TemplateId->TemplateNameLoc,
                                   TemplateId->LAngleLoc,