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/vfs_offset.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/vfs_offset.h')
| -rw-r--r-- | src/core/file_sys/vfs_offset.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/vfs_offset.h b/src/core/file_sys/vfs_offset.h index f7b7a3256..b2ccc5c7b 100644 --- a/src/core/file_sys/vfs_offset.h +++ b/src/core/file_sys/vfs_offset.h @@ -17,14 +17,14 @@ namespace FileSys { // the size of this wrapper. class OffsetVfsFile : public VfsFile { public: - OffsetVfsFile(std::shared_ptr<VfsFile> file, std::size_t size, std::size_t offset = 0, + OffsetVfsFile(VirtualFile file, std::size_t size, std::size_t offset = 0, std::string new_name = "", VirtualDir new_parent = nullptr); ~OffsetVfsFile() override; std::string GetName() const override; std::size_t GetSize() const override; bool Resize(std::size_t new_size) override; - std::shared_ptr<VfsDirectory> GetContainingDirectory() const override; + VirtualDir GetContainingDirectory() const override; bool IsWritable() const override; bool IsReadable() const override; std::size_t Read(u8* data, std::size_t length, std::size_t offset) const override; @@ -42,7 +42,7 @@ public: private: std::size_t TrimToFit(std::size_t r_size, std::size_t r_offset) const; - std::shared_ptr<VfsFile> file; + VirtualFile file; std::size_t offset; std::size_t size; std::string name; |
