diff options
| author | 2016-09-20 23:52:38 -0700 | |
|---|---|---|
| committer | 2016-09-21 00:15:56 -0700 | |
| commit | 84fbbe26297652d994d203bde543ec252c2d801a (patch) | |
| tree | 5f6fcc088dab9d53ee30e64b47fce2e04c8fb13c /src/core/file_sys | |
| parent | Remove empty newlines in #include blocks. (diff) | |
| download | yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.gz yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.xz yuzu-84fbbe26297652d994d203bde543ec252c2d801a.zip | |
Use negative priorities to avoid special-casing the self-include
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/archive_backend.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_extsavedata.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_romfs.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_savedata.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_savedatacheck.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_sdmc.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_systemsavedata.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/disk_archive.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/ivfc_archive.cpp | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/src/core/file_sys/archive_backend.cpp b/src/core/file_sys/archive_backend.cpp index 5c02fb748..1fae0ede0 100644 --- a/src/core/file_sys/archive_backend.cpp +++ b/src/core/file_sys/archive_backend.cpp | |||
| @@ -2,12 +2,12 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/file_sys/archive_backend.h" | ||
| 6 | #include <cstddef> | 5 | #include <cstddef> |
| 7 | #include <iomanip> | 6 | #include <iomanip> |
| 8 | #include <sstream> | 7 | #include <sstream> |
| 9 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 10 | #include "common/string_util.h" | 9 | #include "common/string_util.h" |
| 10 | #include "core/file_sys/archive_backend.h" | ||
| 11 | #include "core/memory.h" | 11 | #include "core/memory.h" |
| 12 | 12 | ||
| 13 | namespace FileSys { | 13 | namespace FileSys { |
diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index ed9fecd64..e1d29efd3 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/file_sys/archive_extsavedata.h" | ||
| 6 | #include <algorithm> | 5 | #include <algorithm> |
| 7 | #include <memory> | 6 | #include <memory> |
| 8 | #include <vector> | 7 | #include <vector> |
| @@ -10,6 +9,7 @@ | |||
| 10 | #include "common/file_util.h" | 9 | #include "common/file_util.h" |
| 11 | #include "common/logging/log.h" | 10 | #include "common/logging/log.h" |
| 12 | #include "common/string_util.h" | 11 | #include "common/string_util.h" |
| 12 | #include "core/file_sys/archive_extsavedata.h" | ||
| 13 | #include "core/file_sys/disk_archive.h" | 13 | #include "core/file_sys/disk_archive.h" |
| 14 | #include "core/hle/service/fs/archive.h" | 14 | #include "core/hle/service/fs/archive.h" |
| 15 | 15 | ||
diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp index 7c0e1da21..6c99ca5b4 100644 --- a/src/core/file_sys/archive_romfs.cpp +++ b/src/core/file_sys/archive_romfs.cpp | |||
| @@ -2,11 +2,11 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/file_sys/archive_romfs.h" | ||
| 6 | #include <algorithm> | 5 | #include <algorithm> |
| 7 | #include <memory> | 6 | #include <memory> |
| 8 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 9 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 9 | #include "core/file_sys/archive_romfs.h" | ||
| 10 | #include "core/file_sys/ivfc_archive.h" | 10 | #include "core/file_sys/ivfc_archive.h" |
| 11 | 11 | ||
| 12 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 12 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index 829f97743..6711035ec 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp | |||
| @@ -2,13 +2,13 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/file_sys/archive_savedata.h" | ||
| 6 | #include <algorithm> | 5 | #include <algorithm> |
| 7 | #include <memory> | 6 | #include <memory> |
| 8 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 9 | #include "common/file_util.h" | 8 | #include "common/file_util.h" |
| 10 | #include "common/logging/log.h" | 9 | #include "common/logging/log.h" |
| 11 | #include "common/string_util.h" | 10 | #include "common/string_util.h" |
| 11 | #include "core/file_sys/archive_savedata.h" | ||
| 12 | #include "core/file_sys/disk_archive.h" | 12 | #include "core/file_sys/disk_archive.h" |
| 13 | #include "core/hle/kernel/process.h" | 13 | #include "core/hle/kernel/process.h" |
| 14 | #include "core/hle/service/fs/archive.h" | 14 | #include "core/hle/service/fs/archive.h" |
diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp index 8bdf24b1f..6c4542b7d 100644 --- a/src/core/file_sys/archive_savedatacheck.cpp +++ b/src/core/file_sys/archive_savedatacheck.cpp | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/file_sys/archive_savedatacheck.h" | ||
| 6 | #include <algorithm> | 5 | #include <algorithm> |
| 7 | #include <memory> | 6 | #include <memory> |
| 8 | #include <vector> | 7 | #include <vector> |
| @@ -10,6 +9,7 @@ | |||
| 10 | #include "common/file_util.h" | 9 | #include "common/file_util.h" |
| 11 | #include "common/logging/log.h" | 10 | #include "common/logging/log.h" |
| 12 | #include "common/string_util.h" | 11 | #include "common/string_util.h" |
| 12 | #include "core/file_sys/archive_savedatacheck.h" | ||
| 13 | #include "core/file_sys/ivfc_archive.h" | 13 | #include "core/file_sys/ivfc_archive.h" |
| 14 | #include "core/hle/service/fs/archive.h" | 14 | #include "core/hle/service/fs/archive.h" |
| 15 | 15 | ||
diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp index 887cfbb0f..bcb03ed36 100644 --- a/src/core/file_sys/archive_sdmc.cpp +++ b/src/core/file_sys/archive_sdmc.cpp | |||
| @@ -2,11 +2,11 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/file_sys/archive_sdmc.h" | ||
| 6 | #include <algorithm> | 5 | #include <algorithm> |
| 7 | #include <memory> | 6 | #include <memory> |
| 8 | #include "common/file_util.h" | 7 | #include "common/file_util.h" |
| 9 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 9 | #include "core/file_sys/archive_sdmc.h" | ||
| 10 | #include "core/file_sys/disk_archive.h" | 10 | #include "core/file_sys/disk_archive.h" |
| 11 | #include "core/settings.h" | 11 | #include "core/settings.h" |
| 12 | 12 | ||
diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp index b3dfcf897..48ebc0ed4 100644 --- a/src/core/file_sys/archive_systemsavedata.cpp +++ b/src/core/file_sys/archive_systemsavedata.cpp | |||
| @@ -2,13 +2,13 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/file_sys/archive_systemsavedata.h" | ||
| 6 | #include <algorithm> | 5 | #include <algorithm> |
| 7 | #include <memory> | 6 | #include <memory> |
| 8 | #include <vector> | 7 | #include <vector> |
| 9 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 10 | #include "common/file_util.h" | 9 | #include "common/file_util.h" |
| 11 | #include "common/string_util.h" | 10 | #include "common/string_util.h" |
| 11 | #include "core/file_sys/archive_systemsavedata.h" | ||
| 12 | #include "core/file_sys/disk_archive.h" | 12 | #include "core/file_sys/disk_archive.h" |
| 13 | #include "core/hle/service/fs/archive.h" | 13 | #include "core/hle/service/fs/archive.h" |
| 14 | 14 | ||
diff --git a/src/core/file_sys/disk_archive.cpp b/src/core/file_sys/disk_archive.cpp index 7e88473bd..0f66998e1 100644 --- a/src/core/file_sys/disk_archive.cpp +++ b/src/core/file_sys/disk_archive.cpp | |||
| @@ -2,13 +2,13 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/file_sys/disk_archive.h" | ||
| 6 | #include <algorithm> | 5 | #include <algorithm> |
| 7 | #include <cstdio> | 6 | #include <cstdio> |
| 8 | #include <memory> | 7 | #include <memory> |
| 9 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 10 | #include "common/file_util.h" | 9 | #include "common/file_util.h" |
| 11 | #include "common/logging/log.h" | 10 | #include "common/logging/log.h" |
| 11 | #include "core/file_sys/disk_archive.h" | ||
| 12 | 12 | ||
| 13 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 13 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 14 | // FileSys namespace | 14 | // FileSys namespace |
diff --git a/src/core/file_sys/ivfc_archive.cpp b/src/core/file_sys/ivfc_archive.cpp index 5add3254b..49cc1de10 100644 --- a/src/core/file_sys/ivfc_archive.cpp +++ b/src/core/file_sys/ivfc_archive.cpp | |||
| @@ -2,11 +2,11 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/file_sys/ivfc_archive.h" | ||
| 6 | #include <cstring> | 5 | #include <cstring> |
| 7 | #include <memory> | 6 | #include <memory> |
| 8 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 9 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 9 | #include "core/file_sys/ivfc_archive.h" | ||
| 10 | 10 | ||
| 11 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 11 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 12 | // FileSys namespace | 12 | // FileSys namespace |