diff options
| author |  bunnei | 2018-07-23 20:36:59 -0700 |
|---|---|---|
| committer |  GitHub | 2018-07-23 20:36:59 -0700 |
| commit | bc5b65a1b02340af978f24a4d1b84a7824b8fb84 (patch) | |
| tree | 6ae735e15f17d1f73a065b0a0f52038d02e12e02 /src | |
| parent | Merge pull request #791 from bunnei/rg32f-rgba32f-bgra8 (diff) | |
| parent | partition_filesystem: Use std::move where applicable (diff) | |
| download | yuzu-bc5b65a1b02340af978f24a4d1b84a7824b8fb84.tar.gz yuzu-bc5b65a1b02340af978f24a4d1b84a7824b8fb84.tar.xz yuzu-bc5b65a1b02340af978f24a4d1b84a7824b8fb84.zip | |
Merge pull request #785 from lioncash/fs
partition_filesystem: Use std::move where applicable
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/file_sys/partition_filesystem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/partition_filesystem.cpp b/src/core/file_sys/partition_filesystem.cpp index 8d2bd9f6b..521e21078 100644 --- a/src/core/file_sys/partition_filesystem.cpp +++ b/src/core/file_sys/partition_filesystem.cpp | |||
| @@ -65,8 +65,8 @@ PartitionFilesystem::PartitionFilesystem(std::shared_ptr<VfsFile> file) { | |||
| 65 | std::string name( | 65 | std::string name( |
| 66 | reinterpret_cast<const char*>(&file_data[strtab_offset + entry.strtab_offset])); | 66 | reinterpret_cast<const char*>(&file_data[strtab_offset + entry.strtab_offset])); |
| 67 | 67 | ||
| 68 | pfs_files.emplace_back( | 68 | pfs_files.emplace_back(std::make_shared<OffsetVfsFile>( |
| 69 | std::make_shared<OffsetVfsFile>(file, entry.size, content_offset + entry.offset, name)); | 69 | file, entry.size, content_offset + entry.offset, std::move(name))); |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | status = Loader::ResultStatus::Success; | 72 | status = Loader::ResultStatus::Success; |
| @@ -109,7 +109,7 @@ bool PartitionFilesystem::ReplaceFileWithSubdirectory(VirtualFile file, VirtualD | |||
| 109 | return false; | 109 | return false; |
| 110 | 110 | ||
| 111 | const std::ptrdiff_t offset = std::distance(pfs_files.begin(), iter); | 111 | const std::ptrdiff_t offset = std::distance(pfs_files.begin(), iter); |
| 112 | pfs_files[offset] = pfs_files.back(); | 112 | pfs_files[offset] = std::move(pfs_files.back()); |
| 113 | pfs_files.pop_back(); | 113 | pfs_files.pop_back(); |
| 114 | 114 | ||
| 115 | pfs_dirs.emplace_back(std::move(dir)); | 115 | pfs_dirs.emplace_back(std::move(dir)); |