aboutsummaryrefslogtreecommitdiff
path: root/src/core/file_sys/content_archive.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-12-12 01:54:28 -0800
committerGitHub <noreply@github.com>2020-12-12 01:54:28 -0800
commit69b46dd607e92e50b2f83e35bb7301bb9f41d460 (patch)
tree34c48167b9b422315021a0be86db7ae76cc835fa /src/core/file_sys/content_archive.cpp
parentc918c6480f9426518df5e741db34620aec350c48 (diff)
parentb1657b8c6b4ef07dd6eea92f4559a32ca3e0894a (diff)
Merge pull request #5183 from lioncash/alias2
vfs: Use existing type aliases consistently
Diffstat (limited to 'src/core/file_sys/content_archive.cpp')
-rw-r--r--src/core/file_sys/content_archive.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp
index 363ff980f..a6c0337fa 100644
--- a/src/core/file_sys/content_archive.cpp
+++ b/src/core/file_sys/content_archive.cpp
@@ -519,15 +519,17 @@ Loader::ResultStatus NCA::GetStatus() const {
return status;
}
-std::vector<std::shared_ptr<VfsFile>> NCA::GetFiles() const {
- if (status != Loader::ResultStatus::Success)
+std::vector<VirtualFile> NCA::GetFiles() const {
+ if (status != Loader::ResultStatus::Success) {
return {};
+ }
return files;
}
-std::vector<std::shared_ptr<VfsDirectory>> NCA::GetSubdirectories() const {
- if (status != Loader::ResultStatus::Success)
+std::vector<VirtualDir> NCA::GetSubdirectories() const {
+ if (status != Loader::ResultStatus::Success) {
return {};
+ }
return dirs;
}
@@ -535,7 +537,7 @@ std::string NCA::GetName() const {
return file->GetName();
}
-std::shared_ptr<VfsDirectory> NCA::GetParentDirectory() const {
+VirtualDir NCA::GetParentDirectory() const {
return file->GetContainingDirectory();
}