diff options
| author | 2023-01-01 20:00:46 +0000 | |
|---|---|---|
| committer | 2023-01-01 20:00:46 +0000 | |
| commit | a12a4f2a1322414a91b63ea43420ee37f5864111 (patch) | |
| tree | 7ba37c3b1cfcf603e98ffc005e114f182a351b20 /src | |
| parent | Merge pull request #9533 from merryhime/overcommit (diff) | |
| parent | vfs: Replace cstr concat with char concat (diff) | |
| download | yuzu-a12a4f2a1322414a91b63ea43420ee37f5864111.tar.gz yuzu-a12a4f2a1322414a91b63ea43420ee37f5864111.tar.xz yuzu-a12a4f2a1322414a91b63ea43420ee37f5864111.zip | |
Merge pull request #9538 from merryhime/char-concat
vfs: Replace cstr concat with char concat
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/file_sys/vfs.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/vfs.cpp b/src/core/file_sys/vfs.cpp index 0f6618b31..639842401 100644 --- a/src/core/file_sys/vfs.cpp +++ b/src/core/file_sys/vfs.cpp | |||
| @@ -194,9 +194,9 @@ std::size_t VfsFile::WriteBytes(const std::vector<u8>& data, std::size_t offset) | |||
| 194 | 194 | ||
| 195 | std::string VfsFile::GetFullPath() const { | 195 | std::string VfsFile::GetFullPath() const { |
| 196 | if (GetContainingDirectory() == nullptr) | 196 | if (GetContainingDirectory() == nullptr) |
| 197 | return "/" + GetName(); | 197 | return '/' + GetName(); |
| 198 | 198 | ||
| 199 | return GetContainingDirectory()->GetFullPath() + "/" + GetName(); | 199 | return GetContainingDirectory()->GetFullPath() + '/' + GetName(); |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | VirtualFile VfsDirectory::GetFileRelative(std::string_view path) const { | 202 | VirtualFile VfsDirectory::GetFileRelative(std::string_view path) const { |
| @@ -435,7 +435,7 @@ std::string VfsDirectory::GetFullPath() const { | |||
| 435 | if (IsRoot()) | 435 | if (IsRoot()) |
| 436 | return GetName(); | 436 | return GetName(); |
| 437 | 437 | ||
| 438 | return GetParentDirectory()->GetFullPath() + "/" + GetName(); | 438 | return GetParentDirectory()->GetFullPath() + '/' + GetName(); |
| 439 | } | 439 | } |
| 440 | 440 | ||
| 441 | bool ReadOnlyVfsDirectory::IsWritable() const { | 441 | bool ReadOnlyVfsDirectory::IsWritable() const { |