diff options
Diffstat (limited to 'lib/Parse/Parser.cpp')
| -rw-r--r-- | lib/Parse/Parser.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp index 84a1381443..51223a7ccf 100644 --- a/lib/Parse/Parser.cpp +++ b/lib/Parse/Parser.cpp @@ -420,8 +420,9 @@ Parser::DeclTy *Parser::ParseDeclarationOrFunctionDefinition() { Tok.is(tok::kw___attribute)) { // int X() __attr__ -> not a function def // FALL THROUGH. } else if (DeclaratorInfo.isFunctionDeclarator() && - (Tok.is(tok::l_brace) || // int X() {} - isDeclarationSpecifier())) { // int X(f) int f; {} + (Tok.is(tok::l_brace) || // int X() {} + ( !getLang().CPlusPlus && + isDeclarationSpecifier() ))) { // int X(f) int f; {} if (DS.getStorageClassSpec() == DeclSpec::SCS_typedef) { Diag(Tok, diag::err_function_declared_typedef); |