1 files changed, 14 insertions, 9 deletions
diff --git a/include/clang/Edit/FileOffset.h b/include/clang/Edit/FileOffset.h
index 0c1e72b84e51..02c1b96b3331 100644
--- a/include/clang/Edit/FileOffset.h
+++ b/include/clang/Edit/FileOffset.h
@@ -1,4 +1,4 @@
-//===----- FileOffset.h - Offset in a file ----------------------*- C++ -*-===//
+//===- FileOffset.h - Offset in a file --------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,17 +11,18 @@
 #define LLVM_CLANG_EDIT_FILEOFFSET_H
 
 #include "clang/Basic/SourceLocation.h"
+#include <tuple>
 
 namespace clang {
-
 namespace edit {
 
 class FileOffset {
   FileID FID;
-  unsigned Offs;
+  unsigned Offs = 0;
+
 public:
-  FileOffset() : Offs(0) { }
-  FileOffset(FileID fid, unsigned offs) : FID(fid), Offs(offs) { }
+  FileOffset() = default;
+  FileOffset(FileID fid, unsigned offs) : FID(fid), Offs(offs) {}
 
   bool isInvalid() const { return FID.isInvalid(); }
 
@@ -37,25 +38,29 @@ public:
   friend bool operator==(FileOffset LHS, FileOffset RHS) {
     return LHS.FID == RHS.FID && LHS.Offs == RHS.Offs;
   }
+
   friend bool operator!=(FileOffset LHS, FileOffset RHS) {
     return !(LHS == RHS);
   }
+
   friend bool operator<(FileOffset LHS, FileOffset RHS) {
     return std::tie(LHS.FID, LHS.Offs) < std::tie(RHS.FID, RHS.Offs);
   }
+
   friend bool operator>(FileOffset LHS, FileOffset RHS) {
     return RHS < LHS;
   }
+
   friend bool operator>=(FileOffset LHS, FileOffset RHS) {
     return !(LHS < RHS);
   }
+
   friend bool operator<=(FileOffset LHS, FileOffset RHS) {
     return !(RHS < LHS);
   }
 };
 
-}
-
-} // end namespace clang
+} // namespace edit
+} // namespace clang
 
-#endif
+#endif // LLVM_CLANG_EDIT_FILEOFFSET_H