diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-12-01 20:32:38 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-12-01 23:43:23 -0500 |
| commit | db4523f1ece642475d58f8764863c8930a0812e3 (patch) | |
| tree | 53a96ed05770f77a1dd9bb463863c38e3dffa36c /src/core/hle/service/aoc/aoc_u.cpp | |
| parent | e88cdcc912ae6929f9008c1b307c62f1e7b0637f (diff) | |
filesystem: De-globalize registered_cache_union
We can just return a new instance of this when it's requested. This only
ever holds pointers to the existing registed caches, so it's not a large
object. Plus, this also gets rid of the need to keep around a separate
member function just to properly clear out the union.
Gets rid of one of five globals in the filesystem code.
Diffstat (limited to 'src/core/hle/service/aoc/aoc_u.cpp')
| -rw-r--r-- | src/core/hle/service/aoc/aoc_u.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index bacf19de2..b160c8bee 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp @@ -32,14 +32,14 @@ static std::vector<u64> AccumulateAOCTitleIDs() { std::vector<u64> add_on_content; const auto rcu = FileSystem::GetUnionContents(); const auto list = - rcu->ListEntriesFilter(FileSys::TitleType::AOC, FileSys::ContentRecordType::Data); + rcu.ListEntriesFilter(FileSys::TitleType::AOC, FileSys::ContentRecordType::Data); std::transform(list.begin(), list.end(), std::back_inserter(add_on_content), [](const FileSys::RegisteredCacheEntry& rce) { return rce.title_id; }); add_on_content.erase( std::remove_if( add_on_content.begin(), add_on_content.end(), [&rcu](u64 tid) { - return rcu->GetEntry(tid, FileSys::ContentRecordType::Data)->GetStatus() != + return rcu.GetEntry(tid, FileSys::ContentRecordType::Data)->GetStatus() != Loader::ResultStatus::Success; }), add_on_content.end()); |
