diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-12-05 08:33:13 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-12-05 08:33:17 +0100 |
| commit | edd9bfd54a098f22b2f3c3a75d137cb86ef9a5d0 (patch) | |
| tree | 496b570e6e7dfe86c01b71cc667566d3eca79be1 | |
| parent | Merge pull request #1859 from heapo/lut_array_codegen (diff) | |
| download | yuzu-edd9bfd54a098f22b2f3c3a75d137cb86ef9a5d0.tar yuzu-edd9bfd54a098f22b2f3c3a75d137cb86ef9a5d0.tar.gz yuzu-edd9bfd54a098f22b2f3c3a75d137cb86ef9a5d0.tar.bz2 yuzu-edd9bfd54a098f22b2f3c3a75d137cb86ef9a5d0.tar.lz yuzu-edd9bfd54a098f22b2f3c3a75d137cb86ef9a5d0.tar.xz yuzu-edd9bfd54a098f22b2f3c3a75d137cb86ef9a5d0.tar.zst yuzu-edd9bfd54a098f22b2f3c3a75d137cb86ef9a5d0.zip | |
| -rw-r--r-- | src/core/file_sys/system_archive/system_archive.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/file_sys/system_archive/system_archive.cpp b/src/core/file_sys/system_archive/system_archive.cpp index c9c40a07d..d3883267c 100644 --- a/src/core/file_sys/system_archive/system_archive.cpp +++ b/src/core/file_sys/system_archive/system_archive.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include <functional> #include "common/logging/log.h" #include "core/file_sys/romfs.h" #include "core/file_sys/system_archive/ng_word.h" @@ -13,7 +12,7 @@ namespace FileSys::SystemArchive { constexpr u64 SYSTEM_ARCHIVE_BASE_TITLE_ID = 0x0100000000000800; constexpr std::size_t SYSTEM_ARCHIVE_COUNT = 0x28; -using SystemArchiveSupplier = std::function<VirtualDir()>; +using SystemArchiveSupplier = VirtualDir (*)(); struct SystemArchiveDescriptor { u64 title_id; @@ -21,7 +20,7 @@ struct SystemArchiveDescriptor { SystemArchiveSupplier supplier; }; -const std::array<SystemArchiveDescriptor, SYSTEM_ARCHIVE_COUNT> SYSTEM_ARCHIVES = {{ +constexpr std::array<SystemArchiveDescriptor, SYSTEM_ARCHIVE_COUNT> SYSTEM_ARCHIVES{{ {0x0100000000000800, "CertStore", nullptr}, {0x0100000000000801, "ErrorMessage", nullptr}, {0x0100000000000802, "MiiModel", nullptr}, |