Просмотр исходного кода

Merge pull request #785 from lioncash/fs

partition_filesystem: Use std::move where applicable
bunnei 8 лет назад
Родитель
Сommit
bc5b65a1b0
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      src/core/file_sys/partition_filesystem.cpp

+ 3 - 3
src/core/file_sys/partition_filesystem.cpp

@@ -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(
-            std::make_shared<OffsetVfsFile>(file, entry.size, content_offset + entry.offset, name));
+        pfs_files.emplace_back(std::make_shared<OffsetVfsFile>(
+            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));