diff options
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/SemaAccess.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 5 | ||||
| -rw-r--r-- | lib/Sema/SemaType.cpp | 4 |
3 files changed, 4 insertions, 7 deletions
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; |