diff options
| author | bunnei <bunneidev@gmail.com> | 2020-12-12 01:54:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-12 01:54:28 -0800 |
| commit | 69b46dd607e92e50b2f83e35bb7301bb9f41d460 (patch) | |
| tree | 34c48167b9b422315021a0be86db7ae76cc835fa /src/core/file_sys/content_archive.h | |
| parent | c918c6480f9426518df5e741db34620aec350c48 (diff) | |
| parent | b1657b8c6b4ef07dd6eea92f4559a32ca3e0894a (diff) | |
Merge pull request #5183 from lioncash/alias2
vfs: Use existing type aliases consistently
Diffstat (limited to 'src/core/file_sys/content_archive.h')
| -rw-r--r-- | src/core/file_sys/content_archive.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/file_sys/content_archive.h b/src/core/file_sys/content_archive.h index 69292232a..e9eccdea3 100644 --- a/src/core/file_sys/content_archive.h +++ b/src/core/file_sys/content_archive.h @@ -82,7 +82,7 @@ struct NCAHeader { }; static_assert(sizeof(NCAHeader) == 0x400, "NCAHeader has incorrect size."); -inline bool IsDirectoryExeFS(const std::shared_ptr<VfsDirectory>& pfs) { +inline bool IsDirectoryExeFS(const VirtualDir& pfs) { // According to switchbrew, an exefs must only contain these two files: return pfs->GetFile("main") != nullptr && pfs->GetFile("main.npdm") != nullptr; } @@ -104,10 +104,10 @@ public: Loader::ResultStatus GetStatus() const; - std::vector<std::shared_ptr<VfsFile>> GetFiles() const override; - std::vector<std::shared_ptr<VfsDirectory>> GetSubdirectories() const override; + std::vector<VirtualFile> GetFiles() const override; + std::vector<VirtualDir> GetSubdirectories() const override; std::string GetName() const override; - std::shared_ptr<VfsDirectory> GetParentDirectory() const override; + VirtualDir GetParentDirectory() const override; NCAContentType GetType() const; u64 GetTitleId() const; |
