summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/hle/service/fs/archive.cpp6
-rw-r--r--src/core/loader/elf.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp
index f19ca3a9f..9a91bcb8b 100644
--- a/src/core/hle/service/fs/archive.cpp
+++ b/src/core/hle/service/fs/archive.cpp
@@ -63,7 +63,7 @@ enum class DirectoryCommand : u32 {
63class Archive { 63class Archive {
64public: 64public:
65 Archive(std::unique_ptr<FileSys::ArchiveBackend>&& backend, ArchiveIdCode id_code) 65 Archive(std::unique_ptr<FileSys::ArchiveBackend>&& backend, ArchiveIdCode id_code)
66 : backend(std::move(backend)), id_code(id_code) { 66 : id_code(id_code), backend(std::move(backend)) {
67 } 67 }
68 68
69 std::string GetName() const { return "Archive: " + backend->GetName(); } 69 std::string GetName() const { return "Archive: " + backend->GetName(); }
@@ -75,7 +75,7 @@ public:
75class File : public Kernel::Session { 75class File : public Kernel::Session {
76public: 76public:
77 File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path) 77 File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path)
78 : backend(std::move(backend)), path(path) { 78 : path(path), backend(std::move(backend)) {
79 } 79 }
80 80
81 std::string GetName() const override { return "Path: " + path.DebugStr(); } 81 std::string GetName() const override { return "Path: " + path.DebugStr(); }
@@ -160,7 +160,7 @@ public:
160class Directory : public Kernel::Session { 160class Directory : public Kernel::Session {
161public: 161public:
162 Directory(std::unique_ptr<FileSys::DirectoryBackend>&& backend, const FileSys::Path& path) 162 Directory(std::unique_ptr<FileSys::DirectoryBackend>&& backend, const FileSys::Path& path)
163 : backend(std::move(backend)), path(path) { 163 : path(path), backend(std::move(backend)) {
164 } 164 }
165 165
166 std::string GetName() const override { return "Directory: " + path.DebugStr(); } 166 std::string GetName() const override { return "Directory: " + path.DebugStr(); }
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 354335014..3ca60c072 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -222,7 +222,7 @@ public:
222 int GetSectionSize(SectionID section) const { return sections[section].sh_size; } 222 int GetSectionSize(SectionID section) const { return sections[section].sh_size; }
223 SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found 223 SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found
224 224
225 bool DidRelocate() { 225 bool DidRelocate() const {
226 return relocate; 226 return relocate;
227 } 227 }
228}; 228};