commit 77f7ced62ee49e29d208dcef8a2325a35f2df9ce
author Douglas Gregor <doug.gregor@gmail.com> Tue Feb 10 19:52:54 2009 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Tue Feb 10 19:52:54 2009 +0000
tree 445c3649c3f3c1423beb9a24a6a9e30749af6867
parent 9225a7e7e87fc7cb22260ae16d5f42ed82f08314

Fix a problem with bogus template shadowing warnings

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64230 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Parse/ParseTemplate.cpp

diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp
index d17d244..7424530 100644
--- a/lib/Parse/ParseTemplate.cpp
+++ b/lib/Parse/ParseTemplate.cpp
@@ -251,9 +251,12 @@
   SourceLocation TemplateLoc = ConsumeToken();
   TemplateParameterList TemplateParams; 
   SourceLocation LAngleLoc, RAngleLoc;
-  if(!ParseTemplateParameters(Depth + 1, TemplateParams, LAngleLoc,
-                              RAngleLoc)) {
-    return 0;
+  {
+    ParseScope TemplateParmScope(this, Scope::TemplateParamScope);
+    if(!ParseTemplateParameters(Depth + 1, TemplateParams, LAngleLoc,
+                                RAngleLoc)) {
+      return 0;
+    }
   }
 
   // Generate a meaningful error if the user forgot to put class before the