From 2b91386e155ba9a9e8c06d7c90fe9710aecf8076 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 20 Jul 2018 22:14:59 -0400 Subject: partition_filesystem, vfs_real: Use std::distance() instead of subtraction This is a little bit more self-documenting on what is being done here. --- src/core/file_sys/partition_filesystem.cpp | 7 +++++-- 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 #include + #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 + #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); -- cgit v1.2.3