diff options
| author | 2014-12-15 22:15:08 -0500 | |
|---|---|---|
| committer | 2014-12-15 22:15:08 -0500 | |
| commit | cd2a31eaf4a35568a18840eba7d3cdac59881d2f (patch) | |
| tree | 37a4d61adebae300e8ef172538c6a2d2eae80ff1 /src/core/loader/loader.cpp | |
| parent | Update README.md (diff) | |
| parent | Work around libstdc++'s lack of support for std::hash on enums (diff) | |
| download | yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.gz yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.xz yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.zip | |
Merge pull request #283 from yuriks/archive-refactor
Archive refactor
Diffstat (limited to 'src/core/loader/loader.cpp')
| -rw-r--r-- | src/core/loader/loader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 3883e1307..463dacca3 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include "core/loader/3dsx.h" | 8 | #include "core/loader/3dsx.h" |
| 9 | #include "core/loader/elf.h" | 9 | #include "core/loader/elf.h" |
| 10 | #include "core/loader/ncch.h" | 10 | #include "core/loader/ncch.h" |
| 11 | #include "core/hle/kernel/archive.h" | 11 | #include "core/hle/service/fs/archive.h" |
| 12 | #include "core/mem_map.h" | 12 | #include "core/mem_map.h" |
| 13 | 13 | ||
| 14 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 14 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| @@ -74,7 +74,7 @@ ResultStatus LoadFile(const std::string& filename) { | |||
| 74 | 74 | ||
| 75 | // Load application and RomFS | 75 | // Load application and RomFS |
| 76 | if (ResultStatus::Success == app_loader.Load()) { | 76 | if (ResultStatus::Success == app_loader.Load()) { |
| 77 | Kernel::CreateArchive(new FileSys::Archive_RomFS(app_loader), "RomFS"); | 77 | Service::FS::CreateArchive(std::make_unique<FileSys::Archive_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); |
| 78 | return ResultStatus::Success; | 78 | return ResultStatus::Success; |
| 79 | } | 79 | } |
| 80 | break; | 80 | break; |