commit 7307d6ca967edef535f2a9d2d3d25bb5ab14d90e
author Douglas Gregor <dgregor@apple.com> Wed Dec 10 06:34:36 2008 +0000
committer Douglas Gregor <dgregor@apple.com> Wed Dec 10 06:34:36 2008 +0000
tree e88e5be63348093bba99432a2fef371d5619dc98
parent 4637c3c6988d47600d556dbb51d87b48cbd7d5cf

Use a scoped object to manage entry/exit from a parser scope rather than explicitly calling EnterScope/ExitScope

llvm-svn: 60830

clang/lib/Parse/ParseTemplate.cpp

diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp
index c1120d5..d21dc4a 100644
--- a/clang/lib/Parse/ParseTemplate.cpp
+++ b/clang/lib/Parse/ParseTemplate.cpp
@@ -41,7 +41,7 @@
   SourceLocation TemplateLoc = ConsumeToken();
   
   // Enter template-parameter scope.
-  EnterScope(Scope::TemplateParamScope);
+  ParseScope TemplateParmScope(this, Scope::TemplateParamScope);
 
   // Try to parse the template parameters, and the declaration if
   // successful.
@@ -49,9 +49,6 @@
   if(ParseTemplateParameters(0))
     TemplateDecl = ParseDeclarationOrFunctionDefinition();
 
-  // Leave template-parameter scope.
-  ExitScope();
-
   return TemplateDecl;
 }