N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3262 from lioncash/warn

Browse source 
common/core: Silence initialization order warnings
This commit is contained in:
Merry 2017-12-11 19:52:53 +00:00 committed by GitHub
parent 1e3113b1b2 c31f932afe
commit 5c802d35ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/telemetry.h
View file

@ -53,10 +53,10 @@ template <typename T>
class Field : public FieldInterface { class Field : public FieldInterface {
public: public:
Field(FieldType type, std::string name, const T& value) 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) 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) {} Field(const Field& other) : Field(other.type, other.name, other.value) {}

2
src/core/file_sys/ncch_container.cpp
View file

@ -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) 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"); file = FileUtil::IOFile(filepath, "rb");
} }

2
src/core/hle/kernel/hle_ipc.cpp
View file

@ -190,7 +190,7 @@ MappedBuffer& HLERequestContext::GetMappedBuffer(u32 id_from_cmdbuf) {
} }
MappedBuffer::MappedBuffer(const Process& process, u32 descriptor, VAddr address, u32 id) 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}; IPC::MappedBufferDescInfo desc{descriptor};
size = desc.size; size = desc.size;
perms = desc.perms; perms = desc.perms;

2
src/core/hle/service/fs/archive.cpp
View file

@ -67,7 +67,7 @@ enum class DirectoryCommand : u32 {
}; };
File::File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path) 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[] = { static const FunctionInfo functions[] = {
{0x080200C2, &File::Read, "Read"}, {0x080200C2, &File::Read, "Read"},
{0x08030102, &File::Write, "Write"}, {0x08030102, &File::Write, "Write"},

4
src/core/loader/ncch.h
View file

@ -19,8 +19,8 @@ namespace Loader {
class AppLoader_NCCH final : public AppLoader { class AppLoader_NCCH final : public AppLoader {
public: public:
AppLoader_NCCH(FileUtil::IOFile&& file, const std::string& filepath) AppLoader_NCCH(FileUtil::IOFile&& file, const std::string& filepath)
: AppLoader(std::move(file)), filepath(filepath), base_ncch(filepath), : AppLoader(std::move(file)), base_ncch(filepath), overlay_ncch(&base_ncch),
overlay_ncch(&base_ncch) {} filepath(filepath) {}
/** /**
* Returns the type of the file * Returns the type of the file