diff options
| author | 2016-04-05 13:29:55 +0100 | |
|---|---|---|
| committer | 2016-04-05 13:31:17 +0100 | |
| commit | a06dcfeb61d6769c562d6d50cfa3c0024176ae82 (patch) | |
| tree | e1f81e5faebce62810ac079b8a6e616182c34959 /src/core/loader/loader.cpp | |
| parent | Merge pull request #1302 from Subv/save_fix (diff) | |
| download | yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.gz yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.xz yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.zip | |
Common: Remove Common::make_unique, use std::make_unique
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 @@ | |||
| 6 | #include <string> | 6 | #include <string> |
| 7 | 7 | ||
| 8 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 9 | #include "common/make_unique.h" | ||
| 10 | #include "common/string_util.h" | 9 | #include "common/string_util.h" |
| 11 | 10 | ||
| 12 | #include "core/file_sys/archive_romfs.h" | 11 | #include "core/file_sys/archive_romfs.h" |
| @@ -120,7 +119,7 @@ ResultStatus LoadFile(const std::string& filename) { | |||
| 120 | AppLoader_THREEDSX app_loader(std::move(file), filename_filename, filename); | 119 | AppLoader_THREEDSX app_loader(std::move(file), filename_filename, filename); |
| 121 | // Load application and RomFS | 120 | // Load application and RomFS |
| 122 | if (ResultStatus::Success == app_loader.Load()) { | 121 | if (ResultStatus::Success == app_loader.Load()) { |
| 123 | Service::FS::RegisterArchiveType(Common::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); | 122 | Service::FS::RegisterArchiveType(std::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); |
| 124 | return ResultStatus::Success; | 123 | return ResultStatus::Success; |
| 125 | } | 124 | } |
| 126 | break; | 125 | break; |
| @@ -139,7 +138,7 @@ ResultStatus LoadFile(const std::string& filename) { | |||
| 139 | // Load application and RomFS | 138 | // Load application and RomFS |
| 140 | ResultStatus result = app_loader.Load(); | 139 | ResultStatus result = app_loader.Load(); |
| 141 | if (ResultStatus::Success == result) { | 140 | if (ResultStatus::Success == result) { |
| 142 | Service::FS::RegisterArchiveType(Common::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); | 141 | Service::FS::RegisterArchiveType(std::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); |
| 143 | } | 142 | } |
| 144 | return result; | 143 | return result; |
| 145 | } | 144 | } |