diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Basic/Diagnostic.cpp | 7 | ||||
| -rw-r--r-- | clang/lib/Frontend/TextDiagnosticPrinter.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp index 16cb111e2c2..b26d08544f3 100644 --- a/clang/lib/Basic/Diagnostic.cpp +++ b/clang/lib/Basic/Diagnostic.cpp @@ -43,7 +43,8 @@ struct DefaultMappingInfo { }; static const DefaultMappingInfo DefaultMappings[] = { -#define DIAG(ENUM,CLASS,DEFAULT_MAPPING,DESC) { diag::ENUM, DEFAULT_MAPPING-1 }, +#define DIAG(ENUM,CLASS,DEFAULT_MAPPING,DESC,GROUP) \ + { diag::ENUM, DEFAULT_MAPPING-1 }, #include "clang/Basic/DiagnosticCommonKinds.inc" #include "clang/Basic/DiagnosticDriverKinds.inc" #include "clang/Basic/DiagnosticFrontendKinds.inc" @@ -82,7 +83,7 @@ enum { }; /// DiagnosticClasses - The class for each diagnostic. -#define DIAG(ENUM,CLASS,DEFAULT_MAPPING,DESC) CLASS, +#define DIAG(ENUM,CLASS,DEFAULT_MAPPING,DESC,GROUP) CLASS, static unsigned char DiagnosticClassesCommon[] = { #include "clang/Basic/DiagnosticCommonKinds.inc" 0 @@ -163,7 +164,7 @@ static unsigned getBuiltinDiagClass(unsigned DiagID) { /// DiagnosticText - An english message to print for the diagnostic. These /// should be localized. -#define DIAG(ENUM,CLASS,DEFAULT_MAPPING,DESC) DESC, +#define DIAG(ENUM,CLASS,DEFAULT_MAPPING,DESC,GROUP) DESC, static const char * const DiagnosticTextCommon[] = { #include "clang/Basic/DiagnosticCommonKinds.inc" 0 diff --git a/clang/lib/Frontend/TextDiagnosticPrinter.cpp b/clang/lib/Frontend/TextDiagnosticPrinter.cpp index 24f66dac7f4..95837808704 100644 --- a/clang/lib/Frontend/TextDiagnosticPrinter.cpp +++ b/clang/lib/Frontend/TextDiagnosticPrinter.cpp @@ -311,7 +311,7 @@ void TextDiagnosticPrinter::HandleDiagnostic(Diagnostic::Level Level, if (PrintDiagnosticOption) if (const char *Option = Diagnostic::getWarningOptionForDiag(Info.getID())) - OS << " [-" << Option << ']'; + OS << " [-W" << Option << ']'; OS << '\n'; |
