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/Sema/DeclSpec.cpp | |
| parent | 3110a5cb937395b7dae8311ca15934aaacd5520c (diff) | |
| download | bcm5719-llvm-54a6a68c706b7afb88da0389977de8287ae6478e.tar.gz bcm5719-llvm-54a6a68c706b7afb88da0389977de8287ae6478e.zip | |
Merge some similar diagnostics using %select.
llvm-svn: 253136
Diffstat (limited to 'clang/lib/Sema/DeclSpec.cpp')
| -rw-r--r-- | clang/lib/Sema/DeclSpec.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Sema/DeclSpec.cpp b/clang/lib/Sema/DeclSpec.cpp index 498a375fe1b..053131738b1 100644 --- a/clang/lib/Sema/DeclSpec.cpp +++ b/clang/lib/Sema/DeclSpec.cpp @@ -1057,9 +1057,7 @@ void DeclSpec::Finish(DiagnosticsEngine &D, Preprocessor &PP, const PrintingPoli if (TypeSpecType == TST_unspecified) TypeSpecType = TST_int; // short -> short int, long long -> long long int. else if (TypeSpecType != TST_int) { - Diag(D, TSWLoc, - TypeSpecWidth == TSW_short ? diag::err_invalid_short_spec - : diag::err_invalid_longlong_spec) + Diag(D, TSWLoc, diag::err_invalid_width_spec) << (int)TypeSpecWidth << getSpecifierName((TST)TypeSpecType, Policy); TypeSpecType = TST_int; TypeSpecOwned = false; @@ -1069,7 +1067,7 @@ void DeclSpec::Finish(DiagnosticsEngine &D, Preprocessor &PP, const PrintingPoli if (TypeSpecType == TST_unspecified) TypeSpecType = TST_int; // long -> long int. else if (TypeSpecType != TST_int && TypeSpecType != TST_double) { - Diag(D, TSWLoc, diag::err_invalid_long_spec) + Diag(D, TSWLoc, diag::err_invalid_width_spec) << (int)TypeSpecWidth << getSpecifierName((TST)TypeSpecType, Policy); TypeSpecType = TST_int; TypeSpecOwned = false; |
