From dc8479928c5aee4c6ad6fe4f59006fb604cee701 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 18 Sep 2016 09:38:01 +0900
Subject: Sources: Run clang-format on everything.

---
 src/core/file_sys/disk_archive.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/core/file_sys/disk_archive.h')

diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h
index b4cc2f702..3f620128f 100644
--- a/src/core/file_sys/disk_archive.h
+++ b/src/core/file_sys/disk_archive.h
@@ -29,11 +29,15 @@ namespace FileSys {
  */
 class DiskArchive : public ArchiveBackend {
 public:
-    DiskArchive(const std::string& mount_point_) : mount_point(mount_point_) {}
+    DiskArchive(const std::string& mount_point_) : mount_point(mount_point_) {
+    }
 
-    virtual std::string GetName() const override { return "DiskArchive: " + mount_point; }
+    virtual std::string GetName() const override {
+        return "DiskArchive: " + mount_point;
+    }
 
-    ResultVal<std::unique_ptr<FileBackend>> OpenFile(const Path& path, const Mode mode) const override;
+    ResultVal<std::unique_ptr<FileBackend>> OpenFile(const Path& path,
+                                                     const Mode mode) const override;
     ResultCode DeleteFile(const Path& path) const override;
     bool RenameFile(const Path& src_path, const Path& dest_path) const override;
     bool DeleteDirectory(const Path& path) const override;
-- 
cgit v1.2.3


From 396a8d91a4423d9c793eeff0798d544613647511 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sun, 18 Sep 2016 18:01:46 -0700
Subject: Manually tweak source formatting and then re-run clang-format

---
 src/core/file_sys/disk_archive.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/core/file_sys/disk_archive.h')

diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h
index 3f620128f..64e36f5ea 100644
--- a/src/core/file_sys/disk_archive.h
+++ b/src/core/file_sys/disk_archive.h
@@ -29,8 +29,7 @@ namespace FileSys {
  */
 class DiskArchive : public ArchiveBackend {
 public:
-    DiskArchive(const std::string& mount_point_) : mount_point(mount_point_) {
-    }
+    DiskArchive(const std::string& mount_point_) : mount_point(mount_point_) {}
 
     virtual std::string GetName() const override {
         return "DiskArchive: " + mount_point;
-- 
cgit v1.2.3


From ebdae19fd226104baec712b9da9939ff82ef3c3a Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 21 Sep 2016 00:21:23 +0900
Subject: Remove empty newlines in #include blocks.

This makes clang-format useful on those.

Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.
---
 src/core/file_sys/disk_archive.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/core/file_sys/disk_archive.h')

diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h
index 64e36f5ea..2165f27f9 100644
--- a/src/core/file_sys/disk_archive.h
+++ b/src/core/file_sys/disk_archive.h
@@ -8,10 +8,8 @@
 #include <memory>
 #include <string>
 #include <vector>
-
 #include "common/common_types.h"
 #include "common/file_util.h"
-
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/directory_backend.h"
 #include "core/file_sys/file_backend.h"
-- 
cgit v1.2.3