INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-11 14:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1643 from MerryMage/make_unique

Browse Source 
Common: Remove Common::make_unique, use std::make_unique
This commit is contained in:
Mathew Maidment
2016-04-05 20:10:11 -04:00
parent b393408496 a06dcfeb61
commit aa6380e5bc
24 changed files with 46 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/loader/loader.cpp
View File

@ -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;
}

1
src/core/loader/ncch.cpp
View File

@ -7,7 +7,6 @@
#include <memory>
#include "common/logging/log.h"
#include "common/make_unique.h"
#include "common/string_util.h"
#include "common/swap.h"