Merge pull request #9538 from merryhime/char-concat
vfs: Replace cstr concat with char concat
This commit is contained in:
commit
a12a4f2a13
|
@ -194,9 +194,9 @@ std::size_t VfsFile::WriteBytes(const std::vector<u8>& data, std::size_t offset)
|
||||||
|
|
||||||
std::string VfsFile::GetFullPath() const {
|
std::string VfsFile::GetFullPath() const {
|
||||||
if (GetContainingDirectory() == nullptr)
|
if (GetContainingDirectory() == nullptr)
|
||||||
return "/" + GetName();
|
return '/' + GetName();
|
||||||
|
|
||||||
return GetContainingDirectory()->GetFullPath() + "/" + GetName();
|
return GetContainingDirectory()->GetFullPath() + '/' + GetName();
|
||||||
}
|
}
|
||||||
|
|
||||||
VirtualFile VfsDirectory::GetFileRelative(std::string_view path) const {
|
VirtualFile VfsDirectory::GetFileRelative(std::string_view path) const {
|
||||||
|
@ -435,7 +435,7 @@ std::string VfsDirectory::GetFullPath() const {
|
||||||
if (IsRoot())
|
if (IsRoot())
|
||||||
return GetName();
|
return GetName();
|
||||||
|
|
||||||
return GetParentDirectory()->GetFullPath() + "/" + GetName();
|
return GetParentDirectory()->GetFullPath() + '/' + GetName();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ReadOnlyVfsDirectory::IsWritable() const {
|
bool ReadOnlyVfsDirectory::IsWritable() const {
|
||||||
|
|
Reference in New Issue