summaryrefslogtreecommitdiffstats
path: root/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2012-12-23 13:04:00 +0000
committerdim <dim@FreeBSD.org>2012-12-23 13:04:00 +0000
commita931043751d62613cff21d7eea760e17669bef4f (patch)
treeb0e228ab641b9204bdb26457f30ee376e0e17fc7 /contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp
parent9e0012da52e98f166c4351de0bd020fbd7b4b49d (diff)
downloadFreeBSD-src-a931043751d62613cff21d7eea760e17669bef4f.zip
FreeBSD-src-a931043751d62613cff21d7eea760e17669bef4f.tar.gz
Upgrade our copy of llvm/clang to 3.2 release.
Release notes for llvm: http://llvm.org/releases/3.2/docs/ReleaseNotes.html Release notes for clang: http://llvm.org/releases/3.2/tools/clang/docs/ReleaseNotes.html MFC after: 2 weeks
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp')
-rw-r--r--contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp b/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp
index f604e03..5883115 100644
--- a/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp
+++ b/contrib/llvm/tools/clang/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.
OpenPOWER on IntegriCloud