diff options
| author | 2018-07-19 11:49:06 -0700 | |
|---|---|---|
| committer | 2018-07-19 11:49:06 -0700 | |
| commit | 427fc4ac6bca32f9e1efafb9cdf0144b2e6dbe78 (patch) | |
| tree | b3e976f72a82975954ea8d0e90d9a72d0922fee6 /src | |
| parent | Merge pull request #711 from lioncash/swap (diff) | |
| parent | filesystem: std::move VirtualDir instance in VfsDirectoryServiceWrapper's con... (diff) | |
| download | yuzu-427fc4ac6bca32f9e1efafb9cdf0144b2e6dbe78.tar.gz yuzu-427fc4ac6bca32f9e1efafb9cdf0144b2e6dbe78.tar.xz yuzu-427fc4ac6bca32f9e1efafb9cdf0144b2e6dbe78.zip | |
Merge pull request #713 from lioncash/filesys
filesystem: Minor changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/filesystem/filesystem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index ec528ef40..55282f3af 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #pragma optimize("", off) | 5 | #include <utility> |
| 6 | 6 | ||
| 7 | #include "common/assert.h" | 7 | #include "common/assert.h" |
| 8 | #include "common/file_util.h" | 8 | #include "common/file_util.h" |
| @@ -25,14 +25,14 @@ constexpr u64 EMULATED_SD_REPORTED_SIZE = 32000000000; | |||
| 25 | 25 | ||
| 26 | static FileSys::VirtualDir GetDirectoryRelativeWrapped(FileSys::VirtualDir base, | 26 | static FileSys::VirtualDir GetDirectoryRelativeWrapped(FileSys::VirtualDir base, |
| 27 | const std::string& dir_name) { | 27 | const std::string& dir_name) { |
| 28 | if (dir_name == "." || dir_name == "" || dir_name == "/" || dir_name == "\\") | 28 | if (dir_name.empty() || dir_name == "." || dir_name == "/" || dir_name == "\\") |
| 29 | return base; | 29 | return base; |
| 30 | 30 | ||
| 31 | return base->GetDirectoryRelative(dir_name); | 31 | return base->GetDirectoryRelative(dir_name); |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | VfsDirectoryServiceWrapper::VfsDirectoryServiceWrapper(FileSys::VirtualDir backing_) | 34 | VfsDirectoryServiceWrapper::VfsDirectoryServiceWrapper(FileSys::VirtualDir backing_) |
| 35 | : backing(backing_) {} | 35 | : backing(std::move(backing_)) {} |
| 36 | 36 | ||
| 37 | std::string VfsDirectoryServiceWrapper::GetName() const { | 37 | std::string VfsDirectoryServiceWrapper::GetName() const { |
| 38 | return backing->GetName(); | 38 | return backing->GetName(); |