Skip to content
Snippets Groups Projects
Unverified Commit bc5b65a1 authored by bunnei's avatar bunnei Committed by GitHub
Browse files

Merge pull request #785 from lioncash/fs

partition_filesystem: Use std::move where applicable
parents 1ff3bea6 db48ebb9
No related branches found
No related tags found
No related merge requests found
...@@ -65,8 +65,8 @@ PartitionFilesystem::PartitionFilesystem(std::shared_ptr<VfsFile> file) { ...@@ -65,8 +65,8 @@ PartitionFilesystem::PartitionFilesystem(std::shared_ptr<VfsFile> file) {
std::string name( std::string name(
reinterpret_cast<const char*>(&file_data[strtab_offset + entry.strtab_offset])); reinterpret_cast<const char*>(&file_data[strtab_offset + entry.strtab_offset]));
pfs_files.emplace_back( pfs_files.emplace_back(std::make_shared<OffsetVfsFile>(
std::make_shared<OffsetVfsFile>(file, entry.size, content_offset + entry.offset, name)); file, entry.size, content_offset + entry.offset, std::move(name)));
} }
status = Loader::ResultStatus::Success; status = Loader::ResultStatus::Success;
...@@ -109,7 +109,7 @@ bool PartitionFilesystem::ReplaceFileWithSubdirectory(VirtualFile file, VirtualD ...@@ -109,7 +109,7 @@ bool PartitionFilesystem::ReplaceFileWithSubdirectory(VirtualFile file, VirtualD
return false; return false;
const std::ptrdiff_t offset = std::distance(pfs_files.begin(), iter); const std::ptrdiff_t offset = std::distance(pfs_files.begin(), iter);
pfs_files[offset] = pfs_files.back(); pfs_files[offset] = std::move(pfs_files.back());
pfs_files.pop_back(); pfs_files.pop_back();
pfs_dirs.emplace_back(std::move(dir)); pfs_dirs.emplace_back(std::move(dir));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment