summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/filesystem/filesystem.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-10-16 15:05:47 +0200
committerLioncash <mathew1800@gmail.com>2018-10-16 15:38:52 +0200
commit39ae73b356a253036283b114855f8c5ddbb20f49 (patch)
treeb36ca87fcca87afb202c637bc2e5ee2ca6d9d823 /src/core/hle/service/filesystem/filesystem.cpp
parentMerge pull request #1473 from lioncash/cmake (diff)
downloadyuzu-39ae73b356a253036283b114855f8c5ddbb20f49.tar
yuzu-39ae73b356a253036283b114855f8c5ddbb20f49.tar.gz
yuzu-39ae73b356a253036283b114855f8c5ddbb20f49.tar.bz2
yuzu-39ae73b356a253036283b114855f8c5ddbb20f49.tar.lz
yuzu-39ae73b356a253036283b114855f8c5ddbb20f49.tar.xz
yuzu-39ae73b356a253036283b114855f8c5ddbb20f49.tar.zst
yuzu-39ae73b356a253036283b114855f8c5ddbb20f49.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/filesystem/filesystem.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp
index e06712603..e32a7c48e 100644
--- a/src/core/hle/service/filesystem/filesystem.cpp
+++ b/src/core/hle/service/filesystem/filesystem.cpp
@@ -319,13 +319,12 @@ ResultVal<FileSys::VirtualDir> OpenSDMC() {
return sdmc_factory->Open();
}
-std::shared_ptr<FileSys::RegisteredCacheUnion> GetUnionContents() {
- return std::make_shared<FileSys::RegisteredCacheUnion>(
- std::vector<std::shared_ptr<FileSys::RegisteredCache>>{
- GetSystemNANDContents(), GetUserNANDContents(), GetSDMCContents()});
+std::unique_ptr<FileSys::RegisteredCacheUnion> GetUnionContents() {
+ return std::make_unique<FileSys::RegisteredCacheUnion>(std::vector<FileSys::RegisteredCache*>{
+ GetSystemNANDContents(), GetUserNANDContents(), GetSDMCContents()});
}
-std::shared_ptr<FileSys::RegisteredCache> GetSystemNANDContents() {
+FileSys::RegisteredCache* GetSystemNANDContents() {
LOG_TRACE(Service_FS, "Opening System NAND Contents");
if (bis_factory == nullptr)
@@ -334,7 +333,7 @@ std::shared_ptr<FileSys::RegisteredCache> GetSystemNANDContents() {
return bis_factory->GetSystemNANDContents();
}
-std::shared_ptr<FileSys::RegisteredCache> GetUserNANDContents() {
+FileSys::RegisteredCache* GetUserNANDContents() {
LOG_TRACE(Service_FS, "Opening User NAND Contents");
if (bis_factory == nullptr)
@@ -343,7 +342,7 @@ std::shared_ptr<FileSys::RegisteredCache> GetUserNANDContents() {
return bis_factory->GetUserNANDContents();
}
-std::shared_ptr<FileSys::RegisteredCache> GetSDMCContents() {
+FileSys::RegisteredCache* GetSDMCContents() {
LOG_TRACE(Service_FS, "Opening SDMC Contents");
if (sdmc_factory == nullptr)