mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-20 18:33:24 +02:00
common/core: Silence initialization order warnings
This commit is contained in:
parent
9699194b54
commit
c31f932afe
@ -53,10 +53,10 @@ template <typename T>
|
||||
class Field : public FieldInterface {
|
||||
public:
|
||||
Field(FieldType type, std::string name, const T& value)
|
||||
: type(type), name(std::move(name)), value(value) {}
|
||||
: name(std::move(name)), type(type), value(value) {}
|
||||
|
||||
Field(FieldType type, std::string name, T&& value)
|
||||
: type(type), name(std::move(name)), value(std::move(value)) {}
|
||||
: name(std::move(name)), type(type), value(std::move(value)) {}
|
||||
|
||||
Field(const Field& other) : Field(other.type, other.name, other.value) {}
|
||||
|
||||
|
@ -96,7 +96,7 @@ static bool LZSS_Decompress(const u8* compressed, u32 compressed_size, u8* decom
|
||||
}
|
||||
|
||||
NCCHContainer::NCCHContainer(const std::string& filepath, u32 ncch_offset)
|
||||
: filepath(filepath), ncch_offset(ncch_offset) {
|
||||
: ncch_offset(ncch_offset), filepath(filepath) {
|
||||
file = FileUtil::IOFile(filepath, "rb");
|
||||
}
|
||||
|
||||
|
@ -190,7 +190,7 @@ MappedBuffer& HLERequestContext::GetMappedBuffer(u32 id_from_cmdbuf) {
|
||||
}
|
||||
|
||||
MappedBuffer::MappedBuffer(const Process& process, u32 descriptor, VAddr address, u32 id)
|
||||
: process(&process), address(address), id(id) {
|
||||
: id(id), address(address), process(&process) {
|
||||
IPC::MappedBufferDescInfo desc{descriptor};
|
||||
size = desc.size;
|
||||
perms = desc.perms;
|
||||
|
@ -67,7 +67,7 @@ enum class DirectoryCommand : u32 {
|
||||
};
|
||||
|
||||
File::File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path)
|
||||
: path(path), priority(0), backend(std::move(backend)), ServiceFramework("", 1) {
|
||||
: ServiceFramework("", 1), path(path), priority(0), backend(std::move(backend)) {
|
||||
static const FunctionInfo functions[] = {
|
||||
{0x080200C2, &File::Read, "Read"},
|
||||
{0x08030102, &File::Write, "Write"},
|
||||
|
@ -19,8 +19,8 @@ namespace Loader {
|
||||
class AppLoader_NCCH final : public AppLoader {
|
||||
public:
|
||||
AppLoader_NCCH(FileUtil::IOFile&& file, const std::string& filepath)
|
||||
: AppLoader(std::move(file)), filepath(filepath), base_ncch(filepath),
|
||||
overlay_ncch(&base_ncch) {}
|
||||
: AppLoader(std::move(file)), base_ncch(filepath), overlay_ncch(&base_ncch),
|
||||
filepath(filepath) {}
|
||||
|
||||
/**
|
||||
* Returns the type of the file
|
||||
|
Loading…
Reference in New Issue
Block a user