Move warning options into DiagnosticOptions.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@86968 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 17 insertions, 5 deletions

diff --git a/include/clang/Frontend/DiagnosticOptions.h b/include/clang/Frontend/DiagnosticOptions.h
index 39dc48ebfe..704769ec12 100644
--- a/include/clang/Frontend/DiagnosticOptions.h
+++ b/include/clang/Frontend/DiagnosticOptions.h
@@ -19,6 +19,10 @@ namespace clang {
 /// engine.
 class DiagnosticOptions {
 public:
+  unsigned IgnoreWarnings : 1;   /// -w
+  unsigned NoRewriteMacros : 1;  /// -Wno-rewrite-macros
+  unsigned Pedantic : 1;         /// -pedantic
+  unsigned PedanticErrors : 1;   /// -pedantic-errors
   unsigned ShowColumn : 1;       /// Show column number on diagnostics.
   unsigned ShowLocation : 1;     /// Show source location information.
   unsigned ShowCarets : 1;       /// Show carets in diagnostics.
@@ -35,16 +39,24 @@ public:
   /// testing and analysis.
   std::string DumpBuildInformation;
 
+  /// The list of -W... options used to alter the diagnostic mappings, with the
+  /// prefixes removed.
+  std::vector<std::string> Warnings;
+
 public:
   DiagnosticOptions() {
-    ShowColumn = 1;
-    ShowLocation = 1;
+    IgnoreWarnings = 0;
+    MessageLength = 0;
+    NoRewriteMacros = 0;
+    Pedantic = 0;
+    PedanticErrors = 0;
     ShowCarets = 1;
+    ShowColors = 0;
+    ShowColumn = 1;
     ShowFixits = 1;
-    ShowSourceRanges = 0;
+    ShowLocation = 1;
     ShowOptionNames = 0;
-    ShowColors = 0;
-    MessageLength = 0;
+    ShowSourceRanges = 0;
   }
 };