citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #391 from lioncash/pedantic 

archive/elf: Minor misc changes.
This commit is contained in:
bunnei 2015-01-02 21:04:49 -05:00
parent bd8949b8c2 bf23f94571
commit 3d9bf13439
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/fs/archive.cpp
View File

@ -63,7 +63,7 @@ enum class DirectoryCommand : u32 {
class Archive { class Archive {
public: public:
Archive(std::unique_ptr<FileSys::ArchiveBackend>&& backend, ArchiveIdCode id_code) 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(); } std::string GetName() const { return "Archive: " + backend->GetName(); }
@ -75,7 +75,7 @@ public:
class File : public Kernel::Session { class File : public Kernel::Session {
public: public:
File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path) 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(); } std::string GetName() const override { return "Path: " + path.DebugStr(); }
@ -160,7 +160,7 @@ public:
class Directory : public Kernel::Session { class Directory : public Kernel::Session {
public: public:
Directory(std::unique_ptr<FileSys::DirectoryBackend>&& backend, const FileSys::Path& path) 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(); } std::string GetName() const override { return "Directory: " + path.DebugStr(); }

2
src/core/loader/elf.cpp
View File

@ -222,7 +222,7 @@ public:
int GetSectionSize(SectionID section) const { return sections[section].sh_size; } int GetSectionSize(SectionID section) const { return sections[section].sh_size; }
SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found
bool DidRelocate() { bool DidRelocate() const {
return relocate; return relocate;
} }
}; };