aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/ParseDecl.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2012-07-03 23:22:13 +0000
committerFariborz Jahanian <fjahanian@apple.com>2012-07-03 23:22:13 +0000
commitb0ed95c27318730e265d84227a234e83e5e5523b (patch)
treec1f902485b64b3f46d1f7809a13929d69895accc /lib/Parse/ParseDecl.cpp
parentfdaa33818cf9bad8d092136e73bd2e489cb821ba (diff)
Obj-C++11 parser: handle a fall out of delayed
c-function parsing when a declaration with C++0x braced-init-list is inside an @implementation. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159693 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDecl.cpp')
-rw-r--r--lib/Parse/ParseDecl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 21dd46f2e9..a96e29556b 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -1614,7 +1614,7 @@ Decl *Parser::ParseDeclarationAfterDeclaratorAndAttributes(Declarator &D,
/*DirectInit=*/true, TypeContainsAuto);
}
} else if (getLangOpts().CPlusPlus0x && Tok.is(tok::l_brace) &&
- !CurParsedObjCImpl) {
+ (!CurParsedObjCImpl || !D.isFunctionDeclarator())) {
// Parse C++0x braced-init-list.
Diag(Tok, diag::warn_cxx98_compat_generalized_initializer_lists);