diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Parse/ParseCXXInlineMethods.cpp | 4 | ||||
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 7 | ||||
| -rw-r--r-- | lib/Parse/Parser.cpp | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaAccess.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 5 | ||||
| -rw-r--r-- | lib/Sema/SemaType.cpp | 4 |
6 files changed, 12 insertions, 14 deletions
diff --git a/lib/Parse/ParseCXXInlineMethods.cpp b/lib/Parse/ParseCXXInlineMethods.cpp index d5b240ab79..51dc5c88f8 100644 --- a/lib/Parse/ParseCXXInlineMethods.cpp +++ b/lib/Parse/ParseCXXInlineMethods.cpp @@ -76,7 +76,7 @@ Decl *Parser::ParseCXXInlineMethodDef(AccessSpecifier AS, if (Tok.is(tok::kw_delete)) { Diag(Tok, getLang().CPlusPlus0x ? diag::warn_cxx98_compat_deleted_function : - diag::warn_deleted_function_accepted_as_extension); + diag::ext_deleted_function); KWLoc = ConsumeToken(); Actions.SetDeclDeleted(FnD, KWLoc); @@ -84,7 +84,7 @@ Decl *Parser::ParseCXXInlineMethodDef(AccessSpecifier AS, } else if (Tok.is(tok::kw_default)) { Diag(Tok, getLang().CPlusPlus0x ? diag::warn_cxx98_compat_defaulted_function : - diag::warn_defaulted_function_accepted_as_extension); + diag::ext_defaulted_function); KWLoc = ConsumeToken(); Actions.SetDeclDefaulted(FnD, KWLoc); diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index 94f7b9bb7d..ee4a51e184 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -2725,9 +2725,10 @@ void Parser::ParseStructUnionBody(SourceLocation RecordLoc, // Empty structs are an extension in C (C99 6.7.2.1p7), but are allowed in // C++. - if (Tok.is(tok::r_brace) && !getLang().CPlusPlus) - Diag(Tok, diag::ext_empty_struct_union) - << (TagType == TST_union); + if (Tok.is(tok::r_brace) && !getLang().CPlusPlus) { + Diag(Tok, diag::ext_empty_struct_union) << (TagType == TST_union); + Diag(Tok, diag::warn_empty_struct_union_compat) << (TagType == TST_union); + } SmallVector<Decl *, 32> FieldDecls; diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp index b2de1046fd..8cfc02bde1 100644 --- a/lib/Parse/Parser.cpp +++ b/lib/Parse/Parser.cpp @@ -933,7 +933,7 @@ Decl *Parser::ParseFunctionDefinition(ParsingDeclarator &D, if (Tok.is(tok::kw_delete)) { Diag(Tok, getLang().CPlusPlus0x ? diag::warn_cxx98_compat_deleted_function : - diag::warn_deleted_function_accepted_as_extension); + diag::ext_deleted_function); KWLoc = ConsumeToken(); Actions.SetDeclDeleted(Res, KWLoc); @@ -941,7 +941,7 @@ Decl *Parser::ParseFunctionDefinition(ParsingDeclarator &D, } else if (Tok.is(tok::kw_default)) { Diag(Tok, getLang().CPlusPlus0x ? diag::warn_cxx98_compat_defaulted_function : - diag::warn_defaulted_function_accepted_as_extension); + diag::ext_defaulted_function); KWLoc = ConsumeToken(); Actions.SetDeclDefaulted(Res, KWLoc); diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index acc19d6c92..7991a46ca6 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/lib/Sema/SemaAccess.cpp @@ -1166,7 +1166,7 @@ static bool IsMicrosoftUsingDeclarationAccessBug(Sema& S, if (Entity.getTargetDecl()->getAccess() == AS_private && (OrigDecl->getAccess() == AS_public || OrigDecl->getAccess() == AS_protected)) { - S.Diag(AccessLoc, diag::war_ms_using_declaration_inaccessible) + S.Diag(AccessLoc, diag::ext_ms_using_declaration_inaccessible) << Shadow->getUsingDecl()->getQualifiedNameAsString() << OrigDecl->getQualifiedNameAsString(); return true; diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index e8fa40f263..7a28a44823 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -2242,10 +2242,7 @@ ExprResult Sema::ActOnDesignatedInitializer(Designation &Desig, InitExpressions.data(), InitExpressions.size(), Loc, GNUSyntax, Init.takeAs<Expr>()); - if (getLangOptions().CPlusPlus) - Diag(DIE->getLocStart(), diag::ext_designated_init_cxx) - << DIE->getSourceRange(); - else if (!getLangOptions().C99) + if (!getLangOptions().C99) Diag(DIE->getLocStart(), diag::ext_designated_init) << DIE->getSourceRange(); diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index 34f6a93528..3cececb8c4 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -1357,9 +1357,9 @@ QualType Sema::BuildArrayType(QualType T, ArrayType::ArraySizeModifier ASM, else Diag(Loc, diag::ext_vla); } else if (ASM != ArrayType::Normal || Quals != 0) - Diag(Loc, + Diag(Loc, getLangOptions().CPlusPlus? diag::err_c99_array_usage_cxx - : diag::ext_c99_array_usage); + : diag::ext_c99_array_usage) << ASM; } return T; |