diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-21 11:38:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 11:38:52 -0700 |
| commit | 0f20fa5a1e179bdad07fe1e0e58243d1927274fd (patch) | |
| tree | 1e36cf5bf5bb44a6c77087dfd7161b72739dbf3e | |
| parent | de7cb91995666db7c469feab7bfe90be2156173d (diff) | |
| parent | b46c0ed1fa07698297d5cf645b97a1978092868d (diff) | |
Merge pull request #754 from lioncash/part
partition_filesystem, vfs_real: Minor changes
| -rw-r--r-- | src/core/file_sys/partition_filesystem.cpp | 12 | ||||
| -rw-r--r-- | src/core/file_sys/vfs_real.cpp | 16 |
2 files changed, 20 insertions, 8 deletions
diff --git a/src/core/file_sys/partition_filesystem.cpp b/src/core/file_sys/partition_filesystem.cpp index 7ccca10898..8d2bd9f6b3 100644 --- a/src/core/file_sys/partition_filesystem.cpp +++ b/src/core/file_sys/partition_filesystem.cpp @@ -2,7 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <algorithm> +#include <cstddef> +#include <cstring> +#include <iterator> #include <utility> + #include "common/file_util.h" #include "common/logging/log.h" #include "core/file_sys/partition_filesystem.h" @@ -99,14 +104,15 @@ 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); + pfs_dirs.emplace_back(std::move(dir)); return true; } diff --git a/src/core/file_sys/vfs_real.cpp b/src/core/file_sys/vfs_real.cpp index 22c858e0d9..f27fb1f2a3 100644 --- a/src/core/file_sys/vfs_real.cpp +++ b/src/core/file_sys/vfs_real.cpp @@ -2,6 +2,11 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <algorithm> +#include <cstddef> +#include <iterator> +#include <utility> + #include "common/common_paths.h" #include "common/logging/log.h" #include "core/file_sys/vfs_real.h" @@ -104,11 +109,11 @@ RealVfsDirectory::RealVfsDirectory(const std::string& path_, Mode perms_) } std::vector<std::shared_ptr<VfsFile>> RealVfsDirectory::GetFiles() const { - return std::vector<std::shared_ptr<VfsFile>>(files); + return files; } std::vector<std::shared_ptr<VfsDirectory>> RealVfsDirectory::GetSubdirectories() const { - return std::vector<std::shared_ptr<VfsDirectory>>(subdirectories); + return subdirectories; } bool RealVfsDirectory::IsWritable() const { @@ -163,14 +168,15 @@ 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); + subdirectories.emplace_back(std::move(dir)); return true; } |