drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2026-01-06 18:04:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/build-resolve-errors' into 'main'

Browse Source 
fix(build): Resolve multiple strict compiler errors (GCC +15)

See merge request citron/emulator!109
This commit is contained in:
Zephyron
2025-10-22 11:24:59 +10:00
parent f3be268a89 ca8c822b93
commit 9a4eefb5f0
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/citron/configuration/configure_per_game.cpp
View File

@@ -61,7 +61,7 @@
#include "common/string_util.h"
#include "common/xci_trimmer.h"
ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name,
ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name_,
std::vector<VkDeviceInfo::Record>& vk_device_records,
Core::System& system_)
: QDialog(parent),

2
src/citron/configuration/configure_per_game.h
View File

@@ -52,7 +52,7 @@ class ConfigurePerGame : public QDialog {
public:
// Cannot use std::filesystem::path due to https://bugreports.qt.io/browse/QTBUG-73263
explicit ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name,
explicit ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name_,
std::vector<VkDeviceInfo::Record>& vk_device_records,
Core::System& system_);
~ConfigurePerGame() override;

8
src/core/file_sys/patch_manager.cpp
View File

@@ -179,7 +179,13 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
}
std::sort(patch_dirs.begin(), patch_dirs.end(),
[](const VirtualDir& l, const VirtualDir& r) {
if(!l) return true; if(!r) return false; return l->GetName() < r->GetName();
if (!l) {
return true;
}
if (!r) {
return false;
}
return l->GetName() < r->GetName();
});
std::vector<VirtualDir> layers;

3
src/core/file_sys/savedata_factory.cpp
View File

@@ -1,4 +1,5 @@
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <chrono>
@@ -247,7 +248,7 @@ Result SaveDataFactory::ReadSaveDataExtraData(SaveDataExtraData* out_extra_data,
save_directory);
// Return zeroed data
std::memset(out_extra_data, 0, sizeof(SaveDataExtraData));
*out_extra_data = {}; // Or: *out_extra_data = SaveDataExtraData{};
out_extra_data->attr = attribute;
return ResultSuccess;
}