From 5b20025c30d23d521e12c1f33ec8fa6b821952cd Mon Sep 17 00:00:00 2001 From: dim Date: Sat, 22 Dec 2012 15:00:54 +0000 Subject: Vendor import of clang tags/RELEASE_32/final r170710 (effectively, 3.2 release): http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_32/final@170710 --- lib/Parse/ParseStmt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Parse/ParseStmt.cpp') diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp index f604e03..5883115 100644 --- a/lib/Parse/ParseStmt.cpp +++ b/lib/Parse/ParseStmt.cpp @@ -2197,7 +2197,7 @@ StmtResult Parser::ParseCXXCatchBlock(bool FnCatch) { // The name in a catch exception-declaration is local to the handler and // shall not be redeclared in the outermost block of the handler. ParseScope CatchScope(this, Scope::DeclScope | Scope::ControlScope | - (FnCatch ? Scope::FnCatchScope : 0)); + (FnCatch ? Scope::FnCatchScope : Scope::CatchScope)); // exception-declaration is equivalent to '...' or a parameter-declaration // without default arguments. -- cgit v1.1