summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-20 18:21:15 +0200
committerGitHub <noreply@github.com>2018-07-20 18:21:15 +0200
commitffbd51e207fb5e2aaaa5f5a8861d4d3e55188376 (patch)
tree812c30415af58b2a478b005b10b81cd69bb5a5cd /src/core
parentMerge pull request #736 from lioncash/null (diff)
parentloader/{nca, nro}: std::move VirtualFile in the constructors where applicable (diff)
downloadyuzu-ffbd51e207fb5e2aaaa5f5a8861d4d3e55188376.tar
yuzu-ffbd51e207fb5e2aaaa5f5a8861d4d3e55188376.tar.gz
yuzu-ffbd51e207fb5e2aaaa5f5a8861d4d3e55188376.tar.bz2
yuzu-ffbd51e207fb5e2aaaa5f5a8861d4d3e55188376.tar.lz
yuzu-ffbd51e207fb5e2aaaa5f5a8861d4d3e55188376.tar.xz
yuzu-ffbd51e207fb5e2aaaa5f5a8861d4d3e55188376.tar.zst
yuzu-ffbd51e207fb5e2aaaa5f5a8861d4d3e55188376.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/file_sys/vfs_offset.cpp6
-rw-r--r--src/core/file_sys/vfs_offset.h2
-rw-r--r--src/core/loader/nca.cpp3
-rw-r--r--src/core/loader/nro.cpp3
4 files changed, 9 insertions, 5 deletions
diff --git a/src/core/file_sys/vfs_offset.cpp b/src/core/file_sys/vfs_offset.cpp
index 288499cb5..31fdd9aa1 100644
--- a/src/core/file_sys/vfs_offset.cpp
+++ b/src/core/file_sys/vfs_offset.cpp
@@ -2,13 +2,15 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <utility>
+
#include "core/file_sys/vfs_offset.h"
namespace FileSys {
OffsetVfsFile::OffsetVfsFile(std::shared_ptr<VfsFile> file_, size_t size_, size_t offset_,
- const std::string& name_)
- : file(file_), offset(offset_), size(size_), name(name_) {}
+ std::string name_)
+ : file(std::move(file_)), offset(offset_), size(size_), name(std::move(name_)) {}
std::string OffsetVfsFile::GetName() const {
return name.empty() ? file->GetName() : name;
diff --git a/src/core/file_sys/vfs_offset.h b/src/core/file_sys/vfs_offset.h
index adc615b38..2e16e47eb 100644
--- a/src/core/file_sys/vfs_offset.h
+++ b/src/core/file_sys/vfs_offset.h
@@ -14,7 +14,7 @@ namespace FileSys {
// the size of this wrapper.
struct OffsetVfsFile : public VfsFile {
OffsetVfsFile(std::shared_ptr<VfsFile> file, size_t size, size_t offset = 0,
- const std::string& new_name = "");
+ std::string new_name = "");
std::string GetName() const override;
size_t GetSize() const override;
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 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <utility>
#include <vector>
#include "common/file_util.h"
@@ -21,7 +22,7 @@
namespace Loader {
-AppLoader_NCA::AppLoader_NCA(FileSys::VirtualFile file) : AppLoader(file) {}
+AppLoader_NCA::AppLoader_NCA(FileSys::VirtualFile file) : AppLoader(std::move(file)) {}
FileType AppLoader_NCA::IdentifyType(const FileSys::VirtualFile& file) {
// 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 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <utility>
#include <vector>
#include "common/common_funcs.h"
@@ -48,7 +49,7 @@ struct ModHeader {
};
static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size.");
-AppLoader_NRO::AppLoader_NRO(FileSys::VirtualFile file) : AppLoader(file) {}
+AppLoader_NRO::AppLoader_NRO(FileSys::VirtualFile file) : AppLoader(std::move(file)) {}
FileType AppLoader_NRO::IdentifyType(const FileSys::VirtualFile& file) {
// Read NSO header