diff options
| author | 2018-07-20 00:10:21 -0400 | |
|---|---|---|
| committer | 2018-07-20 00:10:24 -0400 | |
| commit | 8874d0e657be9b2f03608a91bcf5edf433e576c7 (patch) | |
| tree | faa01fd0bc8d50581eb118e669e7d606fa460625 | |
| parent | vfs_offset: std::move file and name parameters of OffsetVfsFile (diff) | |
| download | yuzu-8874d0e657be9b2f03608a91bcf5edf433e576c7.tar.gz yuzu-8874d0e657be9b2f03608a91bcf5edf433e576c7.tar.xz yuzu-8874d0e657be9b2f03608a91bcf5edf433e576c7.zip | |
loader/{nca, nro}: std::move VirtualFile in the constructors where applicable
This avoids unnecessary atomic reference count increments and decrements
| -rw-r--r-- | src/core/loader/nca.cpp | 3 | ||||
| -rw-r--r-- | src/core/loader/nro.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp index e73b253b2..c80df23be 100644 --- a/src/core/loader/nca.cpp +++ b/src/core/loader/nca.cpp | |||
| @@ -2,6 +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 | #include <utility> | ||
| 5 | #include <vector> | 6 | #include <vector> |
| 6 | 7 | ||
| 7 | #include "common/file_util.h" | 8 | #include "common/file_util.h" |
| @@ -21,7 +22,7 @@ | |||
| 21 | 22 | ||
| 22 | namespace Loader { | 23 | namespace Loader { |
| 23 | 24 | ||
| 24 | AppLoader_NCA::AppLoader_NCA(FileSys::VirtualFile file) : AppLoader(file) {} | 25 | AppLoader_NCA::AppLoader_NCA(FileSys::VirtualFile file) : AppLoader(std::move(file)) {} |
| 25 | 26 | ||
| 26 | FileType AppLoader_NCA::IdentifyType(const FileSys::VirtualFile& file) { | 27 | FileType AppLoader_NCA::IdentifyType(const FileSys::VirtualFile& file) { |
| 27 | // TODO(DarkLordZach): Assuming everything is decrypted. Add crypto support. | 28 | // TODO(DarkLordZach): Assuming everything is decrypted. Add crypto support. |
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 465b827bb..c020399f2 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -2,6 +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 | #include <utility> | ||
| 5 | #include <vector> | 6 | #include <vector> |
| 6 | 7 | ||
| 7 | #include "common/common_funcs.h" | 8 | #include "common/common_funcs.h" |
| @@ -48,7 +49,7 @@ struct ModHeader { | |||
| 48 | }; | 49 | }; |
| 49 | static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size."); | 50 | static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size."); |
| 50 | 51 | ||
| 51 | AppLoader_NRO::AppLoader_NRO(FileSys::VirtualFile file) : AppLoader(file) {} | 52 | AppLoader_NRO::AppLoader_NRO(FileSys::VirtualFile file) : AppLoader(std::move(file)) {} |
| 52 | 53 | ||
| 53 | FileType AppLoader_NRO::IdentifyType(const FileSys::VirtualFile& file) { | 54 | FileType AppLoader_NRO::IdentifyType(const FileSys::VirtualFile& file) { |
| 54 | // Read NSO header | 55 | // Read NSO header |