diff options
| author | Craig Topper <craig.topper@gmail.com> | 2015-11-14 18:16:08 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@gmail.com> | 2015-11-14 18:16:08 +0000 |
| commit | 54a6a68c706b7afb88da0389977de8287ae6478e (patch) | |
| tree | f6b3017334a3d736ae6ad9d2ff0414480c9440a0 /clang/lib/Parse/Parser.cpp | |
| parent | 3110a5cb937395b7dae8311ca15934aaacd5520c (diff) | |
| download | llvm-54a6a68c706b7afb88da0389977de8287ae6478e.zip llvm-54a6a68c706b7afb88da0389977de8287ae6478e.tar.gz llvm-54a6a68c706b7afb88da0389977de8287ae6478e.tar.bz2 | |
Merge some similar diagnostics using %select.
llvm-svn: 253136
Diffstat (limited to 'clang/lib/Parse/Parser.cpp')
| -rw-r--r-- | clang/lib/Parse/Parser.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index 26dc399..b3eeb9d 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -1094,14 +1094,16 @@ Decl *Parser::ParseFunctionDefinition(ParsingDeclarator &D, SourceLocation KWLoc; if (TryConsumeToken(tok::kw_delete, KWLoc)) { Diag(KWLoc, getLangOpts().CPlusPlus11 - ? diag::warn_cxx98_compat_deleted_function - : diag::ext_deleted_function); + ? diag::warn_cxx98_compat_defaulted_deleted_function + : diag::ext_defaulted_deleted_function) + << 1 /* deleted */; Actions.SetDeclDeleted(Res, KWLoc); Delete = true; } else if (TryConsumeToken(tok::kw_default, KWLoc)) { Diag(KWLoc, getLangOpts().CPlusPlus11 - ? diag::warn_cxx98_compat_defaulted_function - : diag::ext_defaulted_function); + ? diag::warn_cxx98_compat_defaulted_deleted_function + : diag::ext_defaulted_deleted_function) + << 0 /* defaulted */; Actions.SetDeclDefaulted(Res, KWLoc); } else { llvm_unreachable("function definition after = not 'delete' or 'default'"); |