diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2016-04-05 14:29:55 +0200 |
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2016-04-05 14:31:17 +0200 |
| commit | a06dcfeb61d6769c562d6d50cfa3c0024176ae82 (patch) | |
| tree | e1f81e5faebce62810ac079b8a6e616182c34959 /src/core/loader/loader.cpp | |
| parent | Merge pull request #1302 from Subv/save_fix (diff) | |
| download | yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.gz yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.bz2 yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.lz yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.xz yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.zst yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.zip | |
Diffstat (limited to 'src/core/loader/loader.cpp')
| -rw-r--r-- | src/core/loader/loader.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index b1907cd55..886501c41 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -6,7 +6,6 @@ #include <string> #include "common/logging/log.h" -#include "common/make_unique.h" #include "common/string_util.h" #include "core/file_sys/archive_romfs.h" @@ -120,7 +119,7 @@ ResultStatus LoadFile(const std::string& filename) { AppLoader_THREEDSX app_loader(std::move(file), filename_filename, filename); // Load application and RomFS if (ResultStatus::Success == app_loader.Load()) { - Service::FS::RegisterArchiveType(Common::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); + Service::FS::RegisterArchiveType(std::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); return ResultStatus::Success; } break; @@ -139,7 +138,7 @@ ResultStatus LoadFile(const std::string& filename) { // Load application and RomFS ResultStatus result = app_loader.Load(); if (ResultStatus::Success == result) { - Service::FS::RegisterArchiveType(Common::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); + Service::FS::RegisterArchiveType(std::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); } return result; } |