mirror of
https://git.citron-emu.org/citron/emulator
synced 2026-01-06 09:54:23 +00:00
Merge branch 'fix/build-resolve-errors' into 'main'
fix(build): Resolve multiple strict compiler errors (GCC +15) See merge request citron/emulator!109
This commit is contained in:
@@ -61,7 +61,7 @@
|
|||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
#include "common/xci_trimmer.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,
|
std::vector<VkDeviceInfo::Record>& vk_device_records,
|
||||||
Core::System& system_)
|
Core::System& system_)
|
||||||
: QDialog(parent),
|
: QDialog(parent),
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ class ConfigurePerGame : public QDialog {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
// Cannot use std::filesystem::path due to https://bugreports.qt.io/browse/QTBUG-73263
|
// 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,
|
std::vector<VkDeviceInfo::Record>& vk_device_records,
|
||||||
Core::System& system_);
|
Core::System& system_);
|
||||||
~ConfigurePerGame() override;
|
~ConfigurePerGame() override;
|
||||||
|
|||||||
@@ -179,7 +179,13 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
|
|||||||
}
|
}
|
||||||
std::sort(patch_dirs.begin(), patch_dirs.end(),
|
std::sort(patch_dirs.begin(), patch_dirs.end(),
|
||||||
[](const VirtualDir& l, const VirtualDir& r) {
|
[](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;
|
std::vector<VirtualDir> layers;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
||||||
|
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
@@ -247,7 +248,7 @@ Result SaveDataFactory::ReadSaveDataExtraData(SaveDataExtraData* out_extra_data,
|
|||||||
save_directory);
|
save_directory);
|
||||||
|
|
||||||
// Return zeroed data
|
// Return zeroed data
|
||||||
std::memset(out_extra_data, 0, sizeof(SaveDataExtraData));
|
*out_extra_data = {}; // Or: *out_extra_data = SaveDataExtraData{};
|
||||||
out_extra_data->attr = attribute;
|
out_extra_data->attr = attribute;
|
||||||
return ResultSuccess;
|
return ResultSuccess;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user