lux/yuzu
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/yuzu.git synced 2024-12-15 07:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #903 from lioncash/copy

Browse source 
vfs_vector: Minor changes
This commit is contained in:
bunnei 2018-08-02 23:01:19 -04:00 committed by GitHub
parent 52da0ce399 42a4c6b79e
commit 291ccf7257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/file_sys/vfs_vector.cpp
View file

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm> #include <algorithm>
#include <utility>
#include "core/file_sys/vfs_vector.h" #include "core/file_sys/vfs_vector.h"
namespace FileSys { namespace FileSys {
@ -31,16 +32,18 @@ bool VectorVfsDirectory::IsReadable() const {
std::string VectorVfsDirectory::GetName() const { std::string VectorVfsDirectory::GetName() const {
return name; return name;
} }
std::shared_ptr<VfsDirectory> VectorVfsDirectory::GetParentDirectory() const { std::shared_ptr<VfsDirectory> VectorVfsDirectory::GetParentDirectory() const {
return parent; return parent;
} }
template <typename T> template <typename T>
static bool FindAndRemoveVectorElement(std::vector<T>& vec, std::string_view name) { static bool FindAndRemoveVectorElement(std::vector<T>& vec, std::string_view name) {
auto iter = std::find_if(vec.begin(), vec.end(), [name](T e) { return e->GetName() == name; }); const auto iter =
std::find_if(vec.begin(), vec.end(), [name](const T& e) { return e->GetName() == name; });
if (iter == vec.end()) if (iter == vec.end())
return false; return false;
auto old_size = vec.size();
vec.erase(iter); vec.erase(iter);
return true; return true;
} }
@ -77,7 +80,7 @@ void VectorVfsDirectory::AddDirectory(VirtualDir dir) {
bool VectorVfsDirectory::ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) { bool VectorVfsDirectory::ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) {
if (!DeleteFile(file->GetName())) if (!DeleteFile(file->GetName()))
return false; return false;
dirs.emplace_back(dir); dirs.emplace_back(std::move(dir));
return true; return true;
} }
} // namespace FileSys } // namespace FileSys