diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2012-07-03 23:22:13 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-07-03 23:22:13 +0000 |
| commit | 8be1ecd61558d22d8d17a5c0b1a8e45170bf7789 (patch) | |
| tree | 139b2aaea333a6a0b3c7bad3045f964fac085899 /clang/lib/Parse/ParseDecl.cpp | |
| parent | 017591ab45a849a237f2c4b3265896db194dcbe9 (diff) | |
| download | bcm5719-llvm-8be1ecd61558d22d8d17a5c0b1a8e45170bf7789.tar.gz bcm5719-llvm-8be1ecd61558d22d8d17a5c0b1a8e45170bf7789.zip | |
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.
llvm-svn: 159693
Diffstat (limited to 'clang/lib/Parse/ParseDecl.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 21dd46f2e9f..a96e29556b9 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/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); |
