diff options
author | Lioncash <mathew1800@gmail.com> | 2020-12-10 07:31:58 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-12-10 07:44:43 +0100 |
commit | b1657b8c6b4ef07dd6eea92f4559a32ca3e0894a (patch) | |
tree | 6de62e6d506fb1867794956b52d3c2abde6054bd /src/core/file_sys/vfs_layered.cpp | |
parent | Merge pull request #5179 from ReinUsesLisp/fs-path (diff) | |
download | yuzu-b1657b8c6b4ef07dd6eea92f4559a32ca3e0894a.tar yuzu-b1657b8c6b4ef07dd6eea92f4559a32ca3e0894a.tar.gz yuzu-b1657b8c6b4ef07dd6eea92f4559a32ca3e0894a.tar.bz2 yuzu-b1657b8c6b4ef07dd6eea92f4559a32ca3e0894a.tar.lz yuzu-b1657b8c6b4ef07dd6eea92f4559a32ca3e0894a.tar.xz yuzu-b1657b8c6b4ef07dd6eea92f4559a32ca3e0894a.tar.zst yuzu-b1657b8c6b4ef07dd6eea92f4559a32ca3e0894a.zip |
Diffstat (limited to 'src/core/file_sys/vfs_layered.cpp')
-rw-r--r-- | src/core/file_sys/vfs_layered.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/file_sys/vfs_layered.cpp b/src/core/file_sys/vfs_layered.cpp index 338e398da..434b03cec 100644 --- a/src/core/file_sys/vfs_layered.cpp +++ b/src/core/file_sys/vfs_layered.cpp @@ -20,10 +20,10 @@ VirtualDir LayeredVfsDirectory::MakeLayeredDirectory(std::vector<VirtualDir> dir if (dirs.size() == 1) return dirs[0]; - return std::shared_ptr<VfsDirectory>(new LayeredVfsDirectory(std::move(dirs), std::move(name))); + return VirtualDir(new LayeredVfsDirectory(std::move(dirs), std::move(name))); } -std::shared_ptr<VfsFile> LayeredVfsDirectory::GetFileRelative(std::string_view path) const { +VirtualFile LayeredVfsDirectory::GetFileRelative(std::string_view path) const { for (const auto& layer : dirs) { const auto file = layer->GetFileRelative(path); if (file != nullptr) @@ -33,23 +33,23 @@ std::shared_ptr<VfsFile> LayeredVfsDirectory::GetFileRelative(std::string_view p return nullptr; } -std::shared_ptr<VfsDirectory> LayeredVfsDirectory::GetDirectoryRelative( - std::string_view path) const { +VirtualDir LayeredVfsDirectory::GetDirectoryRelative(std::string_view path) const { std::vector<VirtualDir> out; for (const auto& layer : dirs) { auto dir = layer->GetDirectoryRelative(path); - if (dir != nullptr) + if (dir != nullptr) { out.push_back(std::move(dir)); + } } return MakeLayeredDirectory(std::move(out)); } -std::shared_ptr<VfsFile> LayeredVfsDirectory::GetFile(std::string_view name) const { +VirtualFile LayeredVfsDirectory::GetFile(std::string_view name) const { return GetFileRelative(name); } -std::shared_ptr<VfsDirectory> LayeredVfsDirectory::GetSubdirectory(std::string_view name) const { +VirtualDir LayeredVfsDirectory::GetSubdirectory(std::string_view name) const { return GetDirectoryRelative(name); } @@ -57,7 +57,7 @@ std::string LayeredVfsDirectory::GetFullPath() const { return dirs[0]->GetFullPath(); } -std::vector<std::shared_ptr<VfsFile>> LayeredVfsDirectory::GetFiles() const { +std::vector<VirtualFile> LayeredVfsDirectory::GetFiles() const { std::vector<VirtualFile> out; for (const auto& layer : dirs) { for (const auto& file : layer->GetFiles()) { @@ -72,7 +72,7 @@ std::vector<std::shared_ptr<VfsFile>> LayeredVfsDirectory::GetFiles() const { return out; } -std::vector<std::shared_ptr<VfsDirectory>> LayeredVfsDirectory::GetSubdirectories() const { +std::vector<VirtualDir> LayeredVfsDirectory::GetSubdirectories() const { std::vector<std::string> names; for (const auto& layer : dirs) { for (const auto& sd : layer->GetSubdirectories()) { @@ -101,15 +101,15 @@ std::string LayeredVfsDirectory::GetName() const { return name.empty() ? dirs[0]->GetName() : name; } -std::shared_ptr<VfsDirectory> LayeredVfsDirectory::GetParentDirectory() const { +VirtualDir LayeredVfsDirectory::GetParentDirectory() const { return dirs[0]->GetParentDirectory(); } -std::shared_ptr<VfsDirectory> LayeredVfsDirectory::CreateSubdirectory(std::string_view name) { +VirtualDir LayeredVfsDirectory::CreateSubdirectory(std::string_view name) { return nullptr; } -std::shared_ptr<VfsFile> LayeredVfsDirectory::CreateFile(std::string_view name) { +VirtualFile LayeredVfsDirectory::CreateFile(std::string_view name) { return nullptr; } |