summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-02 23:01:19 -0400
committerGravatar GitHub2018-08-02 23:01:19 -0400
commit291ccf7257182fc77163a6d0d215895c85c210c1 (patch)
treea311912d183e7778ca9f1571ac688cf92a43c5d0
parentMerge pull request #901 from lioncash/ref (diff)
parentvfs_vector: Remove unused variable in FindAndRemoveVectorElement() (diff)
downloadyuzu-291ccf7257182fc77163a6d0d215895c85c210c1.tar.gz
yuzu-291ccf7257182fc77163a6d0d215895c85c210c1.tar.xz
yuzu-291ccf7257182fc77163a6d0d215895c85c210c1.zip
Merge pull request #903 from lioncash/copy
vfs_vector: Minor changes
-rw-r--r--src/core/file_sys/vfs_vector.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/file_sys/vfs_vector.cpp b/src/core/file_sys/vfs_vector.cpp
index 4c6337e3a..fda603960 100644
--- a/src/core/file_sys/vfs_vector.cpp
+++ b/src/core/file_sys/vfs_vector.cpp
@@ -3,6 +3,7 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <algorithm> 5#include <algorithm>
6#include <utility>
6#include "core/file_sys/vfs_vector.h" 7#include "core/file_sys/vfs_vector.h"
7 8
8namespace FileSys { 9namespace FileSys {
@@ -31,16 +32,18 @@ bool VectorVfsDirectory::IsReadable() const {
31std::string VectorVfsDirectory::GetName() const { 32std::string VectorVfsDirectory::GetName() const {
32 return name; 33 return name;
33} 34}
35
34std::shared_ptr<VfsDirectory> VectorVfsDirectory::GetParentDirectory() const { 36std::shared_ptr<VfsDirectory> VectorVfsDirectory::GetParentDirectory() const {
35 return parent; 37 return parent;
36} 38}
37 39
38template <typename T> 40template <typename T>
39static bool FindAndRemoveVectorElement(std::vector<T>& vec, std::string_view name) { 41static bool FindAndRemoveVectorElement(std::vector<T>& vec, std::string_view name) {
40 auto iter = std::find_if(vec.begin(), vec.end(), [name](T e) { return e->GetName() == name; }); 42 const auto iter =
43 std::find_if(vec.begin(), vec.end(), [name](const T& e) { return e->GetName() == name; });
41 if (iter == vec.end()) 44 if (iter == vec.end())
42 return false; 45 return false;
43 auto old_size = vec.size(); 46
44 vec.erase(iter); 47 vec.erase(iter);
45 return true; 48 return true;
46} 49}
@@ -77,7 +80,7 @@ void VectorVfsDirectory::AddDirectory(VirtualDir dir) {
77bool VectorVfsDirectory::ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) { 80bool VectorVfsDirectory::ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) {
78 if (!DeleteFile(file->GetName())) 81 if (!DeleteFile(file->GetName()))
79 return false; 82 return false;
80 dirs.emplace_back(dir); 83 dirs.emplace_back(std::move(dir));
81 return true; 84 return true;
82} 85}
83} // namespace FileSys 86} // namespace FileSys