franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #785 from lioncash/fs 

partition_filesystem: Use std::move where applicable
This commit is contained in:
bunnei 2018-07-23 20:36:59 -07:00 committed by GitHub
parent 1ff3bea6c7 db48ebb9c9
commit bc5b65a1b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/file_sys/partition_filesystem.cpp
View 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
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));