AxioDL/nod
2
0
Fork 0
mirror of https://github.com/AxioDL/nod.git synced 2025-12-10 14:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from lioncash/make

Browse Source 
General: Use std::make_unique where applicable
This commit is contained in:
Phillip Stephens
2019-08-30 16:28:53 -07:00
committed by GitHub
parent 793413540d a8753e273f
commit 55301dd505
9 changed files with 144 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/nod.cpp
View File

@@ -55,18 +55,20 @@ std::unique_ptr<DiscBase> OpenDiscFromImage(SystemStringView path, bool& isWii)
return {};
}
bool Err = false;
bool err = false;
std::unique_ptr<DiscBase> ret;
if (isWii) {
ret = std::unique_ptr<DiscBase>(new DiscWii(std::move(discIO), Err));
if (Err)
return {};
ret = std::make_unique<DiscWii>(std::move(discIO), err);
if (err) {
return nullptr;
}
return ret;
}
ret = std::unique_ptr<DiscBase>(new DiscGCN(std::move(discIO), Err));
if (Err)
return {};
ret = std::make_unique<DiscGCN>(std::move(discIO), err);
if (err) {
return nullptr;
}
return ret;
}