1 files changed, 18 insertions, 14 deletions

diff --git a/include/clang/Frontend/TextDiagnosticBuffer.h b/include/clang/Frontend/TextDiagnosticBuffer.h
index 23f168e2232df..2295f9dbf3bfb 100644
--- a/include/clang/Frontend/TextDiagnosticBuffer.h
+++ b/include/clang/Frontend/TextDiagnosticBuffer.h
@@ -1,4 +1,4 @@
-//===--- TextDiagnosticBuffer.h - Buffer Text Diagnostics -------*- C++ -*-===//
+//===- TextDiagnosticBuffer.h - Buffer Text Diagnostics ---------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -15,37 +15,41 @@
 #define LLVM_CLANG_FRONTEND_TEXTDIAGNOSTICBUFFER_H
 
 #include "clang/Basic/Diagnostic.h"
+#include "clang/Basic/SourceLocation.h"
+#include <cstddef>
+#include <string>
+#include <utility>
 #include <vector>
 
 namespace clang {
 
-class Preprocessor;
-class SourceManager;
-
 class TextDiagnosticBuffer : public DiagnosticConsumer {
 public:
-  typedef std::vector<std::pair<SourceLocation, std::string> > DiagList;
-  typedef DiagList::iterator iterator;
-  typedef DiagList::const_iterator const_iterator;
+  using DiagList = std::vector<std::pair<SourceLocation, std::string>>;
+  using iterator = DiagList::iterator;
+  using const_iterator = DiagList::const_iterator;
+
 private:
   DiagList Errors, Warnings, Remarks, Notes;
+
   /// All - All diagnostics in the order in which they were generated.  That
   /// order likely doesn't correspond to user input order, but it at least
   /// keeps notes in the right places.  Each pair in the vector is a diagnostic
   /// level and an index into the corresponding DiagList above.
   std::vector<std::pair<DiagnosticsEngine::Level, size_t>> All;
+
 public:
-  const_iterator err_begin() const  { return Errors.begin(); }
-  const_iterator err_end() const    { return Errors.end(); }
+  const_iterator err_begin() const { return Errors.begin(); }
+  const_iterator err_end() const { return Errors.end(); }
 
   const_iterator warn_begin() const { return Warnings.begin(); }
-  const_iterator warn_end() const   { return Warnings.end(); }
+  const_iterator warn_end() const { return Warnings.end(); }
 
   const_iterator remark_begin() const { return Remarks.begin(); }
-  const_iterator remark_end() const   { return Remarks.end(); }
+  const_iterator remark_end() const { return Remarks.end(); }
 
   const_iterator note_begin() const { return Notes.begin(); }
-  const_iterator note_end() const   { return Notes.end(); }
+  const_iterator note_end() const { return Notes.end(); }
 
   void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
                         const Diagnostic &Info) override;
@@ -55,6 +59,6 @@ public:
   void FlushDiagnostics(DiagnosticsEngine &Diags) const;
 };
 
-} // end namspace clang
+} // namespace clang
 
-#endif
+#endif // LLVM_CLANG_FRONTEND_TEXTDIAGNOSTICBUFFER_H