diff options
| author | bunnei <bunneidev@gmail.com> | 2018-09-26 16:09:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 16:09:16 -0400 |
| commit | 92dd496fb94385aa16adec75d6eb8bc3ef29c6b0 (patch) | |
| tree | 113a0ad25b279c70d825514e9e35020f08a366a4 /src/core/file_sys/vfs_vector.cpp | |
| parent | 9d163c00ccd67dc747c14dee99e9b37fa633e4ac (diff) | |
| parent | 11104b48834b2f8e5c59edc46b794e6ab0bd9c4f (diff) | |
Merge pull request #1401 from lioncash/vfs
vfs: Minor cleanup related changes to layered VFS code
Diffstat (limited to 'src/core/file_sys/vfs_vector.cpp')
| -rw-r--r-- | src/core/file_sys/vfs_vector.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/vfs_vector.cpp b/src/core/file_sys/vfs_vector.cpp index 7033e2c88..389c7e003 100644 --- a/src/core/file_sys/vfs_vector.cpp +++ b/src/core/file_sys/vfs_vector.cpp @@ -9,7 +9,7 @@ namespace FileSys { VectorVfsFile::VectorVfsFile(std::vector<u8> initial_data, std::string name, VirtualDir parent) - : data(std::move(initial_data)), name(std::move(name)), parent(std::move(parent)) {} + : data(std::move(initial_data)), parent(std::move(parent)), name(std::move(name)) {} VectorVfsFile::~VectorVfsFile() = default; @@ -38,13 +38,13 @@ bool VectorVfsFile::IsReadable() const { return true; } -size_t VectorVfsFile::Read(u8* data_, size_t length, size_t offset) const { +std::size_t VectorVfsFile::Read(u8* data_, std::size_t length, std::size_t offset) const { const auto read = std::min(length, data.size() - offset); std::memcpy(data_, data.data() + offset, read); return read; } -size_t VectorVfsFile::Write(const u8* data_, size_t length, size_t offset) { +std::size_t VectorVfsFile::Write(const u8* data_, std::size_t length, std::size_t offset) { if (offset + length > data.size()) data.resize(offset + length); const auto write = std::min(length, data.size() - offset); |
