diff options
author | Lioncash <mathew1800@gmail.com> | 2018-07-21 04:14:59 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-07-21 04:19:17 +0200 |
commit | 2b91386e155ba9a9e8c06d7c90fe9710aecf8076 (patch) | |
tree | 7049ac97bcecb70425abdcf53b1bce419cdf5bb0 /src/core/file_sys | |
parent | Merge pull request #743 from lioncash/view (diff) | |
download | yuzu-2b91386e155ba9a9e8c06d7c90fe9710aecf8076.tar yuzu-2b91386e155ba9a9e8c06d7c90fe9710aecf8076.tar.gz yuzu-2b91386e155ba9a9e8c06d7c90fe9710aecf8076.tar.bz2 yuzu-2b91386e155ba9a9e8c06d7c90fe9710aecf8076.tar.lz yuzu-2b91386e155ba9a9e8c06d7c90fe9710aecf8076.tar.xz yuzu-2b91386e155ba9a9e8c06d7c90fe9710aecf8076.tar.zst yuzu-2b91386e155ba9a9e8c06d7c90fe9710aecf8076.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/partition_filesystem.cpp | 7 | ||||
-rw-r--r-- | src/core/file_sys/vfs_real.cpp | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/core/file_sys/partition_filesystem.cpp b/src/core/file_sys/partition_filesystem.cpp index 7ccca1089..fc37a40cc 100644 --- a/src/core/file_sys/partition_filesystem.cpp +++ b/src/core/file_sys/partition_filesystem.cpp @@ -2,7 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <iterator> #include <utility> + #include "common/file_util.h" #include "common/logging/log.h" #include "core/file_sys/partition_filesystem.h" @@ -99,11 +101,12 @@ void PartitionFilesystem::PrintDebugInfo() const { } bool PartitionFilesystem::ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) { - auto iter = std::find(pfs_files.begin(), pfs_files.end(), file); + const auto iter = std::find(pfs_files.begin(), pfs_files.end(), file); if (iter == pfs_files.end()) return false; - pfs_files[iter - pfs_files.begin()] = pfs_files.back(); + const std::ptrdiff_t offset = std::distance(pfs_files.begin(), iter); + pfs_files[offset] = pfs_files.back(); pfs_files.pop_back(); pfs_dirs.emplace_back(dir); diff --git a/src/core/file_sys/vfs_real.cpp b/src/core/file_sys/vfs_real.cpp index 22c858e0d..fa0df1bbe 100644 --- a/src/core/file_sys/vfs_real.cpp +++ b/src/core/file_sys/vfs_real.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <iterator> + #include "common/common_paths.h" #include "common/logging/log.h" #include "core/file_sys/vfs_real.h" @@ -163,11 +165,12 @@ bool RealVfsDirectory::Rename(const std::string& name) { } bool RealVfsDirectory::ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) { - auto iter = std::find(files.begin(), files.end(), file); + const auto iter = std::find(files.begin(), files.end(), file); if (iter == files.end()) return false; - files[iter - files.begin()] = files.back(); + const std::ptrdiff_t offset = std::distance(files.begin(), iter); + files[offset] = files.back(); files.pop_back(); subdirectories.emplace_back(dir); |