Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade codebase to C++ 20 + fix warnings + update submodules (#6115)

Browse source
This commit is contained in:
GPUCode 2022-09-21 19:36:12 +03:00 • committed by GitHub
parent 90b418fd1a
commit cbd5d1c15c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
67 changed files with 6837 additions and 7475 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/file_sys/archive_backend.h
View file

@ -101,7 +101,7 @@ struct ArchiveFormatInfo {
u32_le number_files; ///< The pre-defined number of files in the archive.
u8 duplicate_data; ///< Whether the archive should duplicate the data.
};
static_assert(std::is_pod<ArchiveFormatInfo>::value, "ArchiveFormatInfo is not POD");
static_assert(std::is_trivial_v<ArchiveFormatInfo>, "ArchiveFormatInfo is not POD");
class ArchiveBackend : NonCopyable {
public:

3
src/core/file_sys/disk_archive.cpp
View file

@ -58,8 +58,7 @@ bool DiskFile::Close() const {
////////////////////////////////////////////////////////////////////////////////////////////////////
DiskDirectory::DiskDirectory(const std::string& path) {
unsigned size = FileUtil::ScanDirectoryTree(path, directory);
directory.size = size;
directory.size = FileUtil::ScanDirectoryTree(path, directory);
directory.isDirectory = true;
children_iterator = directory.children.begin();
}

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

@ -390,7 +390,7 @@ Loader::ResultStatus NCCHContainer::Load() {
exheader_header.arm11_system_local_caps.resource_limit_category;
LOG_DEBUG(Service_FS, "Name: {}",
exheader_header.codeset_info.name);
reinterpret_cast<const char*>(exheader_header.codeset_info.name));
LOG_DEBUG(Service_FS, "Program ID: {:016X}", ncch_header.program_id);
LOG_DEBUG(Service_FS, "Code compressed: {}", is_compressed ? "yes" : "no");
LOG_DEBUG(Service_FS, "Entry point: 0x{:08X}", entry_point);

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

@ -99,7 +99,7 @@ public:
template <typename ValueType>
std::optional<ValueType> Read() {
static_assert(std::is_pod_v<ValueType>);
static_assert(std::is_trivial_v<ValueType>);
ValueType val{};
if (!Read(&val, sizeof(val)))
return std::nullopt;