diff options
author | bunnei <bunneidev@gmail.com> | 2015-01-03 03:04:49 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-01-03 03:04:49 +0100 |
commit | 3d9bf134399665124b3d3c65d7357c177bf2097e (patch) | |
tree | bb679ab15b8a8bb10947f6332e943e59d7d70ad0 | |
parent | Merge pull request #385 from bunnei/dyncom-ldrex-strex-h-d (diff) | |
parent | elf: Make DidRelocate const (diff) | |
download | yuzu-3d9bf134399665124b3d3c65d7357c177bf2097e.tar yuzu-3d9bf134399665124b3d3c65d7357c177bf2097e.tar.gz yuzu-3d9bf134399665124b3d3c65d7357c177bf2097e.tar.bz2 yuzu-3d9bf134399665124b3d3c65d7357c177bf2097e.tar.lz yuzu-3d9bf134399665124b3d3c65d7357c177bf2097e.tar.xz yuzu-3d9bf134399665124b3d3c65d7357c177bf2097e.tar.zst yuzu-3d9bf134399665124b3d3c65d7357c177bf2097e.zip |
-rw-r--r-- | src/core/hle/service/fs/archive.cpp | 6 | ||||
-rw-r--r-- | src/core/loader/elf.cpp | 2 |
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 { class Archive { public: Archive(std::unique_ptr<FileSys::ArchiveBackend>&& backend, ArchiveIdCode id_code) - : backend(std::move(backend)), id_code(id_code) { + : id_code(id_code), backend(std::move(backend)) { } std::string GetName() const { return "Archive: " + backend->GetName(); } @@ -75,7 +75,7 @@ public: class File : public Kernel::Session { public: File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path) - : backend(std::move(backend)), path(path) { + : path(path), backend(std::move(backend)) { } std::string GetName() const override { return "Path: " + path.DebugStr(); } @@ -160,7 +160,7 @@ public: class Directory : public Kernel::Session { public: Directory(std::unique_ptr<FileSys::DirectoryBackend>&& backend, const FileSys::Path& path) - : backend(std::move(backend)), path(path) { + : path(path), backend(std::move(backend)) { } 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: int GetSectionSize(SectionID section) const { return sections[section].sh_size; } SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found - bool DidRelocate() { + bool DidRelocate() const { return relocate; } }; |