mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 13:50:03 +00:00 
			
		
		
		
	Merge pull request #3262 from lioncash/warn
common/core: Silence initialization order warnings
This commit is contained in:
		
						commit
						5c802d35ef
					
				
					 5 changed files with 7 additions and 7 deletions
				
			
		|  | @ -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…
	
	Add table
		Add a link
		
	
		Reference in a new issue